Merge pull request #337 from asgrim/filter-matching-packages-by-ext-name

Ensure packages are filtered to match the extension name

Author: asgrim

src/Installing/InstallForPhpProject/FindMatchingPackages.php

@@ -5,9 +5,13 @@
 namespace Php\Pie\Installing\InstallForPhpProject;
 
 use Composer\Composer;
+use Composer\Package\CompletePackage;
 use Composer\Repository\RepositoryInterface;
 use OutOfRangeException;
+use Php\Pie\DependencyResolver\Package;
+use Php\Pie\ExtensionName;
 
+use function array_filter;
 use function array_key_exists;
 use function array_merge;
 use function count;
@@ -29,6 +33,23 @@ public function for(Composer $pieComposer, string $searchTerm): array
             $matches = array_merge($matches, $repo->search($searchTerm, RepositoryInterface::SEARCH_FULLTEXT, 'php-ext-zend'));
         }
 
+        if (ExtensionName::isValidExtensionName($searchTerm)) {
+            $extensionName = ExtensionName::normaliseFromString($searchTerm);
+
+            $matches = array_filter(
+                $matches,
+                static function (array $match) use ($pieComposer, $extensionName): bool {
+                    $package = $pieComposer->getRepositoryManager()->findPackage($match['name'], '*');
+
+                    if (! $package instanceof CompletePackage) {
+                        return false;
+                    }
+
+                    return Package::fromComposerCompletePackage($package)->extensionName()->name() === $extensionName->name();
+                },
+            );
+        }
+
         if (! count($matches)) {
             throw new OutOfRangeException('No matches found for ' . $searchTerm);
         }

test/unit/Installing/InstallForPhpProject/FindMatchingPackagesTest.php

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Php\PieUnitTest\Installing\InstallForPhpProject;
+
+use Composer\Composer;
+use Composer\Config;
+use Composer\IO\IOInterface;
+use Composer\Package\CompletePackage;
+use Composer\Repository\ArrayRepository;
+use Composer\Repository\RepositoryManager;
+use Composer\Util\HttpDownloader;
+use Php\Pie\ExtensionType;
+use Php\Pie\Installing\InstallForPhpProject\FindMatchingPackages;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
+
+#[CoversClass(FindMatchingPackages::class)]
+final class FindMatchingPackagesTest extends TestCase
+{
+    public function testSearchResultsAreFilteredByExtensionName(): void
+    {
+        $repository = new ArrayRepository([
+            (static function (): CompletePackage {
+                $package = new CompletePackage('another/bar', '1.5.0.0', '1.5.0');
+                $package->setDescription('These are not the extensions you are looking for');
+                $package->setType(ExtensionType::PhpModule->value);
+                $package->setPhpExt(['extension-name' => 'something_else']);
+
+                return $package;
+            })(),
+            (static function (): CompletePackage {
+                $package = new CompletePackage('foo/bar', '1.2.3.0', '1.2.3');
+                $package->setDescription('The best extension there is');
+                $package->setType(ExtensionType::PhpModule->value);
+
+                return $package;
+            })(),
+            (static function (): CompletePackage {
+                $package = new CompletePackage('foo/bar', '2.0.0.0', '2.0.0');
+                $package->setDescription('The best extension there is');
+                $package->setType(ExtensionType::PhpModule->value);
+
+                return $package;
+            })(),
+        ]);
+
+        $repoManager = new RepositoryManager(
+            $this->createMock(IOInterface::class),
+            $this->createMock(Config::class),
+            $this->createMock(HttpDownloader::class),
+            null,
+            null,
+        );
+        $repoManager->addRepository($repository);
+
+        $composer = $this->createMock(Composer::class);
+        $composer->method('getRepositoryManager')->willReturn($repoManager);
+
+        self::assertSame(
+            [
+                [
+                    'name' => 'foo/bar',
+                    'description' => 'The best extension there is',
+                ],
+            ],
+            (new FindMatchingPackages())->for($composer, 'bar'),
+        );
+    }
+}