hugo
/
composer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update phpstan

Browse Source
main
Jordi Boggiano 2 years ago
parent f435618cb3
commit e918b6001b
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 50 additions and 59 deletions
Show Stats Download Patch File Download Diff File

103
composer.lock generated
Unescape Escape View File

@ -807,16 +807,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v5.4.7", "version": "v5.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "900275254f0a1a2afff1ab0e11abd5587a10e1d6" "reference": "ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/900275254f0a1a2afff1ab0e11abd5587a10e1d6", "url": "https://api.github.com/repos/symfony/console/zipball/ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b",
"reference": "900275254f0a1a2afff1ab0e11abd5587a10e1d6", "reference": "ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -886,7 +886,7 @@
"terminal" "terminal"
], ],
"support": { "support": {
"source": "https://github.com/symfony/console/tree/v5.4.7" "source": "https://github.com/symfony/console/tree/v5.4.8"
}, },
"funding": [ "funding": [
{ {
@ -902,7 +902,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-03-31T17:09:19+00:00" "time": "2022-04-12T16:02:29+00:00"
}, },
{ {
"name": "symfony/deprecation-contracts", "name": "symfony/deprecation-contracts",
@ -1037,16 +1037,16 @@
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v5.4.3", "version": "v5.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
"reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d" "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/231313534dded84c7ecaa79d14bc5da4ccb69b7d", "url": "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9",
"reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d", "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1080,7 +1080,7 @@
"description": "Finds files and directories via an intuitive fluent interface", "description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/finder/tree/v5.4.3" "source": "https://github.com/symfony/finder/tree/v5.4.8"
}, },
"funding": [ "funding": [
{ {
@ -1096,7 +1096,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-26T16:34:36+00:00" "time": "2022-04-15T08:07:45+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
@ -1592,16 +1592,16 @@
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v5.4.7", "version": "v5.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "38a44b2517b470a436e1c944bf9b9ba3961137fb" "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/38a44b2517b470a436e1c944bf9b9ba3961137fb", "url": "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3",
"reference": "38a44b2517b470a436e1c944bf9b9ba3961137fb", "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1634,7 +1634,7 @@
"description": "Executes commands in sub-processes", "description": "Executes commands in sub-processes",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/process/tree/v5.4.7" "source": "https://github.com/symfony/process/tree/v5.4.8"
}, },
"funding": [ "funding": [
{ {
@ -1650,7 +1650,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-03-18T16:18:52+00:00" "time": "2022-04-08T05:07:18+00:00"
}, },
{ {
"name": "symfony/service-contracts", "name": "symfony/service-contracts",
@ -1737,16 +1737,16 @@
}, },
{ {
"name": "symfony/string", "name": "symfony/string",
"version": "v5.4.3", "version": "v5.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/string.git", "url": "https://github.com/symfony/string.git",
"reference": "92043b7d8383e48104e411bc9434b260dbeb5a10" "reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/92043b7d8383e48104e411bc9434b260dbeb5a10", "url": "https://api.github.com/repos/symfony/string/zipball/3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8",
"reference": "92043b7d8383e48104e411bc9434b260dbeb5a10", "reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1803,7 +1803,7 @@
"utf8" "utf8"
], ],
"support": { "support": {
"source": "https://github.com/symfony/string/tree/v5.4.3" "source": "https://github.com/symfony/string/tree/v5.4.8"
}, },
"funding": [ "funding": [
{ {
@ -1819,22 +1819,22 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-02T09:53:40+00:00" "time": "2022-04-19T10:40:37+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.5.5", "version": "1.6.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "d77a607667f29ae099c0686f99664bd451fd23df" "reference": "becb9603a31d70f5007d505877a7b812598dfe46"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/d77a607667f29ae099c0686f99664bd451fd23df", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/becb9603a31d70f5007d505877a7b812598dfe46",
"reference": "d77a607667f29ae099c0686f99664bd451fd23df", "reference": "becb9603a31d70f5007d505877a7b812598dfe46",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1860,7 +1860,7 @@
"description": "PHPStan - PHP Static Analysis Tool", "description": "PHPStan - PHP Static Analysis Tool",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan/issues", "issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/1.5.5" "source": "https://github.com/phpstan/phpstan/tree/1.6.2"
}, },
"funding": [ "funding": [
{ {
@ -1880,7 +1880,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-04-14T12:20:26+00:00" "time": "2022-04-27T11:05:24+00:00"
}, },
{ {
"name": "phpstan/phpstan-deprecation-rules", "name": "phpstan/phpstan-deprecation-rules",
@ -1934,16 +1934,16 @@
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",
"version": "1.1.0", "version": "1.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan-phpunit.git", "url": "https://github.com/phpstan/phpstan-phpunit.git",
"reference": "09133ce914f1388a8bb8c7f8573aaa3723cff52a" "reference": "4a3c437c09075736285d1cabb5c75bf27ed0bc84"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/09133ce914f1388a8bb8c7f8573aaa3723cff52a", "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/4a3c437c09075736285d1cabb5c75bf27ed0bc84",
"reference": "09133ce914f1388a8bb8c7f8573aaa3723cff52a", "reference": "4a3c437c09075736285d1cabb5c75bf27ed0bc84",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1980,27 +1980,27 @@
"description": "PHPUnit extensions and rules for PHPStan", "description": "PHPUnit extensions and rules for PHPStan",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan-phpunit/issues", "issues": "https://github.com/phpstan/phpstan-phpunit/issues",
"source": "https://github.com/phpstan/phpstan-phpunit/tree/1.1.0" "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.1.1"
}, },
"time": "2022-03-28T09:20:49+00:00" "time": "2022-04-20T15:24:25+00:00"
}, },
{ {
"name": "phpstan/phpstan-strict-rules", "name": "phpstan/phpstan-strict-rules",
"version": "1.1.0", "version": "1.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan-strict-rules.git", "url": "https://github.com/phpstan/phpstan-strict-rules.git",
"reference": "e12d55f74a8cca18c6e684c6450767e055ba7717" "reference": "afbe1e3235c51ee3f10ba4c8b32449099016ea02"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/e12d55f74a8cca18c6e684c6450767e055ba7717", "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/afbe1e3235c51ee3f10ba4c8b32449099016ea02",
"reference": "e12d55f74a8cca18c6e684c6450767e055ba7717", "reference": "afbe1e3235c51ee3f10ba4c8b32449099016ea02",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1 || ^8.0", "php": "^7.2 || ^8.0",
"phpstan/phpstan": "^1.2.0" "phpstan/phpstan": "^1.6.0"
}, },
"require-dev": { "require-dev": {
"nikic/php-parser": "^4.13.0", "nikic/php-parser": "^4.13.0",
@ -2010,9 +2010,6 @@
}, },
"type": "phpstan-extension", "type": "phpstan-extension",
"extra": { "extra": {
"branch-alias": {
"dev-master": "1.0-dev"
},
"phpstan": { "phpstan": {
"includes": [ "includes": [
"rules.neon" "rules.neon"
@ -2031,9 +2028,9 @@
"description": "Extra strict and opinionated rules for PHPStan", "description": "Extra strict and opinionated rules for PHPStan",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan-strict-rules/issues", "issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
"source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.1.0" "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.2.0"
}, },
"time": "2021-11-18T09:30:29+00:00" "time": "2022-04-21T13:07:43+00:00"
}, },
{ {
"name": "phpstan/phpstan-symfony", "name": "phpstan/phpstan-symfony",
@ -2111,16 +2108,16 @@
}, },
{ {
"name": "symfony/phpunit-bridge", "name": "symfony/phpunit-bridge",
"version": "v6.0.7", "version": "v6.0.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git", "url": "https://github.com/symfony/phpunit-bridge.git",
"reference": "924f44f1c682473453a502f8f01d4904a7761dcc" "reference": "4959a1eedd473bdb3f19db5b1525d5415dfab471"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/924f44f1c682473453a502f8f01d4904a7761dcc", "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/4959a1eedd473bdb3f19db5b1525d5415dfab471",
"reference": "924f44f1c682473453a502f8f01d4904a7761dcc", "reference": "4959a1eedd473bdb3f19db5b1525d5415dfab471",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2174,7 +2171,7 @@
"description": "Provides utilities for PHPUnit, especially user deprecation notices management", "description": "Provides utilities for PHPUnit, especially user deprecation notices management",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/phpunit-bridge/tree/v6.0.7" "source": "https://github.com/symfony/phpunit-bridge/tree/v6.0.8"
}, },
"funding": [ "funding": [
{ {
@ -2190,7 +2187,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-03-06T11:27:28+00:00" "time": "2022-04-12T16:11:42+00:00"
} }
], ],
"aliases": [], "aliases": [],

6
src/Composer/Repository/PlatformRepository.php
Unescape Escape View File

@ -564,12 +564,6 @@ class PlatformRepository extends ArrayRepository
// Skip if PHP is overridden and we are adding a php-* package // Skip if PHP is overridden and we are adding a php-* package
if (isset($this->overrides['php']) && 0 === strpos($package->getName(), 'php-')) { if (isset($this->overrides['php']) && 0 === strpos($package->getName(), 'php-')) {
if (isset($this->overrides[$package->getName()]) && $this->overrides[$package->getName()]['version'] === false) {
$this->addDisabledPackage($package);
return;
}
$overrider = $this->addOverriddenPackage($this->overrides['php'], $package->getPrettyName()); $overrider = $this->addOverriddenPackage($this->overrides['php'], $package->getPrettyName());
if ($package->getVersion() === $overrider->getVersion()) { if ($package->getVersion() === $overrider->getVersion()) {
$actualText = 'same as actual'; $actualText = 'same as actual';

Write Preview
Loading…
Cancel
Save