Merge pull request #153 from asgrim/150-fix-ext-conflict

Fix conflict trying to install an ext that is already enabled

src/ComposerIntegration/ComposerIntegrationHandler.php

@@ -53,7 +53,12 @@ public function __invoke(Package $package, Composer $composer, TargetPlatform $t
             $composer->getRepositoryManager()->getLocalRepository()->removePackage($pkg);
         }
 
-        $composerInstaller = Installer::create($this->arrayCollectionIo, $composer);
+        $composerInstaller = PieComposerInstaller::createWithPhpBinary(
+            $targetPlatform->phpBinaryPath,
+            $package->extensionName,
+            $this->arrayCollectionIo,
+            $composer,
+        );
         $composerInstaller
             ->setAllowedTypes(['php-ext', 'php-ext-zend'])
             ->setInstall(true)

src/ComposerIntegration/PhpBinaryPathBasedPlatformRepository.php

@@ -8,6 +8,7 @@
 use Composer\Pcre\Preg;
 use Composer\Repository\PlatformRepository;
 use Composer\Semver\VersionParser;
+use Php\Pie\ExtensionName;
 use Php\Pie\Platform\TargetPhp\PhpBinaryPath;
 use UnexpectedValueException;
 
@@ -19,7 +20,7 @@ class PhpBinaryPathBasedPlatformRepository extends PlatformRepository
 {
     private VersionParser $versionParser;
 
-    public function __construct(PhpBinaryPath $phpBinaryPath)
+    public function __construct(PhpBinaryPath $phpBinaryPath, ExtensionName|null $extensionBeingInstalled)
     {
         $this->versionParser = new VersionParser();
         $this->packages      = [];
@@ -32,6 +33,16 @@ public function __construct(PhpBinaryPath $phpBinaryPath)
         $extVersions = $phpBinaryPath->extensions();
 
         foreach ($extVersions as $extension => $extensionVersion) {
+            /**
+             * If the extension we're trying to exclude is not excluded from this list if it is already installed
+             * and enabled, it conflicts when running {@see ComposerIntegrationHandler}.
+             *
+             * @link https://github.com/php/pie/issues/150
+             */
+            if ($extensionBeingInstalled !== null && $extension === $extensionBeingInstalled->name()) {
+                continue;
+            }
+
             $this->addPackage($this->packageForExtension($extension, $extensionVersion));
         }
 

src/ComposerIntegration/PieComposerInstaller.php

@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Php\Pie\ComposerIntegration;
+
+use Composer\Composer;
+use Composer\Installer;
+use Composer\IO\IOInterface;
+use Composer\Repository\PlatformRepository;
+use Php\Pie\ExtensionName;
+use Php\Pie\Platform\TargetPhp\PhpBinaryPath;
+use Webmozart\Assert\Assert;
+
+/**
+ * @internal This is not public API for PIE, so should not be depended upon unless you accept the risk of BC breaks
+ *
+ * @psalm-suppress PropertyNotSetInConstructor Property $fixedRootPackage is defined in parent
+ */
+class PieComposerInstaller extends Installer
+{
+    private PhpBinaryPath|null $phpBinaryPath           = null;
+    private ExtensionName|null $extensionBeingInstalled = null;
+
+    protected function createPlatformRepo(bool $forUpdate): PlatformRepository
+    {
+        Assert::notNull($this->phpBinaryPath, '$phpBinaryPath was not set, maybe createWithPhpBinary was not used?');
+        Assert::notNull($this->extensionBeingInstalled, '$extensionBeingInstalled was not set, maybe createWithPhpBinary was not used?');
+
+        return new PhpBinaryPathBasedPlatformRepository($this->phpBinaryPath, $this->extensionBeingInstalled);
+    }
+
+    public static function createWithPhpBinary(
+        PhpBinaryPath $php,
+        ExtensionName $extensionBeingInstalled,
+        IOInterface $io,
+        Composer $composer,
+    ): self {
+        /** @psalm-suppress InvalidArgument some kind of unrelated type mismatch, defined in parent */
+        $composerInstaller = new self(
+            $io,
+            $composer->getConfig(),
+            $composer->getPackage(),
+            $composer->getDownloadManager(),
+            $composer->getRepositoryManager(),
+            $composer->getLocker(),
+            $composer->getInstallationManager(),
+            $composer->getEventDispatcher(),
+            $composer->getAutoloadGenerator(),
+        );
+
+        $composerInstaller->phpBinaryPath           = $php;
+        $composerInstaller->extensionBeingInstalled = $extensionBeingInstalled;
+
+        return $composerInstaller;
+    }
+}

src/ComposerIntegration/VersionSelectorFactory.php

@@ -35,7 +35,7 @@ public static function make(
     ): VersionSelector {
         return new VersionSelector(
             self::factoryRepositorySet($composer, $requestedPackageAndVersion->version),
-            new PhpBinaryPathBasedPlatformRepository($targetPlatform->phpBinaryPath),
+            new PhpBinaryPathBasedPlatformRepository($targetPlatform->phpBinaryPath, null),
         );
     }
 }

test/unit/ComposerIntegration/PhpBinaryPathBasedPlatformRepositoryTest.php

@@ -6,6 +6,7 @@
 
 use Composer\Package\PackageInterface;
 use Php\Pie\ComposerIntegration\PhpBinaryPathBasedPlatformRepository;
+use Php\Pie\ExtensionName;
 use Php\Pie\Platform\TargetPhp\PhpBinaryPath;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
@@ -30,7 +31,7 @@ public function testPlatformRepositoryContainsExpectedPacakges(): void
                 'another' => '1.2.3-alpha.34',
             ]);
 
-        $platformRepository = new PhpBinaryPathBasedPlatformRepository($phpBinaryPath);
+        $platformRepository = new PhpBinaryPathBasedPlatformRepository($phpBinaryPath, null);
 
         self::assertSame(
             [
@@ -46,4 +47,33 @@ public function testPlatformRepositoryContainsExpectedPacakges(): void
             ),
         );
     }
+
+    public function testPlatformRepositoryExcludesExtensionBeingInstalled(): void
+    {
+        $extensionBeingInstalled = ExtensionName::normaliseFromString('extension_being_installed');
+
+        $phpBinaryPath = $this->createMock(PhpBinaryPath::class);
+        $phpBinaryPath->expects(self::once())
+            ->method('version')
+            ->willReturn('8.1.0');
+        $phpBinaryPath->expects(self::once())
+            ->method('extensions')
+            ->willReturn([
+                'foo' => '8.1.0',
+                'extension_being_installed' => '1.2.3',
+            ]);
+
+        $platformRepository = new PhpBinaryPathBasedPlatformRepository($phpBinaryPath, $extensionBeingInstalled);
+
+        self::assertSame(
+            [
+                'php:8.1.0',
+                'ext-foo:8.1.0',
+            ],
+            array_map(
+                static fn (PackageInterface $package): string => $package->getName() . ':' . $package->getPrettyVersion(),
+                $platformRepository->getPackages(),
+            ),
+        );
+    }
 }