Bump phpstan/phpstan from 1.11.10 to 1.11.11 (#742)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Markus Staab <[email protected]>
FriendsOfREDAXO · Aug 22, 2024 · 685161c · 685161c
1 parent 751aea5
commit 685161c
Show file tree

Hide file tree

Showing 18 changed files with 140 additions and 110 deletions.
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
         "php": ">=7.4",
         "justinrainbow/json-schema": "^5.3",
         "php-parallel-lint/php-parallel-lint": "1.4",
-        "phpstan/phpstan": "1.11.10",
+        "phpstan/phpstan": "1.11.11",
         "phpstan/phpstan-deprecation-rules": "1.2.0",
         "phpstan/phpstan-phpunit": "1.4.0",
         "phpstan/phpstan-strict-rules": "1.6.0",

diff --git a/composer.lock b/composer.lock
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -664,17 +664,17 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.11.10",
-            "version_normalized": "1.11.10.0",
+            "version": "1.11.11",
+            "version_normalized": "1.11.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "640410b32995914bde3eed26fa89552f9c2c082f"
+                "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/640410b32995914bde3eed26fa89552f9c2c082f",
-                "reference": "640410b32995914bde3eed26fa89552f9c2c082f",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/707c2aed5d8d0075666e673a5e71440c1d01a5a3",
+                "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3",
                 "shasum": ""
             },
             "require": {
@@ -683,7 +683,7 @@
             "conflict": {
                 "phpstan/phpstan-shim": "*"
             },
-            "time": "2024-08-08T09:02:50+00:00",
+            "time": "2024-08-19T14:37:29+00:00",
             "bin": [
                 "phpstan",
                 "phpstan.phar"
@@ -882,17 +882,17 @@
         },
         {
             "name": "phpstan/phpstan-symfony",
-            "version": "1.4.6",
-            "version_normalized": "1.4.6.0",
+            "version": "1.4.8",
+            "version_normalized": "1.4.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-symfony.git",
-                "reference": "e909a075d69e0d4db262ac3407350ae2c6b6ab5f"
+                "reference": "14eec8c011b856eee4d744a2a3f709db1e1858bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/e909a075d69e0d4db262ac3407350ae2c6b6ab5f",
-                "reference": "e909a075d69e0d4db262ac3407350ae2c6b6ab5f",
+                "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/14eec8c011b856eee4d744a2a3f709db1e1858bd",
+                "reference": "14eec8c011b856eee4d744a2a3f709db1e1858bd",
                 "shasum": ""
             },
             "require": {
@@ -921,7 +921,7 @@
                 "symfony/serializer": "^5.4",
                 "symfony/service-contracts": "^2.2.0"
             },
-            "time": "2024-07-16T11:48:54+00:00",
+            "time": "2024-08-13T19:43:40+00:00",
             "type": "phpstan-extension",
             "extra": {
                 "phpstan": {
@@ -951,7 +951,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.6"
+                "source": "https://github.com/phpstan/phpstan-symfony/tree/1.4.8"
             },
             "install-path": "../phpstan/phpstan-symfony"
         },
@@ -1226,17 +1226,17 @@
         },
         {
             "name": "staabm/phpstan-todo-by",
-            "version": "0.1.27",
-            "version_normalized": "0.1.27.0",
+            "version": "0.1.28",
+            "version_normalized": "0.1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/staabm/phpstan-todo-by.git",
-                "reference": "aef25bd71ce63de28acb1c82289cb5bff172fcff"
+                "reference": "27ab19c384f2d3086e6e2b9aba1903ef78704903"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/staabm/phpstan-todo-by/zipball/aef25bd71ce63de28acb1c82289cb5bff172fcff",
-                "reference": "aef25bd71ce63de28acb1c82289cb5bff172fcff",
+                "url": "https://api.github.com/repos/staabm/phpstan-todo-by/zipball/27ab19c384f2d3086e6e2b9aba1903ef78704903",
+                "reference": "27ab19c384f2d3086e6e2b9aba1903ef78704903",
                 "shasum": ""
             },
             "require": {
@@ -1254,7 +1254,7 @@
                 "phpunit/phpunit": "^9 || ^10.5",
                 "redaxo/php-cs-fixer-config": "^1.0"
             },
-            "time": "2024-05-24T17:49:10+00:00",
+            "time": "2024-08-13T06:12:25+00:00",
             "type": "phpstan-extension",
             "extra": {
                 "phpstan": {
@@ -1283,7 +1283,7 @@
             ],
             "support": {
                 "issues": "https://github.com/staabm/phpstan-todo-by/issues",
-                "source": "https://github.com/staabm/phpstan-todo-by/tree/0.1.27"
+                "source": "https://github.com/staabm/phpstan-todo-by/tree/0.1.28"
             },
             "funding": [
                 {

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '6f0b5551657355b0197e3f84c2fa24c369560922',
+        'reference' => '63a1e8123c408200b9a63b51cad977ba25c7d1d9',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '6f0b5551657355b0197e3f84c2fa24c369560922',
+            'reference' => '63a1e8123c408200b9a63b51cad977ba25c7d1d9',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -113,9 +113,9 @@
             'dev_requirement' => false,
         ),
         'phpstan/phpstan' => array(
-            'pretty_version' => '1.11.10',
-            'version' => '1.11.10.0',
-            'reference' => '640410b32995914bde3eed26fa89552f9c2c082f',
+            'pretty_version' => '1.11.11',
+            'version' => '1.11.11.0',
+            'reference' => '707c2aed5d8d0075666e673a5e71440c1d01a5a3',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpstan/phpstan',
             'aliases' => array(),
@@ -149,9 +149,9 @@
             'dev_requirement' => false,
         ),
         'phpstan/phpstan-symfony' => array(
-            'pretty_version' => '1.4.6',
-            'version' => '1.4.6.0',
-            'reference' => 'e909a075d69e0d4db262ac3407350ae2c6b6ab5f',
+            'pretty_version' => '1.4.8',
+            'version' => '1.4.8.0',
+            'reference' => '14eec8c011b856eee4d744a2a3f709db1e1858bd',
             'type' => 'phpstan-extension',
             'install_path' => __DIR__ . '/../phpstan/phpstan-symfony',
             'aliases' => array(),
@@ -194,9 +194,9 @@
             'dev_requirement' => false,
         ),
         'staabm/phpstan-todo-by' => array(
-            'pretty_version' => '0.1.27',
-            'version' => '0.1.27.0',
-            'reference' => 'aef25bd71ce63de28acb1c82289cb5bff172fcff',
+            'pretty_version' => '0.1.28',
+            'version' => '0.1.28.0',
+            'reference' => '27ab19c384f2d3086e6e2b9aba1903ef78704903',
             'type' => 'phpstan-extension',
             'install_path' => __DIR__ . '/../staabm/phpstan-todo-by',
             'aliases' => array(),

diff --git a/vendor/phpstan/phpstan-symfony/extension.neon b/vendor/phpstan/phpstan-symfony/extension.neon
@@ -27,6 +27,7 @@ parameters:
 		- stubs/Psr/Cache/CacheException.stub
 		- stubs/Psr/Cache/CacheItemInterface.stub
 		- stubs/Psr/Cache/InvalidArgumentException.stub
+		- stubs/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.stub
 		- stubs/Symfony/Bundle/FrameworkBundle/KernelBrowser.stub
 		- stubs/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.stub
 		- stubs/Symfony/Bundle/FrameworkBundle/Test/TestContainer.stub
@@ -103,6 +104,7 @@ parameters:
 		- stubs/Symfony/Contracts/Cache/CacheInterface.stub
 		- stubs/Symfony/Contracts/Cache/CallbackInterface.stub
 		- stubs/Symfony/Contracts/Cache/ItemInterface.stub
+		- stubs/Symfony/Contracts/Service/ServiceSubscriberInterface.stub
 		- stubs/Twig/Node/Node.stub
 
 parametersSchema:

diff --git a/vendor/phpstan/phpstan-symfony/src/Type/Symfony/ParameterDynamicReturnTypeExtension.php b/vendor/phpstan/phpstan-symfony/src/Type/Symfony/ParameterDynamicReturnTypeExtension.php
@@ -13,6 +13,7 @@
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantArrayType;
+use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\ConstantType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
@@ -168,7 +169,9 @@ private function generalizeTypeFromValue(Scope $scope, $value): Type
 					$valueTypes[] = $this->generalizeTypeFromValue($scope, $element);
 				}
 
-				return new ConstantArrayType($keyTypes, $valueTypes);
+				return ConstantArrayTypeBuilder::createFromConstantArray(
+					new ConstantArrayType($keyTypes, $valueTypes)
+				)->getArray();
 			}
 
 			return new ArrayType(

diff --git a/...n/phpstan-symfony/stubs/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.stub b/...n/phpstan-symfony/stubs/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.stub
@@ -0,0 +1,24 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Controller;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormTypeInterface;
+use Symfony\Contracts\Service\ServiceSubscriberInterface;
+
+abstract class AbstractController implements ServiceSubscriberInterface
+{
+	/**
+	 * @template TFormType of FormTypeInterface<TData>
+	 * @template TData
+	 *
+	 * @param class-string<TFormType> $type
+	 * @param TData                   $data
+	 * @param array<string, mixed>    $options
+	 *
+	 * @phpstan-return ($data is null ? FormInterface<null|TData> : FormInterface<TData>)
+	 */
+	protected function createForm(string $type, $data = null, array $options = []): FormInterface
+	{
+	}
+}
diff --git a/...r/phpstan/phpstan-symfony/stubs/Symfony/Contracts/Service/ServiceSubscriberInterface.stub b/...r/phpstan/phpstan-symfony/stubs/Symfony/Contracts/Service/ServiceSubscriberInterface.stub
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Contracts\Service;
+
+interface ServiceSubscriberInterface
+{
+}
diff --git a/vendor/phpstan/phpstan/phpstan.phar b/vendor/phpstan/phpstan/phpstan.phar
diff --git a/vendor/phpstan/phpstan/phpstan.phar.asc b/vendor/phpstan/phpstan/phpstan.phar.asc
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAma0iZ8ACgkQUcZzBf/C
-5cBohA//bMVrbkx6MXbgAGRDLfFwfw+yIh0eXtYppHNcIH55RznSH5IMuZmnC+aj
-8pXRSG38zf/69PZU82iaBwPIUJr2QLFeUe0E+2us6zJ81o3ifVuwqE27IQ2u4vCB
-JehufifJRc9ewHCTTvyibIM3IpRCKnc6PsmixBo98BD/aqp1rJKQJscdQcgW5nbq
-Ah6h62j1WqfJvspE6s0jegnCNoaf4ir83u3QJ5e63y7TuV+8Bxzx+co2XjYlBX5h
-j3Es6fOS4fGVQh5aLX6VYiLJcPPvHMOQJPzMmqqbqc10RRp9i9ASAxQpgwVL7vBe
-Pxc+ArPIylTSs5nD5zhURp0v6TReNONMfRa+xYE+AoQloFm9g1KtxscBjqvdLWPo
-0+mDDsCMPS/Bj+UB7dUVjvXCrSqhdh35tfXiM2v0W50hDnDsjBxtLln7f5jwPfvy
-+NnIxkFG3PFJZa0EtEnKcmBvX6zlkvNUSlR22rp7jNaNn5yrH5/1kcGSKHD9bbKb
-ssVcYhMkAZGA+IpOVY0kjsG3f0ItD8Y85QMN1zo5CUwDtK9hdXA0p3+a/muQd1f5
-IfCaME2P6I9CGAuXGPhERhbAoKnSrpBkiKVbBE+m8AP0RxjVL0IQXhxM69CaIScc
-qpG852WUX/pQAA36va3CWJiC6EJ+EiJ+5v6H6moxIJq4obiGWyY=
-=ztg6
+iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmbDWIsACgkQUcZzBf/C
+5cDc0Q//UgEKq6FFKCgz5fymjMrHYus4b+JhNXPPX729aHZ6ym3Pa9qJD2SidkBd
+3rlc7Cuv8fJpFuO+r6xUWGyvNxis7oONz9LtEFnrIpz0DiatqI423oedsxR5ycbv
+0REX37XxxHCpkMypsMzLdT2rKPjAjgIbdQCI3gMwJZUt1a5ObPvMxo6SkyVIFiwu
+thQjluM9yKppE7ANSWU1BqNY/uSFMF5BLJfVMGAaeDR0gfjOu03/jaycfMKZBQXB
+pxLM7YEe6B76DaUSCaXuC3ZOlOZctxWOR7GsGDPtVi0YJaV3BayXLQai0OrgO2NM
+Vb4gQ8ipMhojtZzZug0Xi6PV6ns0f3qTpUy7qmvpyUYmZu7of+Fg5IVM4ZhgRBiH
+rVZ8d6sSHgdkFlF1a8VXbTtBoF0E48+jpH1s33jw2op+BYayFi9hgC31nQL4/eKH
+TPMJ462Lwx4wes6gWF1jEXAiMKZuyJbVEgwEx0H5RnWlHo7Bje1jJBUoz1rXG6F9
+LJFy+gDLLVX/00Pn9lKY7q8ZF5ByzX50Fij04PBtnJuoZ9U3bZCwknJdEfP2vT4K
+NcA8t2AVtvSEifweDDaM0XD501q9HWMYsnhjYd+I2A7izTpAiKYkqqco/ko202My
+MgIK/tDMynoTM1s+qs/jth77N8Ajrg6Pk4GZ5DHWn44XXIxXqNs=
+=KH5Z
 -----END PGP SIGNATURE-----
diff --git a/vendor/staabm/phpstan-todo-by/README.md b/vendor/staabm/phpstan-todo-by/README.md
@@ -45,10 +45,11 @@ When a text is given after the date, this text will be picked up for the PHPStan
 **Out of the box** comments can expire by different constraints:
 - by date with format of `YYYY-MM-DD` matched against the [reference-time](https://github.com/staabm/phpstan-todo-by#reference-time)
 - by a full github issue url
+- by a semantic version constraint matched against a Composer dependency (via `composer.lock`)
 
 There are more builtin constraints, but these **require additional configuration**:
 - by a semantic version constraint matched against the projects [reference-version config](https://github.com/staabm/phpstan-todo-by#reference-version)
-- by a semantic version constraint matched against a Composer dependency (via `composer.lock` or [`virtualPackages config`](https://github.com/staabm/phpstan-todo-by#virtual-packages))
+- by a semantic version constraint matched against a Composer dependency (via [`virtualPackages config`](https://github.com/staabm/phpstan-todo-by#virtual-packages))
 - by ticket reference, matched against the status of a ticket (e.g. in [github.com or JIRA via config](https://github.com/staabm/phpstan-todo-by#issue-tracker-key-support))
 
 see examples of different comment variants which are supported:

diff --git a/vendor/staabm/phpstan-todo-by/src/TodoByDateRule.php b/vendor/staabm/phpstan-todo-by/src/TodoByDateRule.php
@@ -68,7 +68,8 @@ public function processNode(Node $node, Scope $scope): array
 
                 if (!checkdate((int) $month, (int) $day, (int) $year)) {
                     $errors[] = $this->errorBuilder->buildError(
-                        $comment,
+                        $comment->getText(),
+                        $comment->getStartLine(),
                         'Invalid date "'. $date .'". Expected format "YYYY-MM-DD".',
                         self::ERROR_IDENTIFIER,
                         null,
@@ -96,7 +97,8 @@ public function processNode(Node $node, Scope $scope): array
                 }
 
                 $errors[] = $this->errorBuilder->buildError(
-                    $comment,
+                    $comment->getText(),
+                    $comment->getStartLine(),
                     $errorMessage,
                     self::ERROR_IDENTIFIER,
                     null,

diff --git a/vendor/staabm/phpstan-todo-by/src/TodoByIssueUrlRule.php b/vendor/staabm/phpstan-todo-by/src/TodoByIssueUrlRule.php
@@ -68,7 +68,8 @@ public function processNode(Node $node, Scope $scope): array
 
                 if (!array_key_exists($apiUrl, $fetchedStatuses) || null === $fetchedStatuses[$apiUrl]) {
                     $errors[] = $this->errorBuilder->buildError(
-                        $comment,
+                        $comment->getText(),
+                        $comment->getStartLine(),
                         "Ticket $url doesn't exist or provided credentials do not allow for viewing it.",
                         self::ERROR_IDENTIFIER,
                         null,
@@ -90,7 +91,8 @@ public function processNode(Node $node, Scope $scope): array
                 }
 
                 $errors[] = $this->errorBuilder->buildError(
-                    $comment,
+                    $comment->getText(),
+                    $comment->getStartLine(),
                     $errorMessage,
                     self::ERROR_IDENTIFIER,
                     null,