From 504e6c581a92ad409abd7f732355a76f84dd2a01 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 19 Mar 2024 15:13:12 +0100 Subject: [PATCH] Update deps and baseline (1663, 96) --- composer.lock | 36 ++++++------- phpstan/baseline-8.1.neon | 7 +-- phpstan/baseline.neon | 56 ++------------------- src/Composer/Package/Dumper/ArrayDumper.php | 23 +++++---- 4 files changed, 35 insertions(+), 87 deletions(-) diff --git a/composer.lock b/composer.lock index 727057e80..07277ef9e 100644 --- a/composer.lock +++ b/composer.lock @@ -226,16 +226,16 @@ }, { "name": "composer/pcre", - "version": "2.1.2", + "version": "2.1.3", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "02b8774a434b1b71edd8824440ceac1e3e49ee2b" + "reference": "540af382c97b83c628227d5f87cf56466d476191" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/02b8774a434b1b71edd8824440ceac1e3e49ee2b", - "reference": "02b8774a434b1b71edd8824440ceac1e3e49ee2b", + "url": "https://api.github.com/repos/composer/pcre/zipball/540af382c97b83c628227d5f87cf56466d476191", + "reference": "540af382c97b83c628227d5f87cf56466d476191", "shasum": "" }, "require": { @@ -277,7 +277,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/2.1.2" + "source": "https://github.com/composer/pcre/tree/2.1.3" }, "funding": [ { @@ -293,7 +293,7 @@ "type": "tidelift" } ], - "time": "2024-03-07T14:52:56+00:00" + "time": "2024-03-19T09:03:05+00:00" }, { "name": "composer/semver", @@ -2014,16 +2014,16 @@ "packages-dev": [ { "name": "phpstan/phpstan", - "version": "1.10.62", + "version": "1.10.63", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9" + "reference": "ad12836d9ca227301f5fb9960979574ed8628339" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd5c8a1660ed3540b211407c77abf4af193a6af9", - "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ad12836d9ca227301f5fb9960979574ed8628339", + "reference": "ad12836d9ca227301f5fb9960979574ed8628339", "shasum": "" }, "require": { @@ -2072,7 +2072,7 @@ "type": "tidelift" } ], - "time": "2024-03-13T12:27:20+00:00" + "time": "2024-03-18T16:53:53+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -2225,22 +2225,22 @@ }, { "name": "phpstan/phpstan-symfony", - "version": "1.3.8", + "version": "1.3.9", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-symfony.git", - "reference": "d8a0bc03a68d95288b6471c37d435647fbdaff1a" + "reference": "a32bc86da24495025d7aafd1ba62444d4a364a98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/d8a0bc03a68d95288b6471c37d435647fbdaff1a", - "reference": "d8a0bc03a68d95288b6471c37d435647fbdaff1a", + "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/a32bc86da24495025d7aafd1ba62444d4a364a98", + "reference": "a32bc86da24495025d7aafd1ba62444d4a364a98", "shasum": "" }, "require": { "ext-simplexml": "*", "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.10.36" + "phpstan/phpstan": "^1.10.62" }, "conflict": { "symfony/framework-bundle": "<3.0" @@ -2291,9 +2291,9 @@ "description": "Symfony Framework extensions and rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-symfony/issues", - "source": "https://github.com/phpstan/phpstan-symfony/tree/1.3.8" + "source": "https://github.com/phpstan/phpstan-symfony/tree/1.3.9" }, - "time": "2024-03-05T16:33:08+00:00" + "time": "2024-03-16T16:50:20+00:00" }, { "name": "symfony/phpunit-bridge", diff --git a/phpstan/baseline-8.1.neon b/phpstan/baseline-8.1.neon index 5a0aabf76..6807635f8 100644 --- a/phpstan/baseline-8.1.neon +++ b/phpstan/baseline-8.1.neon @@ -15,11 +15,6 @@ parameters: count: 1 path: ../src/Composer/Command/ArchiveCommand.php - - - message: "#^Only booleans are allowed in an if condition, string\\|false given\\.$#" - count: 1 - path: ../src/Composer/Command/ConfigCommand.php - - message: "#^Parameter \\#1 \\$callback of function call_user_func expects callable\\(\\)\\: mixed, array\\{Composer\\\\Config\\\\JsonConfigSource, string\\} given\\.$#" count: 2 @@ -131,7 +126,7 @@ parameters: path: ../src/Composer/Package/Archiver/PharArchiver.php - - message: "#^Parameter \\#1 \\$array of function ksort expects array, array\\\\|string given\\.$#" + message: "#^Parameter \\#1 \\$array of function ksort expects array, array\\|string given\\.$#" count: 1 path: ../src/Composer/Package/Dumper/ArrayDumper.php diff --git a/phpstan/baseline.neon b/phpstan/baseline.neon index 45dcac955..8cc3e84f9 100644 --- a/phpstan/baseline.neon +++ b/phpstan/baseline.neon @@ -271,7 +271,7 @@ parameters: path: ../src/Composer/Command/ConfigCommand.php - - message: "#^Only booleans are allowed in an if condition, string given\\.$#" + message: "#^Only booleans are allowed in an if condition, string\\|false given\\.$#" count: 1 path: ../src/Composer/Command/ConfigCommand.php @@ -1135,11 +1135,6 @@ parameters: count: 1 path: ../src/Composer/DependencyResolver/GenericRule.php - - - message: "#^Only booleans are allowed in &&, string\\|null given on the left side\\.$#" - count: 1 - path: ../src/Composer/DependencyResolver/LockTransaction.php - - message: "#^Cannot access offset 'hash' on array\\|false\\.$#" count: 1 @@ -2385,11 +2380,6 @@ parameters: count: 1 path: ../src/Composer/Installer/SuggestedPackagesReporter.php - - - message: "#^Only booleans are allowed in a ternary operator condition, mixed given\\.$#" - count: 2 - path: ../src/Composer/Installer/SuggestedPackagesReporter.php - - message: "#^Only booleans are allowed in an if condition, Composer\\\\Package\\\\PackageInterface\\|null given\\.$#" count: 2 @@ -2600,28 +2590,18 @@ parameters: count: 2 path: ../src/Composer/Package/Dumper/ArrayDumper.php - - - message: "#^Only booleans are allowed in an if condition, array\\ given\\.$#" - count: 1 - path: ../src/Composer/Package/Dumper/ArrayDumper.php - - message: "#^Only booleans are allowed in an if condition, array\\ given\\.$#" count: 1 path: ../src/Composer/Package/Dumper/ArrayDumper.php - - message: "#^Only booleans are allowed in an if condition, string given\\.$#" + message: "#^Only booleans are allowed in an if condition, string\\|null given\\.$#" count: 1 path: ../src/Composer/Package/Dumper/ArrayDumper.php - - message: "#^Only booleans are allowed in an if condition, string\\|null given\\.$#" - count: 4 - path: ../src/Composer/Package/Dumper/ArrayDumper.php - - - - message: "#^Parameter \\#1 \\$array_arg of function ksort expects array, array\\\\|string given\\.$#" + message: "#^Parameter \\#1 \\$array_arg of function ksort expects array, array\\|string given\\.$#" count: 1 path: ../src/Composer/Package/Dumper/ArrayDumper.php @@ -2705,21 +2685,6 @@ parameters: count: 2 path: ../src/Composer/Package/Loader/RootPackageLoader.php - - - message: "#^Parameter \\#1 \\$requires of method Composer\\\\Package\\\\Loader\\\\RootPackageLoader\\:\\:extractAliases\\(\\) expects array\\, array\\ given\\.$#" - count: 1 - path: ../src/Composer/Package/Loader/RootPackageLoader.php - - - - message: "#^Parameter \\#1 \\$requires of static method Composer\\\\Package\\\\Loader\\\\RootPackageLoader\\:\\:extractReferences\\(\\) expects array\\, array\\ given\\.$#" - count: 1 - path: ../src/Composer/Package/Loader/RootPackageLoader.php - - - - message: "#^Parameter \\#1 \\$requires of static method Composer\\\\Package\\\\Loader\\\\RootPackageLoader\\:\\:extractStabilityFlags\\(\\) expects array\\, array\\ given\\.$#" - count: 1 - path: ../src/Composer/Package/Loader/RootPackageLoader.php - - message: "#^Parameter \\#2 \\$class \\(class\\-string\\\\) of method Composer\\\\Package\\\\Loader\\\\RootPackageLoader\\:\\:load\\(\\) should be contravariant with parameter \\$class \\(class\\-string\\\\) of method Composer\\\\Package\\\\Loader\\\\ArrayLoader\\:\\:load\\(\\)$#" count: 1 @@ -3090,16 +3055,6 @@ parameters: count: 1 path: ../src/Composer/Repository/ComposerRepository.php - - - message: "#^Method Composer\\\\Repository\\\\ComposerRepository\\:\\:getProviders\\(\\) should return array\\ but returns array\\\\.$#" - count: 1 - path: ../src/Composer/Repository/ComposerRepository.php - - - - message: "#^Method Composer\\\\Repository\\\\ComposerRepository\\:\\:whatProvides\\(\\) should return array\\ but returns array\\\\.$#" - count: 1 - path: ../src/Composer/Repository/ComposerRepository.php - - message: "#^Only booleans are allowed in &&, Composer\\\\Semver\\\\Constraint\\\\ConstraintInterface\\|null given on the left side\\.$#" count: 1 @@ -4473,11 +4428,6 @@ parameters: count: 1 path: ../src/Composer/Util/NoProxyPattern.php - - - message: "#^Method Composer\\\\Util\\\\NoProxyPattern\\:\\:ipCheckData\\(\\) never assigns null to &\\$ipdata so it can be removed from the by\\-ref type\\.$#" - count: 1 - path: ../src/Composer/Util/NoProxyPattern.php - - message: "#^Only booleans are allowed in a negated boolean, bool\\|stdClass given\\.$#" count: 1 diff --git a/src/Composer/Package/Dumper/ArrayDumper.php b/src/Composer/Package/Dumper/ArrayDumper.php index f713fbe33..046ba6674 100644 --- a/src/Composer/Package/Dumper/ArrayDumper.php +++ b/src/Composer/Package/Dumper/ArrayDumper.php @@ -44,11 +44,11 @@ class ArrayDumper $data['version'] = $package->getPrettyVersion(); $data['version_normalized'] = $package->getVersion(); - if ($package->getTargetDir()) { + if ($package->getTargetDir() !== null) { $data['target-dir'] = $package->getTargetDir(); } - if ($package->getSourceType()) { + if ($package->getSourceType() !== null) { $data['source']['type'] = $package->getSourceType(); $data['source']['url'] = $package->getSourceUrl(); if (null !== ($value = $package->getSourceReference())) { @@ -59,7 +59,7 @@ class ArrayDumper } } - if ($package->getDistType()) { + if ($package->getDistType() !== null) { $data['dist']['type'] = $package->getDistType(); $data['dist']['url'] = $package->getDistUrl(); if (null !== ($value = $package->getDistReference())) { @@ -74,15 +74,18 @@ class ArrayDumper } foreach (BasePackage::$supportedLinkTypes as $type => $opts) { - if ($links = $package->{'get'.ucfirst($opts['method'])}()) { - foreach ($links as $link) { - $data[$type][$link->getTarget()] = $link->getPrettyConstraint(); - } - ksort($data[$type]); + $links = $package->{'get'.ucfirst($opts['method'])}(); + if (\count($links) === 0) { + continue; } + foreach ($links as $link) { + $data[$type][$link->getTarget()] = $link->getPrettyConstraint(); + } + ksort($data[$type]); } - if ($packages = $package->getSuggests()) { + $packages = $package->getSuggests(); + if (\count($packages) > 0) { ksort($packages); $data['suggest'] = $packages; } @@ -130,7 +133,7 @@ class ArrayDumper if ($package instanceof RootPackageInterface) { $minimumStability = $package->getMinimumStability(); - if ($minimumStability) { + if ($minimumStability !== '') { $data['minimum-stability'] = $minimumStability; } }