Skip to content

Commit

Permalink
Bump phpstan/phpstan from 1.11.5 to 1.11.6 (#729)
Browse files Browse the repository at this point in the history
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Markus Staab <[email protected]>
  • Loading branch information
dependabot[bot] and staabm authored Jul 2, 2024
1 parent b3afa13 commit 8d6afd8
Show file tree
Hide file tree
Showing 9 changed files with 91 additions and 77 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"php": ">=7.4",
"justinrainbow/json-schema": "^5.2",
"php-parallel-lint/php-parallel-lint": "1.4",
"phpstan/phpstan": "1.11.5",
"phpstan/phpstan": "1.11.6",
"phpstan/phpstan-deprecation-rules": "1.2.0",
"phpstan/phpstan-phpunit": "1.4.0",
"phpstan/phpstan-strict-rules": "1.6.0",
Expand Down
24 changes: 12 additions & 12 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 20 additions & 20 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -669,17 +669,17 @@
},
{
"name": "phpstan/phpstan",
"version": "1.11.5",
"version_normalized": "1.11.5.0",
"version": "1.11.6",
"version_normalized": "1.11.6.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "490f0ae1c92b082f154681d7849aee776a7c1443"
"reference": "6ac78f1165346c83b4a753f7e4186d969c6ad0ee"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/490f0ae1c92b082f154681d7849aee776a7c1443",
"reference": "490f0ae1c92b082f154681d7849aee776a7c1443",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/6ac78f1165346c83b4a753f7e4186d969c6ad0ee",
"reference": "6ac78f1165346c83b4a753f7e4186d969c6ad0ee",
"shasum": ""
},
"require": {
Expand All @@ -688,7 +688,7 @@
"conflict": {
"phpstan/phpstan-shim": "*"
},
"time": "2024-06-17T15:10:54+00:00",
"time": "2024-07-01T15:33:06+00:00",
"bin": [
"phpstan",
"phpstan.phar"
Expand Down Expand Up @@ -887,17 +887,17 @@
},
{
"name": "phpstan/phpstan-symfony",
"version": "1.4.4",
"version_normalized": "1.4.4.0",
"version": "1.4.5",
"version_normalized": "1.4.5.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-symfony.git",
"reference": "bca27f1701fc1a297749e6c2a1e3da4462c1a6af"
"reference": "1bd7c339f622dfb5a1a97dcaf1a862734eabfa1d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/bca27f1701fc1a297749e6c2a1e3da4462c1a6af",
"reference": "bca27f1701fc1a297749e6c2a1e3da4462c1a6af",
"url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/1bd7c339f622dfb5a1a97dcaf1a862734eabfa1d",
"reference": "1bd7c339f622dfb5a1a97dcaf1a862734eabfa1d",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -926,7 +926,7 @@
"symfony/serializer": "^5.4",
"symfony/service-contracts": "^2.2.0"
},
"time": "2024-06-07T09:43:24+00:00",
"time": "2024-06-26T12:19:42+00:00",
"type": "phpstan-extension",
"extra": {
"phpstan": {
Expand Down Expand Up @@ -956,7 +956,7 @@
"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.4.4"
"source": "https://github.com/phpstan/phpstan-symfony/tree/1.4.5"
},
"install-path": "../phpstan/phpstan-symfony"
},
Expand Down Expand Up @@ -1300,23 +1300,23 @@
},
{
"name": "symfony/polyfill-php80",
"version": "v1.29.0",
"version_normalized": "1.29.0.0",
"version": "v1.30.0",
"version_normalized": "1.30.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
"reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
"reference": "77fa7995ac1b21ab60769b7323d600a991a90433"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
"reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433",
"reference": "77fa7995ac1b21ab60769b7323d600a991a90433",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
"time": "2024-01-29T20:11:03+00:00",
"time": "2024-05-31T15:07:36+00:00",
"type": "library",
"extra": {
"thanks": {
Expand Down Expand Up @@ -1363,7 +1363,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
"source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0"
},
"funding": [
{
Expand Down
22 changes: 11 additions & 11 deletions vendor/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'name' => '__root__',
'pretty_version' => 'dev-main',
'version' => 'dev-main',
'reference' => 'd3bc8606fdc6735202f6e6cf7bf7844e2676f0ea',
'reference' => '609b794cf20226c36987c1edf5d3f68b065cec2b',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand All @@ -13,7 +13,7 @@
'__root__' => array(
'pretty_version' => 'dev-main',
'version' => 'dev-main',
'reference' => 'd3bc8606fdc6735202f6e6cf7bf7844e2676f0ea',
'reference' => '609b794cf20226c36987c1edf5d3f68b065cec2b',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand Down Expand Up @@ -113,9 +113,9 @@
'dev_requirement' => false,
),
'phpstan/phpstan' => array(
'pretty_version' => '1.11.5',
'version' => '1.11.5.0',
'reference' => '490f0ae1c92b082f154681d7849aee776a7c1443',
'pretty_version' => '1.11.6',
'version' => '1.11.6.0',
'reference' => '6ac78f1165346c83b4a753f7e4186d969c6ad0ee',
'type' => 'library',
'install_path' => __DIR__ . '/../phpstan/phpstan',
'aliases' => array(),
Expand Down Expand Up @@ -149,9 +149,9 @@
'dev_requirement' => false,
),
'phpstan/phpstan-symfony' => array(
'pretty_version' => '1.4.4',
'version' => '1.4.4.0',
'reference' => 'bca27f1701fc1a297749e6c2a1e3da4462c1a6af',
'pretty_version' => '1.4.5',
'version' => '1.4.5.0',
'reference' => '1bd7c339f622dfb5a1a97dcaf1a862734eabfa1d',
'type' => 'phpstan-extension',
'install_path' => __DIR__ . '/../phpstan/phpstan-symfony',
'aliases' => array(),
Expand Down Expand Up @@ -203,9 +203,9 @@
'dev_requirement' => false,
),
'symfony/polyfill-php80' => array(
'pretty_version' => 'v1.29.0',
'version' => '1.29.0.0',
'reference' => '87b68208d5c1188808dd7839ee1e6c8ec3b02f1b',
'pretty_version' => 'v1.30.0',
'version' => '1.30.0.0',
'reference' => '77fa7995ac1b21ab60769b7323d600a991a90433',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-php80',
'aliases' => array(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
if (
$canBeNullInInteract
&& $method instanceof MethodReflection
&& $method->getName() === 'interact'
&& ($method->getName() === 'interact' || $method->getName() === 'initialize')
&& in_array('Symfony\Component\Console\Command\Command', $method->getDeclaringClass()->getParentClassesNames(), true)
) {
$argTypes[] = new NullType();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use PHPStan\Type\TypeUtils;
use function array_unique;
use function count;
use function in_array;

final class InputInterfaceHasArgumentDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
{
Expand Down Expand Up @@ -52,6 +53,17 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
}
$argName = $argStrings[0]->getValue();

if ($argName === 'command') {
$method = $scope->getFunction();
if (
$method instanceof MethodReflection
&& ($method->getName() === 'interact' || $method->getName() === 'initialize')
&& in_array('Symfony\Component\Console\Command\Command', $method->getDeclaringClass()->getParentClassesNames(), true)
) {
return null;
}
}

$returnTypes = [];
foreach ($this->consoleApplicationResolver->findCommands($classReflection) as $command) {
try {
Expand Down
40 changes: 21 additions & 19 deletions vendor/phpstan/phpstan/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,43 +24,45 @@ can be checked before you run the actual line.

## Sponsors

<a href="https://coders.thecodingmachine.com/phpstan"><img src="https://i.imgur.com/kQhNOTP.png" alt="TheCodingMachine" width="247" height="64"></a>
<a href="https://coders.thecodingmachine.com/phpstan"><img src="website/src/images/sponsor/tcm.png" alt="TheCodingMachine" width="247" height="64"></a>
&nbsp;&nbsp;&nbsp;
<a href="https://packagist.com/?utm_source=phpstan&utm_medium=readme&utm_campaign=sponsorlogo"><img src="https://i.imgur.com/B2T63Do.png" alt="Private Packagist" width="283" height="64"></a>
<a href="https://packagist.com/?utm_source=phpstan&utm_medium=readme&utm_campaign=sponsorlogo"><img src="website/src/images/sponsor/packagist.png" alt="Private Packagist" width="283" height="64"></a>
<br>
<a href="https://www.cdn77.com/"><img src="https://i.imgur.com/Oo3wA3m.png" alt="CDN77" width="283" height="64"></a>
<a href="https://www.cdn77.com/"><img src="website/src/images/sponsor/cdn77.png" alt="CDN77" width="283" height="64"></a>
&nbsp;&nbsp;&nbsp;
<a href="https://blackfire.io/docs/introduction?utm_source=phpstan&utm_medium=github_readme&utm_campaign=logo"><img src="https://i.imgur.com/zR8rsqk.png" alt="Blackfire.io" width="254" height="64"></a>
<a href="https://blackfire.io/docs/introduction?utm_source=phpstan&utm_medium=github_readme&utm_campaign=logo"><img src="website/src/images/sponsor/blackfire.png" alt="Blackfire.io" width="254" height="64"></a>
<br>
<a href="https://www.iodigital.com/"><img src="https://i.imgur.com/fJlw1n9.png" alt="iO" width="254" height="65"></a>
<a href="https://www.iodigital.com/"><img src="website/src/images/sponsor/io.png" alt="iO" width="254" height="65"></a>
&nbsp;&nbsp;&nbsp;
<a href="https://www.fame.fi/"><img src="https://i.imgur.com/SIA40Uv.png" alt="Fame Helsinki" width="283" height="64"></a>
<a href="https://www.fame.fi/"><img src="website/src/images/sponsor/fame.png" alt="Fame Helsinki" width="283" height="64"></a>
<br>
<a href="https://www.startupjobs.cz/startup/shipmonk"><img src="https://i.imgur.com/bAC47za.jpg" alt="ShipMonk" width="290" height="64"></a>
<a href="https://www.startupjobs.cz/startup/shipmonk"><img src="website/src/images/sponsor/shipmonk.jpg" alt="ShipMonk" width="290" height="64"></a>
&nbsp;&nbsp;&nbsp;
<a href="https://togetter.com/"><img src="https://i.imgur.com/x9n5cj3.png" alt="Togetter" width="283" height="64"></a>
<a href="https://togetter.com/"><img src="website/src/images/sponsor/togetter.png" alt="Togetter" width="283" height="64"></a>
<br>
<a href="https://join.rightcapital.com/?utm_source=phpstan&utm_medium=github&utm_campaign=sponsorship"><img src="https://i.imgur.com/1AhB5tW.png" alt="RightCapital" width="283" height="64"></a>
<a href="https://join.rightcapital.com/?utm_source=phpstan&utm_medium=github&utm_campaign=sponsorship"><img src="website/src/images/sponsor/rightcapital.png" alt="RightCapital" width="283" height="64"></a>
&nbsp;&nbsp;&nbsp;
<a href="https://www.contentkingapp.com/?ref=php-developer&utm_source=phpstan&utm_medium=referral&utm_campaign=sponsorship"><img src="https://i.imgur.com/HHhbPGN.png" alt="ContentKing" width="283" height="64"></a>
<a href="https://www.contentkingapp.com/?ref=php-developer&utm_source=phpstan&utm_medium=referral&utm_campaign=sponsorship"><img src="website/src/images/sponsor/contentking.png" alt="ContentKing" width="283" height="64"></a>
<br>
<a href="https://zol.fr?utm_source=phpstan"><img src="https://i.imgur.com/dzDgd4s.png" alt="ZOL" width="283" height="64"></a>
<a href="https://zol.fr?utm_source=phpstan"><img src="website/src/images/sponsor/zol.png" alt="ZOL" width="283" height="64"></a>
&nbsp;&nbsp;&nbsp;
<a href="https://www.edgenext.com/"><img src="https://i.imgur.com/1sNDQF3.png" alt="EdgeNext" width="283" height="64"></a>
<a href="https://www.edgenext.com/"><img src="website/src/images/sponsor/edgenext.png" alt="EdgeNext" width="283" height="64"></a>
<br>
<a href="https://www.shopware.com/en/"><img src="https://i.imgur.com/L4X5w9s.png" alt="Shopware" width="284" height="64"></a>
<a href="https://www.shopware.com/en/"><img src="website/src/images/sponsor/shopware.png" alt="Shopware" width="284" height="64"></a>
&nbsp;&nbsp;&nbsp;
<a href="https://craftcms.com/"><img src="https://i.imgur.com/xJWThke.png" alt="Craft CMS" width="283" height="64"></a>
<a href="https://craftcms.com/"><img src="website/src/images/sponsor/craftcms.png" alt="Craft CMS" width="283" height="64"></a>
<br>
<a href="https://www.worksome.com/"><img src="https://i.imgur.com/TQKSwOl.png" alt="Worksome" width="283" height="64"></a>
<a href="https://www.worksome.com/"><img src="website/src/images/sponsor/worksome.png" alt="Worksome" width="283" height="64"></a>
&nbsp;&nbsp;&nbsp;
<a href="https://www.campoint.net/"><img src="https://i.imgur.com/fR6eMUm.png" alt="campoint AG" width="283" height="64"></a>
<a href="https://www.campoint.net/"><img src="website/src/images/sponsor/campoint.png" alt="campoint AG" width="283" height="64"></a>
<br>
<a href="https://www.crisp.nl/"><img src="https://i.imgur.com/jRJyPve.png" alt="Crisp.nl" width="283" height="64"></a>
<a href="https://www.crisp.nl/"><img src="website/src/images/sponsor/crisp.png" alt="Crisp.nl" width="283" height="64"></a>
&nbsp;&nbsp;&nbsp;
<a href="https://inviqa.com/"><img src="https://i.imgur.com/G99rj45.png" alt="Inviqa" width="254" height="65"></a>
<a href="https://inviqa.com/"><img src="website/src/images/sponsor/inviqa.png" alt="Inviqa" width="254" height="65"></a>
<br>
<a href="https://www.getresponse.com/"><img src="https://i.imgur.com/ZEO7Meg.png" alt="GetResponse" width="283" height="64"></a>
<a href="https://www.getresponse.com/"><img src="website/src/images/sponsor/getresponse.png" alt="GetResponse" width="283" height="64"></a>
&nbsp;&nbsp;&nbsp;
<a href="https://www.shoptet.cz/"><img src="website/src/images/sponsor/shoptet.png" alt="Shoptet" width="283" height="64"></a>


[**You can now sponsor my open-source work on PHPStan through GitHub Sponsors.**](https://github.com/sponsors/ondrejmirtes)
Expand Down
Binary file modified vendor/phpstan/phpstan/phpstan.phar
Binary file not shown.
26 changes: 13 additions & 13 deletions vendor/phpstan/phpstan/phpstan.phar.asc
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmZwUeMACgkQUcZzBf/C
5cAwCQ/9Hsj1sVex6pT/SJ12lvZONeXkAJupxzdK+pfoR70IaoazLMao+eG6Va5Z
p4GhnHGVDt1HyMbpcSwazo1C4uDjt7U/s4QHEDptWM1RUzMmBn4Hc8o3j+l3MMwb
toKBC9Acr/CDZeJpHfB7xUTDuU63OAiZyaNb9eAJqnJaFEeCf5Tj/mcv6qgOGti7
9gHYOp82GXfgccdhFOvEwxmahaC7IiuLIgr1mtI79JYbNduBPKqlbRUra8gXUTjv
cQiD8iICuPb2KGnD3ROchrov4SAh+PxClsBip4OXVpVdO3V45GT+HxlH3vcwzQFR
42MUizUru2FXxDW/CT4BWodPwwKggEO/ykhBHBkaikGHVFrW/xRtO28uTTcfrA4k
2xyI8KHvlTuaSUDnFbMrZaWrvduWnliELyDVZtd8Jbx63F0xOZmiXtttw/NW2IPL
hhlUqUmFMGFab8TITSkTh4M8ZB+owA2La2DlcsSLeDAhDFaD5xYwuuxlQC0iDqL9
59yBqPkcnAkem3ObfnNmvugNSXsxaGoMWkcqxDcMk1W+K608jMNGxWXgKNBTJy0U
axDIwaA94UuSoEmW5owRQbhMSfHsjj1UweKKC28w+3Vd26QHfpFbEXFPyP9HMhib
/KHwJmDa1hi1fY5EVHatQBENdnsJ+Kn8XSqg929Cy9zJFGneHKo=
=YP7+
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmaCzBcACgkQUcZzBf/C
5cBLbQ/+OdxrZeTDmeqLAB5rMa+0STOfjDVc0D1l+iVCed7rtjJApxvVuy7uLuWd
wFbKWyqNE3O28Xr8u1m/GyaAEp2efCbEGLiFyeHjKYx8VwhZlaEp24QM5aoVsdOt
2bTG8ZkrqlL2TevJEgpI79H7/jpOo4XkI7tiUN3gHHHbBv0TdVglRMgRMnnfTu67
HUrDX3mz1Fd5ZBlnGXg+UKzq7oSZxpOwZNJlqJvnLgGwCIdpOEFaZZWAiLqhc8dY
W0J/lljwer9D/fpKfhlbH5bHi2X/CEiiCLpGK/miw8Tc7xDU1nAs0Ci//zpmjfX0
Z6SC3/JlFdGOqIk1STsYmFKvANrq/cc/DaPeS4R25s64LTnLdDI6dYLC7fvZ2lW2
H5JVtDVVegLX1oz1/+TPZ0kRox4rovvqsREBwyNQSKT4mlBUUnDm6IXlQQXmKqjq
mnz4G6p4ei/uRG609OXtwSu1HZgLY+ZCvvvW5xHCv/wYFH1cZD5+f2/NRWnv0cI0
05Qf9M4X/qMXELHoxGF8HmObOHykTNDgA4ahbJxoMHnWMgv6RqVNiJCD46NdYPk9
V3Xdii5/4HKqmX6UMrQCvj8AyTjv92ar+nW7buq3hjGW3MDb8cmovyobMSBodAaP
HfcoluifwPX0Jv64MZxd3zu4GIB5QhGMou8NM0DjtGs5QkI7S3U=
=75IH
-----END PGP SIGNATURE-----

0 comments on commit 8d6afd8

Please sign in to comment.