Fix package groups (#25)

* Added fix for shell exec and composer lock packages * Added fix for shell exec and composer lock packages * Updated coverage paths * Updated coverage paths --------- Co-authored-by: di.martinsr <martins.rucevskis@di.lv>
MartinsRucevskis · Jan 9, 2024 · 9edbb1a · 9edbb1a
1 parent e5fcf0d
commit 9edbb1a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/ComposerJsonFromLockBuilder.php b/src/ComposerJsonFromLockBuilder.php
@@ -30,7 +30,7 @@ public function versionsFromLock(array $originalVersionPrefixes): string
 
         foreach ($requirementPrefixes as $prefix) {
             $packageNames = $this->packageNames($composerJson, $prefix);
-            $composerLockPackages = $composerLock['packages' . $prefix];
+            $composerLockPackages = array_merge($composerLock['packages'], $composerLock['packages-dev']);
             $usedPackagesFromLock = array_filter($composerLockPackages, fn ($package): bool => in_array($package['name'], $packageNames));
             $usedPackageVersions = array_column($usedPackagesFromLock, 'version', 'name');
 

diff --git a/src/ComposerUpdater.php b/src/ComposerUpdater.php
@@ -8,11 +8,14 @@
 
 class ComposerUpdater
 {
-    /**
-     * @throws ExecException
-     */
     public function updateComposer(): string
     {
-        return shell_exec('composer update');
+        try {
+            $output = shell_exec('composer update');
+        } catch (ExecException $e) {
+            $output = 'Shell exec didn\'t finish correctly.';
+        }
+
+        return $output;
     }
 }