Update deps
Jordi Boggiano
parent
1c9fbeb978
commit
82bc8cf94e
|
|
@ -84,22 +84,22 @@
|
|||
},
|
||||
{
|
||||
"name": "composer/class-map-generator",
|
||||
"version": "1.0.0",
|
||||
"version": "1.1.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/composer/class-map-generator.git",
|
||||
"reference": "1e1cb2b791facb2dfe32932a7718cf2571187513"
|
||||
"reference": "953cc4ea32e0c31f2185549c7d216d7921f03da9"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/composer/class-map-generator/zipball/1e1cb2b791facb2dfe32932a7718cf2571187513",
|
||||
"reference": "1e1cb2b791facb2dfe32932a7718cf2571187513",
|
||||
"url": "https://api.github.com/repos/composer/class-map-generator/zipball/953cc4ea32e0c31f2185549c7d216d7921f03da9",
|
||||
"reference": "953cc4ea32e0c31f2185549c7d216d7921f03da9",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"composer/pcre": "^2 || ^3",
|
||||
"composer/pcre": "^2.1 || ^3.1",
|
||||
"php": "^7.2 || ^8.0",
|
||||
"symfony/finder": "^4.4 || ^5.3 || ^6"
|
||||
"symfony/finder": "^4.4 || ^5.3 || ^6 || ^7"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpstan/phpstan": "^1.6",
|
||||
|
|
@ -137,7 +137,7 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/composer/class-map-generator/issues",
|
||||
"source": "https://github.com/composer/class-map-generator/tree/1.0.0"
|
||||
"source": "https://github.com/composer/class-map-generator/tree/1.1.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -153,7 +153,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-06-19T11:31:27+00:00"
|
||||
"time": "2023-06-30T13:58:57+00:00"
|
||||
},
|
||||
{
|
||||
"name": "composer/metadata-minifier",
|
||||
|
|
@ -1103,16 +1103,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/filesystem",
|
||||
"version": "v5.4.23",
|
||||
"version": "v5.4.25",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/filesystem.git",
|
||||
"reference": "b2f79d86cd9e7de0fff6d03baa80eaed7a5f38b5"
|
||||
"reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/filesystem/zipball/b2f79d86cd9e7de0fff6d03baa80eaed7a5f38b5",
|
||||
"reference": "b2f79d86cd9e7de0fff6d03baa80eaed7a5f38b5",
|
||||
"url": "https://api.github.com/repos/symfony/filesystem/zipball/0ce3a62c9579a53358d3a7eb6b3dfb79789a6364",
|
||||
"reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1147,7 +1147,7 @@
|
|||
"description": "Provides basic utilities for the filesystem",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/filesystem/tree/v5.4.23"
|
||||
"source": "https://github.com/symfony/filesystem/tree/v5.4.25"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -1163,7 +1163,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2023-03-02T11:38:35+00:00"
|
||||
"time": "2023-05-31T13:04:02+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/finder",
|
||||
|
|
@ -2034,16 +2034,16 @@
|
|||
"packages-dev": [
|
||||
{
|
||||
"name": "phpstan/phpstan",
|
||||
"version": "1.10.16",
|
||||
"version": "1.10.25",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/phpstan/phpstan.git",
|
||||
"reference": "352bdbb960bb523e3d71b834862589f910921c23"
|
||||
"reference": "578f4e70d117f9a90699324c555922800ac38d8c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/352bdbb960bb523e3d71b834862589f910921c23",
|
||||
"reference": "352bdbb960bb523e3d71b834862589f910921c23",
|
||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/578f4e70d117f9a90699324c555922800ac38d8c",
|
||||
"reference": "578f4e70d117f9a90699324c555922800ac38d8c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2092,7 +2092,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2023-06-05T08:21:46+00:00"
|
||||
"time": "2023-07-06T12:11:37+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpstan/phpstan-deprecation-rules",
|
||||
|
|
@ -2316,16 +2316,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/phpunit-bridge",
|
||||
"version": "v6.3.0",
|
||||
"version": "v6.3.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/phpunit-bridge.git",
|
||||
"reference": "f8d75b4d9bf7243979b2c2e5e6cd73f03e10579f"
|
||||
"reference": "0b0bf59b0d9bd1422145a123a67fb12af546ef0d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/f8d75b4d9bf7243979b2c2e5e6cd73f03e10579f",
|
||||
"reference": "f8d75b4d9bf7243979b2c2e5e6cd73f03e10579f",
|
||||
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/0b0bf59b0d9bd1422145a123a67fb12af546ef0d",
|
||||
"reference": "0b0bf59b0d9bd1422145a123a67fb12af546ef0d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2377,7 +2377,7 @@
|
|||
"description": "Provides utilities for PHPUnit, especially user deprecation notices management",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/phpunit-bridge/tree/v6.3.0"
|
||||
"source": "https://github.com/symfony/phpunit-bridge/tree/v6.3.1"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -2393,7 +2393,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2023-05-30T09:01:24+00:00"
|
||||
"time": "2023-06-23T13:25:16+00:00"
|
||||
}
|
||||
],
|
||||
"aliases": [],
|
||||
|
|
|
|||
|
|
@ -85,11 +85,6 @@ parameters:
|
|||
count: 1
|
||||
path: ../src/Composer/Downloader/GzipDownloader.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$string of function rawurldecode expects string, string\\|false given\\.$#"
|
||||
count: 1
|
||||
path: ../src/Composer/Downloader/VcsDownloader.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#3 \\$length of function substr expects int\\|null, int\\<0, max\\>\\|false given\\.$#"
|
||||
count: 1
|
||||
|
|
|
|||
|
|
@ -645,26 +645,11 @@ parameters:
|
|||
count: 1
|
||||
path: ../src/Composer/Command/ShowCommand.php
|
||||
|
||||
-
|
||||
message: "#^Cannot call method getId\\(\\) on Composer\\\\Package\\\\BasePackage\\|int\\.$#"
|
||||
count: 1
|
||||
path: ../src/Composer/Command/ShowCommand.php
|
||||
|
||||
-
|
||||
message: "#^Cannot call method getInstallationManager\\(\\) on Composer\\\\Composer\\|null\\.$#"
|
||||
count: 2
|
||||
path: ../src/Composer/Command/ShowCommand.php
|
||||
|
||||
-
|
||||
message: "#^Cannot call method getPrettyVersion\\(\\) on Composer\\\\Package\\\\BasePackage\\|int\\.$#"
|
||||
count: 1
|
||||
path: ../src/Composer/Command/ShowCommand.php
|
||||
|
||||
-
|
||||
message: "#^Cannot call method getVersion\\(\\) on Composer\\\\Package\\\\BasePackage\\|int\\.$#"
|
||||
count: 1
|
||||
path: ../src/Composer/Command/ShowCommand.php
|
||||
|
||||
-
|
||||
message: "#^Foreach overwrites \\$packages with its value variable\\.$#"
|
||||
count: 1
|
||||
|
|
@ -675,11 +660,6 @@ parameters:
|
|||
count: 1
|
||||
path: ../src/Composer/Command/ShowCommand.php
|
||||
|
||||
-
|
||||
message: "#^Method Composer\\\\Command\\\\ShowCommand\\:\\:getPackage\\(\\) should return array\\{Composer\\\\Package\\\\CompletePackageInterface\\|null, array\\<string, string\\>\\} but returns array\\{Composer\\\\Package\\\\BasePackage\\|int\\|null, array\\<string, string\\>\\}\\.$#"
|
||||
count: 1
|
||||
path: ../src/Composer/Command/ShowCommand.php
|
||||
|
||||
-
|
||||
message: "#^Only booleans are allowed in &&, Composer\\\\Composer\\|null given on the right side\\.$#"
|
||||
count: 1
|
||||
|
|
@ -720,11 +700,6 @@ parameters:
|
|||
count: 2
|
||||
path: ../src/Composer/Command/ShowCommand.php
|
||||
|
||||
-
|
||||
message: "#^Only booleans are allowed in a negated boolean, Composer\\\\Package\\\\BasePackage\\|int\\|null given\\.$#"
|
||||
count: 1
|
||||
path: ../src/Composer/Command/ShowCommand.php
|
||||
|
||||
-
|
||||
message: "#^Only booleans are allowed in a negated boolean, Composer\\\\Repository\\\\RepositorySet\\|null given\\.$#"
|
||||
count: 1
|
||||
|
|
@ -805,11 +780,6 @@ parameters:
|
|||
count: 2
|
||||
path: ../src/Composer/Command/ShowCommand.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$package of method Composer\\\\Repository\\\\CompositeRepository\\:\\:hasPackage\\(\\) expects Composer\\\\Package\\\\PackageInterface, Composer\\\\Package\\\\BasePackage\\|int given\\.$#"
|
||||
count: 1
|
||||
path: ../src/Composer/Command/ShowCommand.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$str of function strtok expects string, array\\|string given\\.$#"
|
||||
count: 1
|
||||
|
|
@ -1930,36 +1900,11 @@ parameters:
|
|||
count: 1
|
||||
path: ../src/Composer/Downloader/VcsDownloader.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$haystack of function strpos expects string, string\\|false given\\.$#"
|
||||
count: 2
|
||||
path: ../src/Composer/Downloader/VcsDownloader.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$package of method Composer\\\\Downloader\\\\VcsDownloader\\:\\:cleanChanges\\(\\) expects Composer\\\\Package\\\\PackageInterface, Composer\\\\Package\\\\PackageInterface\\|null given\\.$#"
|
||||
count: 1
|
||||
path: ../src/Composer/Downloader/VcsDownloader.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$path of function realpath expects string, string\\|false given\\.$#"
|
||||
count: 1
|
||||
path: ../src/Composer/Downloader/VcsDownloader.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$path of static method Composer\\\\Util\\\\Filesystem\\:\\:isLocalPath\\(\\) expects string, string\\|false given\\.$#"
|
||||
count: 1
|
||||
path: ../src/Composer/Downloader/VcsDownloader.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$str of function rawurldecode expects string, string\\|false given\\.$#"
|
||||
count: 1
|
||||
path: ../src/Composer/Downloader/VcsDownloader.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$string of function substr expects string, string\\|false given\\.$#"
|
||||
count: 1
|
||||
path: ../src/Composer/Downloader/VcsDownloader.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#2 \\$toReference of method Composer\\\\Downloader\\\\VcsDownloader\\:\\:getCommitLogs\\(\\) expects string, string\\|null given\\.$#"
|
||||
count: 1
|
||||
|
|
@ -2500,11 +2445,6 @@ parameters:
|
|||
count: 1
|
||||
path: ../src/Composer/Installer/SuggestedPackagesReporter.php
|
||||
|
||||
-
|
||||
message: "#^Method Composer\\\\Json\\\\JsonFile\\:\\:encode\\(\\) should return string but returns string\\|false\\.$#"
|
||||
count: 1
|
||||
path: ../src/Composer/Json/JsonFile.php
|
||||
|
||||
-
|
||||
message: "#^Only booleans are allowed in &&, Composer\\\\IO\\\\IOInterface\\|null given on the left side\\.$#"
|
||||
count: 1
|
||||
|
|
|
|||
|
|
@ -756,10 +756,14 @@ EOT
|
|||
}
|
||||
|
||||
// select preferred package according to policy rules
|
||||
if (!$matchedPackage && $matches && $preferred = $policy->selectPreferredPackages($pool, $matches)) {
|
||||
if (null === $matchedPackage && $matches && $preferred = $policy->selectPreferredPackages($pool, $matches)) {
|
||||
$matchedPackage = $pool->literalToPackage($preferred[0]);
|
||||
}
|
||||
|
||||
if ($matchedPackage !== null && !$matchedPackage instanceof CompletePackageInterface) {
|
||||
throw new \LogicException('ShowCommand::getPackage can only work with CompletePackageInterface, but got '.get_class($matchedPackage));
|
||||
}
|
||||
|
||||
return [$matchedPackage, $versions];
|
||||
}
|
||||
|
||||
|
|
@ -1251,6 +1255,9 @@ EOT
|
|||
$colorIdent = $level % count($this->colors);
|
||||
$color = $this->colors[$colorIdent];
|
||||
|
||||
assert(is_string($require['name']));
|
||||
assert(is_string($require['version']));
|
||||
|
||||
$circularWarn = in_array(
|
||||
$require['name'],
|
||||
$currentTree,
|
||||
|
|
|
|||
Loading…
Reference in New Issue