Merge pull request #248 from rtm-ctrlz/fixup/composer-2.9-auth-helper

asgrim · web-flow · commit 40e238ef3aa6 · 2025-11-13T18:05:44.000Z
Remove Composer::AuthHelper usage &amp; update to Composer 2.9.1
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
     ],
     "require": {
         "php": "8.1.*||8.2.*||8.3.*||8.4.*||8.5.*",
-        "composer/composer": "^2.8.12",
+        "composer/composer": "^2.9.1",
         "composer/pcre": "^3.3.2",
         "composer/semver": "^3.4.4",
         "fidry/cpu-core-counter": "^1.3.0",
@@ -37,15 +37,16 @@
         "symfony/console": "^6.4.27",
         "symfony/event-dispatcher": "^6.4.25",
         "symfony/process": "^6.4.26",
-        "thephpf/attestation": "^0.0.2",
+        "thephpf/attestation": "^0.0.3",
         "webmozart/assert": "^1.12.1"
     },
     "require-dev": {
         "ext-openssl": "*",
         "behat/behat": "^3.26.0",
         "bnf/phpstan-psr-container": "^1.1",
         "doctrine/coding-standard": "^14.0.0",
-        "phpstan/phpstan": "^2.1.31",
+        "phpstan/phpstan": "^2.1.32",
+        "phpstan/phpstan-webmozart-assert": "^2.0",
         "phpunit/phpunit": "^10.5.58"
     },
     "replace": {
diff --git a/composer.lock b/composer.lock
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -54,12 +54,6 @@ parameters:
 			count: 1
 			path: src/Command/RepositoryAddCommand.php
 
-		-
-			message: '#^Parameter \#1 \$type of method Php\\Pie\\ComposerIntegration\\PieJsonEditor\:\:addRepository\(\) expects ''composer''\|''path''\|''vcs'', string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Command/RepositoryAddCommand.php
-
 		-
 			message: '#^Cannot cast mixed to string\.$#'
 			identifier: cast.string
@@ -414,18 +408,6 @@ parameters:
 			count: 2
 			path: test/unit/ComposerIntegration/BundledPhpExtensionsRepositoryTest.php
 
-		-
-			message: '#^Method Php\\PieUnitTest\\ComposerIntegration\\PieJsonEditorTest\:\:normaliseJson\(\) should return string but returns string\|false\.$#'
-			identifier: return.type
-			count: 1
-			path: test/unit/ComposerIntegration/PieJsonEditorTest.php
-
-		-
-			message: '#^Parameter \#1 \$fileContent of method Php\\PieUnitTest\\ComposerIntegration\\PieJsonEditorTest\:\:normaliseJson\(\) expects string, string\|false given\.$#'
-			identifier: argument.type
-			count: 9
-			path: test/unit/ComposerIntegration/PieJsonEditorTest.php
-
 		-
 			message: '#^Match expression does not handle remaining value\: string$#'
 			identifier: match.unhandled
@@ -516,12 +498,6 @@ parameters:
 			count: 1
 			path: test/unit/Platform/TargetPhp/PhpBinaryPathTest.php
 
-		-
-			message: '#^Parameter \#4 \$body of class Composer\\Util\\Http\\Response constructor expects string\|null, string\|false given\.$#'
-			identifier: argument.type
-			count: 1
-			path: test/unit/SelfManage/Update/FetchPieReleaseFromGitHubTest.php
-
 		-
 			message: '#^Method Php\\PieUnitTest\\SelfManage\\Verify\\FallbackVerificationUsingOpenSslTest\:\:prepareCertificateAndSignature\(\) should return array\{string, string\} but returns array\{mixed, mixed\}\.$#'
 			identifier: return.type
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,6 +1,7 @@
 includes:
     - phpstan-baseline.neon
     - vendor/bnf/phpstan-psr-container/extension.neon
+    - vendor/phpstan/phpstan-webmozart-assert/extension.neon
 
 parameters:
     level: 10
diff --git a/src/Command/SelfUpdateCommand.php b/src/Command/SelfUpdateCommand.php
@@ -6,7 +6,6 @@
 
 use Composer\IO\IOInterface;
 use Composer\IO\NullIO;
-use Composer\Util\AuthHelper;
 use Composer\Util\HttpDownloader;
 use Php\Pie\ComposerIntegration\PieComposerFactory;
 use Php\Pie\ComposerIntegration\PieComposerRequest;
@@ -118,8 +117,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
         );
 
         $httpDownloader        = new HttpDownloader($this->quieterConsoleIo, $composer->getConfig());
-        $authHelper            = new AuthHelper($this->quieterConsoleIo, $composer->getConfig());
-        $fetchLatestPieRelease = new FetchPieReleaseFromGitHub($this->githubApiBaseUrl, $httpDownloader, $authHelper);
+        $fetchLatestPieRelease = new FetchPieReleaseFromGitHub($this->githubApiBaseUrl, $httpDownloader);
         $verifyPiePhar         = VerifyPieReleaseUsingAttestation::factory();
 
         if ($updateChannel === Channel::Nightly) {
diff --git a/src/ComposerIntegration/Listeners/OverrideDownloadUrlInstallListener.php b/src/ComposerIntegration/Listeners/OverrideDownloadUrlInstallListener.php
@@ -11,7 +11,6 @@
 use Composer\Installer\InstallerEvents;
 use Composer\IO\IOInterface;
 use Composer\Package\CompletePackageInterface;
-use Composer\Util\AuthHelper;
 use Composer\Util\HttpDownloader;
 use Php\Pie\ComposerIntegration\PieComposerRequest;
 use Php\Pie\DependencyResolver\Package;
@@ -90,7 +89,6 @@ function (OperationInterface $operation): void {
                 $url = $packageReleaseAssets->findMatchingReleaseAssetUrl(
                     $targetPlatform,
                     $piePackage,
-                    new AuthHelper($this->io, $this->composer->getConfig()),
                     new HttpDownloader($this->io, $this->composer->getConfig()),
                     $possibleAssetNames,
                 );
diff --git a/src/Downloading/GithubPackageReleaseAssets.php b/src/Downloading/GithubPackageReleaseAssets.php
@@ -5,7 +5,6 @@
 namespace Php\Pie\Downloading;
 
 use Composer\Downloader\TransportException;
-use Composer\Util\AuthHelper;
 use Composer\Util\HttpDownloader;
 use Php\Pie\DependencyResolver\Package;
 use Php\Pie\Platform\TargetPlatform;
@@ -31,14 +30,13 @@ public function __construct(
     public function findMatchingReleaseAssetUrl(
         TargetPlatform $targetPlatform,
         Package $package,
-        AuthHelper $authHelper,
         HttpDownloader $httpDownloader,
         array $possibleReleaseAssetNames,
     ): string {
         $releaseAsset = $this->selectMatchingReleaseAsset(
             $targetPlatform,
             $package,
-            $this->getReleaseAssetsForPackage($package, $authHelper, $httpDownloader),
+            $this->getReleaseAssetsForPackage($package, $httpDownloader),
             $possibleReleaseAssetNames,
         );
 
@@ -72,7 +70,6 @@ private function selectMatchingReleaseAsset(
     /** @return list<array{name: non-empty-string, browser_download_url: non-empty-string, ...}> */
     private function getReleaseAssetsForPackage(
         Package $package,
-        AuthHelper $authHelper,
         HttpDownloader $httpDownloader,
     ): array {
         Assert::notNull($package->downloadUrl());
@@ -84,7 +81,7 @@ private function getReleaseAssetsForPackage(
                     'retry-auth-failure' => true,
                     'http' => [
                         'method' => 'GET',
-                        'header' => $authHelper->addAuthenticationHeader([], $this->githubApiBaseUrl, $package->downloadUrl()),
+                        'header' => [],
                     ],
                 ],
             )->decodeJson();
diff --git a/src/Downloading/PackageReleaseAssets.php b/src/Downloading/PackageReleaseAssets.php
@@ -4,7 +4,6 @@
 
 namespace Php\Pie\Downloading;
 
-use Composer\Util\AuthHelper;
 use Composer\Util\HttpDownloader;
 use Php\Pie\DependencyResolver\Package;
 use Php\Pie\Platform\TargetPlatform;
@@ -20,7 +19,6 @@ interface PackageReleaseAssets
     public function findMatchingReleaseAssetUrl(
         TargetPlatform $targetPlatform,
         Package $package,
-        AuthHelper $authHelper,
         HttpDownloader $httpDownloader,
         array $possibleReleaseAssetNames,
     ): string;
diff --git a/src/ExtensionName.php b/src/ExtensionName.php
@@ -67,7 +67,6 @@ public static function determineFromComposerPackage(PackageInterface $package):
         ) {
             $packageNameParts = explode('/', $package->getPrettyName());
             Assert::count($packageNameParts, 2, 'Expected a package name like vendor/package for ' . $package->getPrettyName());
-            Assert::keyExists($packageNameParts, 1);
 
             return self::normaliseFromString($packageNameParts[1]);
         }
diff --git a/src/SelfManage/Update/FetchPieReleaseFromGitHub.php b/src/SelfManage/Update/FetchPieReleaseFromGitHub.php
@@ -5,7 +5,6 @@
 namespace Php\Pie\SelfManage\Update;
 
 use Composer\Package\Version\VersionParser;
-use Composer\Util\AuthHelper;
 use Composer\Util\HttpDownloader;
 use Php\Pie\File\BinaryFile;
 use RuntimeException;
@@ -28,7 +27,6 @@ final class FetchPieReleaseFromGitHub implements FetchPieRelease
     public function __construct(
         private readonly string $githubApiBaseUrl,
         private readonly HttpDownloader $httpDownloader,
-        private readonly AuthHelper $authHelper,
     ) {
     }
 
@@ -42,7 +40,7 @@ public function latestReleaseMetadata(Channel $updateChannel): ReleaseMetadata
                 'retry-auth-failure' => true,
                 'http' => [
                     'method' => 'GET',
-                    'header' => $this->authHelper->addAuthenticationHeader([], $this->githubApiBaseUrl, $url),
+                    'header' => [],
                 ],
             ],
         )->decodeJson();
@@ -118,7 +116,7 @@ public function downloadContent(ReleaseMetadata $releaseMetadata): BinaryFile
                 'retry-auth-failure' => true,
                 'http' => [
                     'method' => 'GET',
-                    'header' => $this->authHelper->addAuthenticationHeader([], $this->githubApiBaseUrl, $releaseMetadata->downloadUrl),
+                    'header' => [],
                 ],
             ],
         )->getBody();
diff --git a/test/integration/Downloading/GithubPackageReleaseAssetsTest.php b/test/integration/Downloading/GithubPackageReleaseAssetsTest.php
@@ -7,7 +7,6 @@
 use Composer\Factory;
 use Composer\IO\NullIO;
 use Composer\Package\CompletePackage;
-use Composer\Util\AuthHelper;
 use Composer\Util\HttpDownloader;
 use Php\Pie\DependencyResolver\Package;
 use Php\Pie\Downloading\GithubPackageReleaseAssets;
@@ -65,7 +64,6 @@ public function testDeterminingReleaseAssetUrlForWindows(): void
                 ->findMatchingReleaseAssetUrl(
                     $targetPlatform,
                     $package,
-                    new AuthHelper($io, $config),
                     new HttpDownloader($io, $config),
                     WindowsExtensionAssetName::zipNames(
                         $targetPlatform,
diff --git a/test/unit/ComposerIntegration/PieJsonEditorTest.php b/test/unit/ComposerIntegration/PieJsonEditorTest.php
@@ -10,6 +10,7 @@
 
 use function dirname;
 use function file_get_contents;
+use function file_put_contents;
 use function json_decode;
 use function json_encode;
 use function sys_get_temp_dir;
@@ -35,6 +36,53 @@ public function testCreatingPieJson(): void
         );
     }
 
+    public function testCanReadOldRepositoryConfiguration(): void
+    {
+        $testPieJson = sys_get_temp_dir() . DIRECTORY_SEPARATOR . uniqid('pie_json_test_', true) . '.json';
+
+        $editor = new PieJsonEditor($testPieJson, dirname($testPieJson));
+        $editor->ensureExists();
+        file_put_contents(
+            $testPieJson,
+            $this->normaliseJson(
+                <<<'JSON'
+                {
+                    "repositories": {
+                        "https://github.com/php/pie": {
+                            "type": "vcs",
+                            "url": "https://github.com/php/pie"
+                        }
+                    }
+                }
+                JSON,
+            ),
+        );
+
+        $editor->addRepository('vcs', 'https://github.com/asgrim/example_pie_extension');
+
+        self::assertSame(
+            $this->normaliseJson(
+                <<<'JSON'
+                {
+                    "repositories": [
+                        {
+                            "name": "https://github.com/php/pie",
+                            "type": "vcs",
+                            "url": "https://github.com/php/pie"
+                        },
+                        {
+                            "name": "https://github.com/asgrim/example_pie_extension",
+                            "type": "vcs",
+                            "url": "https://github.com/asgrim/example_pie_extension"
+                        }
+                    ]
+                }
+                JSON,
+            ),
+            $this->normaliseJson(file_get_contents($testPieJson)),
+        );
+    }
+
     public function testCanAddRequire(): void
     {
         $testPieJson = sys_get_temp_dir() . DIRECTORY_SEPARATOR . uniqid('pie_json_test_', true) . '.json';
@@ -94,12 +142,13 @@ public function testCanAddAndRemoveRepositories(): void
 
         $expectedRepoContent = $this->normaliseJson(<<<'EOF'
             {
-                "repositories": {
-                    "https://github.com/php/pie": {
+                "repositories": [
+                    {
+                        "name": "https://github.com/php/pie",
                         "type": "vcs",
                         "url": "https://github.com/php/pie"
                     }
-                }
+                ]
             }
             EOF);
 
@@ -116,8 +165,6 @@ public function testCanAddAndRemoveRepositories(): void
 
         $noRepositoriesContent = $this->normaliseJson(<<<'EOF'
             {
-                "repositories": {
-                }
             }
             EOF);
 
@@ -135,9 +182,11 @@ public function testCanAddAndRemoveRepositories(): void
         self::assertSame(
             $this->normaliseJson(<<<'EOF'
             {
-                "repositories": {
-                    "packagist.org": false
-                }
+                "repositories": [
+                    {
+                        "packagist.org": false
+                    }
+                ]
             }
             EOF),
             $this->normaliseJson(file_get_contents($testPieJson)),
@@ -163,12 +212,13 @@ public function testCanAddAndRemoveWithTrailingSlash(): void
 
         $expectedRepoContent = $this->normaliseJson(<<<'EOF'
             {
-                "repositories": {
-                    "/pwd/dummy": {
+                "repositories": [
+                    {
+                        "name": "/pwd/dummy",
                         "type": "path",
                         "url": "/pwd/dummy/"
                     }
-                }
+                ]
             }
             EOF);
 
@@ -185,8 +235,6 @@ public function testCanAddAndRemoveWithTrailingSlash(): void
 
         $noRepositoriesContent = $this->normaliseJson(<<<'EOF'
             {
-                "repositories": {
-                }
             }
             EOF);
 
@@ -196,8 +244,8 @@ public function testCanAddAndRemoveWithTrailingSlash(): void
         );
     }
 
-    private function normaliseJson(string $fileContent): string
+    private function normaliseJson(string|false $fileContent): string
     {
-        return json_encode(json_decode($fileContent));
+        return (string) json_encode(json_decode((string) $fileContent));
     }
 }
diff --git a/test/unit/Downloading/GithubPackageReleaseAssetsTest.php b/test/unit/Downloading/GithubPackageReleaseAssetsTest.php
diff --git a/test/unit/SelfManage/Update/FetchPieReleaseFromGitHubTest.php b/test/unit/SelfManage/Update/FetchPieReleaseFromGitHubTest.php
diff --git a/test/unit/SelfManage/Verify/FallbackVerificationUsingOpenSslTest.php b/test/unit/SelfManage/Verify/FallbackVerificationUsingOpenSslTest.php

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ public static function determineFromComposerPackage(PackageInterface $package):`
`67`	`67`	`) {`
`68`	`68`	`$packageNameParts = explode('/', $package->getPrettyName());`
`69`	`69`	`Assert::count($packageNameParts, 2, 'Expected a package name like vendor/package for ' . $package->getPrettyName());`
`70`		`- Assert::keyExists($packageNameParts, 1);`
`71`	`70`
`72`	`71`	`return self::normaliseFromString($packageNameParts[1]);`
`73`	`72`	`}`