Fix computing the list of missing packages

Author: nicolas-grekas

src/Internal/ComposerPlugin.php

@@ -153,10 +153,11 @@ public function postUpdate(Event $event)
             $composer->getPackage()->getDevRequires(),
         ];
 
-        $missingRequires = $this->getMissingRequires($repo, $requires);
+        $missingRequires = $this->getMissingRequires($repo, $requires, 'project' === $composer->getPackage()->getType());
         $missingRequires = [
             'require' => array_fill_keys(array_merge([], ...array_values($missingRequires[0])), '*'),
             'require-dev' => array_fill_keys(array_merge([], ...array_values($missingRequires[1])), '*'),
+            'remove' => array_fill_keys(array_merge([], ...array_values($missingRequires[2])), '*'),
         ];
 
         if (!$missingRequires = array_filter($missingRequires)) {
@@ -224,7 +225,7 @@ public function postUpdate(Event $event)
         }
     }
 
-    public function getMissingRequires(InstalledRepositoryInterface $repo, array $requires): array
+    public function getMissingRequires(InstalledRepositoryInterface $repo, array $requires, bool $isProject): array
     {
         $allPackages = [];
         $devPackages = array_flip($repo->getDevPackageNames());
@@ -234,9 +235,8 @@ public function getMissingRequires(InstalledRepositoryInterface $repo, array $re
             $requires[(int) isset($devPackages[$package->getName()])] += $package->getRequires();
         }
 
-
         $abstractions = [];
-        $missingRequires = [[], []];
+        $missingRequires = [[], [], []];
         $versionParser = new VersionParser();
 
         foreach ($requires as $dev => $rules) {
@@ -249,15 +249,25 @@ public function getMissingRequires(InstalledRepositoryInterface $repo, array $re
                     if (!isset($allPackages[$candidate])) {
                         continue;
                     }
-                    $missingRequires[$dev][$abstraction] = !$dev && isset($devPackages[$candidate]) ? [$candidate] : [];
+
+                    if ($isProject && !$dev && isset($devPackages[$candidate])) {
+                        $missingRequires[0][$abstraction] = [$candidate];
+                        $missingRequires[2][$abstraction] = [$candidate];
+                    } else {
+                        $missingRequires[$dev][$abstraction] = [];
+                    }
 
                     foreach ($deps as $dep) {
                         if (isset(self::PROVIDE_RULES[$dep])) {
                             $rules[$dep] = self::PROVIDE_RULES[$dep];
-                        } elseif (!isset($allPackages[$dep]) || (!$dev && isset($devPackages[$dep]))) {
+                        } elseif (!isset($allPackages[$dep])) {
                             $missingRequires[$dev][$abstraction][] = $dep;
+                        } elseif ($isProject && !$dev && isset($devPackages[$dep])) {
+                            $missingRequires[0][$abstraction][] = $dep;
+                            $missingRequires[2][$abstraction][] = $dep;
                         }
                     }
+                    break;
                 }
             }
 
@@ -270,14 +280,14 @@ public function getMissingRequires(InstalledRepositoryInterface $repo, array $re
                 $candidates = self::PROVIDE_RULES[$abstraction];
 
                 foreach ($candidates as $candidate => $deps) {
-                    if (isset($allPackages[$candidate]) && (!$dev || isset($devPackages[$candidate]))) {
+                    if (isset($allPackages[$candidate]) && (!$isProject || $dev || !isset($devPackages[$candidate]))) {
                         continue 2;
                     }
                 }
 
                 foreach (array_intersect_key(self::STICKYNESS_RULES, $candidates) as $candidate => $stickyRule) {
                     [$stickyName, $stickyVersion] = explode(':', $stickyRule, 2) + [1 => null];
-                    if (!isset($allPackages[$stickyName]) || (!$dev && isset($devPackages[$stickyName]))) {
+                    if (!isset($allPackages[$stickyName]) || ($isProject && !$dev && isset($devPackages[$stickyName]))) {
                         continue;
                     }
                     if (null !== $stickyVersion && !$repo->findPackage($stickyName, $versionParser->parseConstraints($stickyVersion))) {
@@ -293,14 +303,17 @@ public function getMissingRequires(InstalledRepositoryInterface $repo, array $re
                 foreach (current($candidates) as $dep) {
                     if (isset(self::PROVIDE_RULES[$dep])) {
                         $abstractions[] = $dep;
-                    } elseif (!isset($allPackages[$dep]) || (!$dev && isset($devPackages[$dep]))) {
+                    } elseif (!isset($allPackages[$dep])) {
                         $missingRequires[$dev][$abstraction][] = $dep;
+                    } elseif ($isProject && !$dev && isset($devPackages[$dep])) {
+                        $missingRequires[0][$abstraction][] = $dep;
+                        $missingRequires[2][$abstraction][] = $dep;
                     }
                 }
             }
         }
 
-        if (!isset($allPackages['nyholm/psr7'])) {
+        if (!isset($allPackages['nyholm/psr7']) && !isset($allPackages['php-http/discovery'])) {
             foreach ($missingRequires as $dev => $abstractions) {
                 if (\in_array('nyholm/psr7', $missingRequires[$dev]['psr/http-factory-implementation'] ?? [], true)) {
                     continue;
@@ -328,7 +341,11 @@ public function updateComposerJson(array $missingRequires, bool $sortPackages)
 
         foreach ($missingRequires as $key => $packages) {
             foreach ($packages as $package => $constraint) {
-                $manipulator->addLink($key, $package, $constraint, $sortPackages);
+                if ('remove' === $key) {
+                    $manipulator->removeSubNode('require-dev', $package);
+                } else {
+                    $manipulator->addLink($key, $package, $constraint, $sortPackages);
+                }
             }
         }
 

tests/Internal/ComposerPluginTest.php

@@ -24,15 +24,15 @@ public function testMissingRequires(array $expected, InstalledArrayRepository $r
     {
         $plugin = new ComposerPlugin();
 
-        $this->assertSame($expected, $plugin->getMissingRequires($repo, [$rootRequires, $rootDevRequires]));
+        $this->assertSame($expected, $plugin->getMissingRequires($repo, [$rootRequires, $rootDevRequires], true));
     }
 
     public function provideMissingRequires()
     {
         $link = new Link('source', 'target', new Constraint(Constraint::STR_OP_GE, '1'));
         $repo = new InstalledArrayRepository([]);
 
-        yield 'empty' => [[[], []], $repo, [], []];
+        yield 'empty' => [[[], [], []], $repo, [], []];
 
         $rootRequires = [
             'php-http/async-client-implementation' => $link,
@@ -46,7 +46,7 @@ public function provideMissingRequires()
             'psr/http-factory-implementation' => [
                 'nyholm/psr7',
             ],
-        ], []];
+        ], [], []];
 
         yield 'async-httplug' => [$expected, $repo, $rootRequires, []];
     }