Merge pull request #490 from php/1.3.x

Merge up 1.3 to 1.4 - forwards compat for download-url-method lists

Author: asgrim

phpstan-baseline.neon

@@ -414,6 +414,18 @@ parameters:
 			count: 1
 			path: test/unit/ComposerIntegration/VendorCleanupTest.php
 
+		-
+			message: '#^Parameter \#1 \$phpExt of method Composer\\Package\\Package\:\:setPhpExt\(\) expects array\{extension\-name\?\: string, priority\?\: int, support\-zts\?\: bool, support\-nts\?\: bool, build\-path\?\: string\|null, download\-url\-method\?\: string, os\-families\?\: non\-empty\-list\<non\-empty\-string\>, os\-families\-exclude\?\: non\-empty\-list\<non\-empty\-string\>, \.\.\.\}\|null, array\{download\-url\-method\: array\{''composer\-default''\}\} given\.$#'
+			identifier: argument.type
+			count: 1
+			path: test/unit/DependencyResolver/PackageTest.php
+
+		-
+			message: '#^Parameter \#1 \$phpExt of method Composer\\Package\\Package\:\:setPhpExt\(\) expects array\{extension\-name\?\: string, priority\?\: int, support\-zts\?\: bool, support\-nts\?\: bool, build\-path\?\: string\|null, download\-url\-method\?\: string, os\-families\?\: non\-empty\-list\<non\-empty\-string\>, os\-families\-exclude\?\: non\-empty\-list\<non\-empty\-string\>, \.\.\.\}\|null, array\{download\-url\-method\: array\{''pre\-packaged\-source'', ''composer\-default''\}\} given\.$#'
+			identifier: argument.type
+			count: 1
+			path: test/unit/DependencyResolver/PackageTest.php
+
 		-
 			message: '#^Parameter \#2 \$extractedSourcePath of static method Php\\Pie\\Downloading\\DownloadedPackage\:\:fromPackageAndExtractedPath\(\) expects string, string\|false given\.$#'
 			identifier: argument.type

src/DependencyResolver/Package.php

@@ -16,8 +16,10 @@
 use function array_key_exists;
 use function array_map;
 use function array_slice;
+use function count;
 use function explode;
 use function implode;
+use function is_array;
 use function parse_url;
 use function str_contains;
 use function str_starts_with;
@@ -89,7 +91,17 @@ public static function fromComposerCompletePackage(CompletePackageInterface $com
         $package->priority = $phpExtOptions['priority'] ?? 80;
 
         if ($phpExtOptions !== null && array_key_exists('download-url-method', $phpExtOptions)) {
-            $package->downloadUrlMethod = DownloadUrlMethod::tryFrom($phpExtOptions['download-url-method']);
+            /** @var string|list<string> $method */
+            $method = $phpExtOptions['download-url-method'];
+            if (is_array($method)) {
+                if (count($method) !== 1) {
+                    throw new InvalidArgumentException('This extension requires a newer version of PIE. Multiple download-url-methods are not supported until PIE 1.4.0.');
+                }
+
+                $method = $method[0];
+            }
+
+            $package->downloadUrlMethod = DownloadUrlMethod::tryFrom($method);
         }
 
         return $package;

test/unit/DependencyResolver/PackageTest.php

@@ -8,6 +8,7 @@
 use Composer\Package\CompletePackageInterface;
 use InvalidArgumentException;
 use Php\Pie\DependencyResolver\Package;
+use Php\Pie\Downloading\DownloadUrlMethod;
 use Php\Pie\ExtensionName;
 use Php\Pie\ExtensionType;
 use Php\Pie\Platform\OperatingSystemFamily;
@@ -146,4 +147,34 @@ public function testFromComposerCompletePackageWithBuildPath(): void
         self::assertSame('vendor/foo:1.2.3', $package->prettyNameAndVersion());
         self::assertSame('some/subdirectory/path/', $package->buildPath());
     }
+
+    public function testDownloadUrlMethodWithStringHasValidDownloadUrlMethod(): void
+    {
+        $composerCompletePackage = new CompletePackage('vendor/foo', '1.2.3.0', '1.2.3');
+        $composerCompletePackage->setPhpExt(['download-url-method' => 'composer-default']);
+
+        $package = Package::fromComposerCompletePackage($composerCompletePackage);
+
+        self::assertSame(DownloadUrlMethod::ComposerDefaultDownload, $package->downloadUrlMethod());
+    }
+
+    public function testDownloadUrlMethodWithSingleItemListHasValidDownloadUrlMethod(): void
+    {
+        $composerCompletePackage = new CompletePackage('vendor/foo', '1.2.3.0', '1.2.3');
+        $composerCompletePackage->setPhpExt(['download-url-method' => ['composer-default']]);
+
+        $package = Package::fromComposerCompletePackage($composerCompletePackage);
+
+        self::assertSame(DownloadUrlMethod::ComposerDefaultDownload, $package->downloadUrlMethod());
+    }
+
+    public function testDownloadUrlMethodWithMultiItemListIsNotYetSupported(): void
+    {
+        $composerCompletePackage = new CompletePackage('vendor/foo', '1.2.3.0', '1.2.3');
+        $composerCompletePackage->setPhpExt(['download-url-method' => ['pre-packaged-source', 'composer-default']]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('This extension requires a newer version of PIE. Multiple download-url-methods are not supported until PIE 1.4.0.');
+        Package::fromComposerCompletePackage($composerCompletePackage);
+    }
 }

test/unit/Platform/TargetPhp/PhpBinaryPathTest.php

@@ -51,7 +51,7 @@
 use const PHP_MAJOR_VERSION;
 use const PHP_MINOR_VERSION;
 use const PHP_OS_FAMILY;
-use const PHP_VERSION;
+use const PHP_RELEASE_VERSION;
 
 #[CoversClass(PhpBinaryPath::class)]
 final class PhpBinaryPathTest extends TestCase
@@ -117,7 +117,7 @@ public function testVersionFromCurrentProcess(): void
         $phpBinary = PhpBinaryPath::fromCurrentProcess();
 
         self::assertSame(
-            PHP_VERSION,
+            PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION . '.' . PHP_RELEASE_VERSION,
             $phpBinary->version(),
         );