Use Composer in InstalledPiePackages

src/Command/ShowCommand.php

@@ -5,13 +5,17 @@
 namespace Php\Pie\Command;
 
 use Php\Pie\BinaryFile;
+use Php\Pie\ComposerIntegration\PieComposerFactory;
+use Php\Pie\ComposerIntegration\PieComposerRequest;
 use Php\Pie\ComposerIntegration\PieInstalledJsonMetadataKeys;
 use Php\Pie\Installing\BinaryFileFailedVerification;
 use Php\Pie\Platform\InstalledPiePackages;
 use Php\Pie\Platform\OperatingSystem;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 
 use function array_key_exists;
@@ -31,6 +35,7 @@ final class ShowCommand extends Command
 {
     public function __construct(
         private readonly InstalledPiePackages $installedPiePackages,
+        private readonly ContainerInterface $container,
     ) {
         parent::__construct();
     }
@@ -46,7 +51,15 @@ public function execute(InputInterface $input, OutputInterface $output): int
     {
         $targetPlatform = CommandHelper::determineTargetPlatformFromInputs($input, $output);
 
-        $piePackages          = $this->installedPiePackages->allPiePackages($targetPlatform);
+        $composer = PieComposerFactory::createPieComposer(
+            $this->container,
+            PieComposerRequest::noOperation(
+                new NullOutput(),
+                $targetPlatform,
+            ),
+        );
+
+        $piePackages          = $this->installedPiePackages->allPiePackages($composer);
         $phpEnabledExtensions = $targetPlatform->phpBinaryPath->extensions();
         $extensionPath        = $targetPlatform->phpBinaryPath->extensionPath();
         $extensionEnding      = $targetPlatform->operatingSystem === OperatingSystem::Windows ? '.dll' : '.so';

src/Command/UninstallCommand.php

@@ -4,19 +4,20 @@
 
 namespace Php\Pie\Command;
 
+use Composer\Composer;
 use Php\Pie\ComposerIntegration\ComposerIntegrationHandler;
 use Php\Pie\ComposerIntegration\PieComposerFactory;
 use Php\Pie\ComposerIntegration\PieComposerRequest;
 use Php\Pie\ComposerIntegration\PieOperation;
 use Php\Pie\DependencyResolver\Package;
 use Php\Pie\DependencyResolver\RequestedPackageAndVersion;
 use Php\Pie\Platform\InstalledPiePackages;
-use Php\Pie\Platform\TargetPlatform;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Webmozart\Assert\Assert;
 
@@ -57,7 +58,15 @@ public function execute(InputInterface $input, OutputInterface $output): int
 
         $targetPlatform = CommandHelper::determineTargetPlatformFromInputs($input, $output);
 
-        $piePackage = $this->findPiePackageByPackageName($packageToRemove, $targetPlatform);
+        $composer = PieComposerFactory::createPieComposer(
+            $this->container,
+            PieComposerRequest::noOperation(
+                new NullOutput(),
+                $targetPlatform,
+            ),
+        );
+
+        $piePackage = $this->findPiePackageByPackageName($packageToRemove, $composer);
 
         if ($piePackage === null) {
             $output->writeln('<error>No package found: ' . $packageToRemove . '</error>');
@@ -88,9 +97,9 @@ public function execute(InputInterface $input, OutputInterface $output): int
         return 0;
     }
 
-    private function findPiePackageByPackageName(string $packageToRemove, TargetPlatform $targetPlatform): Package|null
+    private function findPiePackageByPackageName(string $packageToRemove, Composer $composer): Package|null
     {
-        $piePackages = $this->installedPiePackages->allPiePackages($targetPlatform);
+        $piePackages = $this->installedPiePackages->allPiePackages($composer);
 
         foreach ($piePackages as $piePackage) {
             if ($piePackage->name() === $packageToRemove) {

src/Platform/InstalledPiePackages.php

@@ -4,13 +4,10 @@
 
 namespace Php\Pie\Platform;
 
+use Composer\Composer;
 use Composer\Package\BasePackage;
 use Composer\Package\CompletePackageInterface;
-use Php\Pie\ComposerIntegration\PieComposerFactory;
-use Php\Pie\ComposerIntegration\PieComposerRequest;
 use Php\Pie\DependencyResolver\Package;
-use Psr\Container\ContainerInterface;
-use Symfony\Component\Console\Output\NullOutput;
 
 use function array_combine;
 use function array_filter;
@@ -23,31 +20,20 @@
  */
 class InstalledPiePackages
 {
-    /** @psalm-suppress PossiblyUnusedMethod no direct reference; used in service locator */
-    public function __construct(private readonly ContainerInterface $container)
-    {
-    }
-
     /**
      * Returns a list of PIE packages according to PIE; this does NOT check if
      * the extension is actually enabled in the target PHP.
      *
      * @return ListOfPiePackages
      */
-    public function allPiePackages(TargetPlatform $targetPlatform): array
+    public function allPiePackages(Composer $composer): array
     {
         $composerInstalledPackages = array_map(
             static function (CompletePackageInterface $package): Package {
                 return Package::fromComposerCompletePackage($package);
             },
             array_filter(
-                PieComposerFactory::createPieComposer(
-                    $this->container,
-                    PieComposerRequest::noOperation(
-                        new NullOutput(),
-                        $targetPlatform,
-                    ),
-                )
+                $composer
                     ->getRepositoryManager()
                     ->getLocalRepository()
                     ->getPackages(),

test/unit/Platform/InstalledPiePackagesTest.php

@@ -4,6 +4,10 @@
 
 namespace Php\PieUnitTest\Platform;
 
+use Composer\Composer;
+use Composer\Package\CompletePackage;
+use Composer\Repository\InstalledRepositoryInterface;
+use Composer\Repository\RepositoryManager;
 use Php\Pie\Platform\InstalledPiePackages;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
@@ -13,6 +17,26 @@ final class InstalledPiePackagesTest extends TestCase
 {
     public function testAllPiePackages(): void
     {
-        self::fail('to be implemented'); // @todo implement this test
+        $localRepo = $this->createMock(InstalledRepositoryInterface::class);
+        $localRepo->method('getPackages')->willReturn([
+            new CompletePackage('foo/bar1', '1.2.3.0', '1.2.3'),
+            new CompletePackage('foo/bar2', '1.2.3.0', '1.2.3'),
+        ]);
+
+        $repoManager = $this->createMock(RepositoryManager::class);
+        $repoManager->method('getLocalRepository')->willReturn($localRepo);
+
+        $composer = $this->createMock(Composer::class);
+        $composer->method('getRepositoryManager')->willReturn($repoManager);
+
+        $packages = (new InstalledPiePackages())->allPiePackages($composer);
+
+        self::assertArrayHasKey('bar1', $packages);
+        self::assertArrayHasKey('bar2', $packages);
+
+        self::assertSame('bar1', $packages['bar1']->extensionName()->name());
+        self::assertSame('foo/bar1', $packages['bar1']->name());
+        self::assertSame('bar2', $packages['bar2']->extensionName()->name());
+        self::assertSame('foo/bar2', $packages['bar2']->name());
     }
 }