php/archived-pie
1
0
Fork 0
mirror of https://github.com/php/pie.git synced 2026-03-23 23:12:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #488 from asgrim/436-forwards-compat-download-url-methods-list

Browse Source 
436: add forward compatibility for download-url-method having a list
This commit is contained in:
James Titcumb
2026-01-26 16:33:09 +00:00
committed by GitHub
parent 1cf5c590e5 d1f653dbc4
commit fbfc20e97d
3 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpstan-baseline.neon
View File

@@ -420,6 +420,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

14
src/DependencyResolver/Package.php
View File

@@ -16,8 +16,10 @@ use Webmozart\Assert\Assert;
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 @@ final class Package
$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;

31
test/unit/DependencyResolver/PackageTest.php
View File

@@ -8,6 +8,7 @@ use Composer\Package\CompletePackage;
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 @@ final class PackageTest extends TestCase
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);
}
}