composer update

FriendsOfREDAXO · Sep 3, 2022 · b436522 · b436522
1 parent 9bc7ad3
commit b436522
Show file tree

Hide file tree

Showing 24 changed files with 58 additions and 1,426 deletions.
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
@@ -12,6 +12,6 @@
     'Spaze\\PHPStan\\Rules\\Disallowed\\' => array($vendorDir . '/spaze/phpstan-disallowed-calls/src'),
     'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
     'PHPStan\\PhpDocParser\\' => array($vendorDir . '/phpstan/phpdoc-parser/src'),
-    'PHPStan\\' => array($vendorDir . '/phpstan/phpstan-deprecation-rules/src', $vendorDir . '/phpstan/phpstan-phpunit/src', $vendorDir . '/phpstan/phpstan-symfony/src', $vendorDir . '/phpstan/phpstan-strict-rules/src'),
+    'PHPStan\\' => array($vendorDir . '/phpstan/phpstan-deprecation-rules/src', $vendorDir . '/phpstan/phpstan-phpunit/src', $vendorDir . '/phpstan/phpstan-strict-rules/src', $vendorDir . '/phpstan/phpstan-symfony/src'),
     'Composer\\Semver\\' => array($vendorDir . '/composer/semver/src'),
 );
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -66,8 +66,8 @@ class ComposerStaticInit7d28987f5749c840ef9609f53969aebc
         array (
             0 => __DIR__ . '/..' . '/phpstan/phpstan-deprecation-rules/src',
             1 => __DIR__ . '/..' . '/phpstan/phpstan-phpunit/src',
-            2 => __DIR__ . '/..' . '/phpstan/phpstan-symfony/src',
-            3 => __DIR__ . '/..' . '/phpstan/phpstan-strict-rules/src',
+            2 => __DIR__ . '/..' . '/phpstan/phpstan-strict-rules/src',
+            3 => __DIR__ . '/..' . '/phpstan/phpstan-symfony/src',
         ),
         'Composer\\Semver\\' => 
         array (

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -281,17 +281,17 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.8.3",
-            "version_normalized": "1.8.3.0",
+            "version": "1.8.4",
+            "version_normalized": "1.8.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "5583623b61caafebd62bc78a99533aa9d769d097"
+                "reference": "eed4c9da531f6ebb4787235b6fb486e2c20f34e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5583623b61caafebd62bc78a99533aa9d769d097",
-                "reference": "5583623b61caafebd62bc78a99533aa9d769d097",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/eed4c9da531f6ebb4787235b6fb486e2c20f34e5",
+                "reference": "eed4c9da531f6ebb4787235b6fb486e2c20f34e5",
                 "shasum": ""
             },
             "require": {
@@ -300,7 +300,7 @@
             "conflict": {
                 "phpstan/phpstan-shim": "*"
             },
-            "time": "2022-09-01T15:27:34+00:00",
+            "time": "2022-09-03T13:08:04+00:00",
             "bin": [
                 "phpstan",
                 "phpstan.phar"
@@ -323,7 +323,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.8.3"
+                "source": "https://github.com/phpstan/phpstan/tree/1.8.4"
             },
             "funding": [
                 {
@@ -694,17 +694,17 @@
         },
         {
             "name": "symplify/phpstan-rules",
-            "version": "11.1.6",
-            "version_normalized": "11.1.6.0",
+            "version": "11.1.9",
+            "version_normalized": "11.1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symplify/phpstan-rules.git",
-                "reference": "cdc32e41315225ce96e8aba6814000d965c32592"
+                "reference": "955b239d4a360af1bec7652e3dce9a3b86ee2acc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symplify/phpstan-rules/zipball/cdc32e41315225ce96e8aba6814000d965c32592",
-                "reference": "cdc32e41315225ce96e8aba6814000d965c32592",
+                "url": "https://api.github.com/repos/symplify/phpstan-rules/zipball/955b239d4a360af1bec7652e3dce9a3b86ee2acc",
+                "reference": "955b239d4a360af1bec7652e3dce9a3b86ee2acc",
                 "shasum": ""
             },
             "require": {
@@ -715,7 +715,7 @@
                 "phpstan/phpstan": "^1.8.1",
                 "webmozart/assert": "^1.10"
             },
-            "time": "2022-08-31T08:14:48+00:00",
+            "time": "2022-09-02T10:08:04+00:00",
             "type": "phpstan-extension",
             "extra": {
                 "branch-alias": {
@@ -725,8 +725,7 @@
                     "includes": [
                         "config/services/services.neon",
                         "config/packages/cognitive-complexity/cognitive-complexity-services.neon",
-                        "config/packages/symfony/services.neon",
-                        "config/packages/nette/services.neon"
+                        "config/packages/symfony/services.neon"
                     ]
                 }
             },
@@ -745,7 +744,7 @@
             ],
             "description": "Set of Symplify rules for PHPStan",
             "support": {
-                "source": "https://github.com/symplify/phpstan-rules/tree/11.1.6"
+                "source": "https://github.com/symplify/phpstan-rules/tree/11.1.9"
             },
             "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' => '4fdf4d755c55f98a22f026e7ee1239efa6b6f2eb',
+        'reference' => '9bc7ad30c0b58bc3b32fc3ea7cc28cf87e3c5daf',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '4fdf4d755c55f98a22f026e7ee1239efa6b6f2eb',
+            'reference' => '9bc7ad30c0b58bc3b32fc3ea7cc28cf87e3c5daf',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -56,9 +56,9 @@
             'dev_requirement' => false,
         ),
         'phpstan/phpstan' => array(
-            'pretty_version' => '1.8.3',
-            'version' => '1.8.3.0',
-            'reference' => '5583623b61caafebd62bc78a99533aa9d769d097',
+            'pretty_version' => '1.8.4',
+            'version' => '1.8.4.0',
+            'reference' => 'eed4c9da531f6ebb4787235b6fb486e2c20f34e5',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpstan/phpstan',
             'aliases' => array(),
@@ -119,9 +119,9 @@
             'dev_requirement' => false,
         ),
         'symplify/phpstan-rules' => array(
-            'pretty_version' => '11.1.6',
-            'version' => '11.1.6.0',
-            'reference' => 'cdc32e41315225ce96e8aba6814000d965c32592',
+            'pretty_version' => '11.1.9',
+            'version' => '11.1.9.0',
+            'reference' => '955b239d4a360af1bec7652e3dce9a3b86ee2acc',
             'type' => 'phpstan-extension',
             'install_path' => __DIR__ . '/../symplify/phpstan-rules',
             'aliases' => array(),

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-----
 
-iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmMQz1kACgkQzxoQjQ56
-5yC1Vg/8D2IVVjPtejDaIb19jO/g8MfwK/utEW1q12k4yKNeLRYh44gLh72s05ib
-NhlxVcWjRF3B5i/cDF6m/rIEKX8zwHiN2zi7t6GueU/h5/wU822IMTM8MoVmSN/L
-43vtIcOJIoWu5I/IMm2hu55GORNtFcDk6r7KVkq0wqa78QcykSqjWAHTEUOwLEMy
-EE/1j2cRxfD25YpR/zlQA7WidG1UD0mARn+50pGqtZMYUKy/avkZGBA2XijM4SQn
-Bqf3XORyhxNUePP1k7KdnCg2pQDmc4u3JW/cKY4IGNlLwhwpIE2iRrj1K7uz+d7l
-71lM2fBNBNP+f21flGiYW3L+TYbaObi98qOtmAs/7OYM5lMDG1rEBCiVIkYaYjSv
-9offoxUAVOgsKQO/Lhn4dDvImeXibkX0c0jWzYnoO9hxMMJABEovmHAWTeSVzkZF
-kXQoSLQokn9MdyFtiAgNjLhkpAUyqxMkp6jsdyzsS2D7ALssVt3Ym3VWHMibqMNJ
-nzDfjrcr75lc8+vNQEEbeSnH81yPMQ3J+3UJL4rrXDsbID7croqnZ5QaRdRqWBYZ
-DmWhEg6hwUjHgzyQSMFgvH49uI0ufWBOKNYZfCkGHEK+DmJbcfd0+m78d3PaUGYa
-nysLQYtS1hlQVLBYaZuvRfGtd0HgO9V8c5uvjZKuJ5WQSuAazNA=
-=3o8/
+iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmMTUacACgkQzxoQjQ56
+5yBSUBAAgtZtDPGvm8q7QhtoerfbsV4Y+7ZD0VVis9z0/DEVGKzhVBIOpfta8yS9
+AOj8tVVdMsNAsaDYS/h1wMQ+hy+1svmg0sO37/DAVpS/r62DgnKz+aPYIjHYV0H6
+75Z/ytBKifhsv3Z0qFhOu2G/JgX8/FlOnr277L4g5ipgebE00dk+jO0cYe1hDUoE
+e8W82PODglcmSNehprd5w2Gw9Ce15gjI9osIFbKh1bVbQQxRAy1GXzXrlx1ApAlE
+nZXHlZaqmA+ztnzQ7A0Un87AAxe8o+GaLRELyc+pwEumpQv2hbQfPHxAX5/OE7z+
+DvqB6ZajwIBs1KpnvKl4+OIdofaq5E3cycyhWVZ4oY5lMULDa9VM25a2CyeaWndw
+LIYvSoV4AUqex9V9p/BhTjfznpOOEHFeBcIjw6UesIlRdGDiDcMdRc+Ib/K9Rpiy
+MQOfM2vEIP9lqVqQniAPI4MV7Bo9G6zXJh1KiX5HWAII8FTKaJjzOl0S9n1ZghBq
+p+g98HbnmHQVT8yO0XdFsHh9s0HTrI53av2kOFaIti+gp81RSUNFFs36pEjuqADH
+CV1Umoyqgr3bwgB/RTO4UXEcd67tyMUlis/jgQrS5ILdpEU62X6kQcrOptAj5tZA
+bUHyPl0Gd5m//smhIMePRLPL8tajTl4MFYhDzH4vrxLigmf39pQ=
+=hQUs
 -----END PGP SIGNATURE-----
diff --git a/vendor/symplify/phpstan-rules/composer.json b/vendor/symplify/phpstan-rules/composer.json
@@ -27,8 +27,7 @@
             "includes": [
                 "config/services/services.neon",
                 "config/packages/cognitive-complexity/cognitive-complexity-services.neon",
-                "config/packages/symfony/services.neon",
-                "config/packages/nette/services.neon"
+                "config/packages/symfony/services.neon"
             ]
         }
     },

diff --git a/vendor/symplify/phpstan-rules/config/packages/nette/nette-rules.neon b/vendor/symplify/phpstan-rules/config/packages/nette/nette-rules.neon
diff --git a/vendor/symplify/phpstan-rules/config/packages/nette/services.neon b/vendor/symplify/phpstan-rules/config/packages/nette/services.neon
diff --git a/vendor/symplify/phpstan-rules/config/services/services.neon b/vendor/symplify/phpstan-rules/config/services/services.neon
@@ -53,7 +53,6 @@ services:
     - Symplify\PHPStanRules\ParentGuard\ParentElementResolver\ParentMethodResolver
     - Symplify\PHPStanRules\ParentGuard\ParentElementResolver\ParentMethodReturnTypeResolver
     - Symplify\PHPStanRules\ParentGuard\ParentPropertyGuard
-    - Symplify\PHPStanRules\PhpDoc\AnnotationAttributeDetector
     - Symplify\PHPStanRules\PhpDoc\ApiDocStmtAnalyzer
     - Symplify\PHPStanRules\PhpDoc\BarePhpDocParser
     - Symplify\PHPStanRules\PhpDoc\ClassAnnotationResolver

diff --git a/...ify/phpstan-rules/packages/CognitiveComplexity/Rules/ClassLikeCognitiveComplexityRule.php b/...ify/phpstan-rules/packages/CognitiveComplexity/Rules/ClassLikeCognitiveComplexityRule.php
@@ -69,12 +69,7 @@ public function processNode(Node $node, Scope $scope): array
             return [];
         }
 
-        if ($this->scoreCompositionOverInheritance) {
-            $measuredCognitiveComplexity = $this->compositionOverInheritanceAnalyzer->analyzeClassLike($classLike);
-        } else {
-            $measuredCognitiveComplexity = $this->astCognitiveComplexityAnalyzer->analyzeClassLike($classLike);
-        }
-
+        $measuredCognitiveComplexity = $this->resolveMeasuredCognitiveComplexity($classLike);
         if ($measuredCognitiveComplexity <= $this->maxClassCognitiveComplexity) {
             return [];
         }
@@ -136,4 +131,13 @@ public function another($value)
             )]
         );
     }
+
+    private function resolveMeasuredCognitiveComplexity(Class_ $class): int
+    {
+        if ($this->scoreCompositionOverInheritance) {
+            return $this->compositionOverInheritanceAnalyzer->analyzeClassLike($class);
+        }
+
+        return $this->astCognitiveComplexityAnalyzer->analyzeClassLike($class);
+    }
 }
diff --git a/vendor/symplify/phpstan-rules/packages/Nette/Dibi/QueryMasksResolver.php b/vendor/symplify/phpstan-rules/packages/Nette/Dibi/QueryMasksResolver.php