From b2e0b1f0e19cfc3e84a060031fc594a2d3c107bc Mon Sep 17 00:00:00 2001
From: Pieter Hoste <hoste.pieter@gmail.com>
Date: Sat, 6 Nov 2021 14:10:49 +0100
Subject: [PATCH] Upgraded phpstan to 1.x

---
 composer.json                                  |  2 +-
 composer.lock                                  | 18 +++++++++++-------
 .../Test/Php/_files/phpstan/phpstan.neon       |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 2f3e1722ac55d..68f40969128ac 100644
--- a/composer.json
+++ b/composer.json
@@ -90,7 +90,7 @@
         "pdepend/pdepend": "~2.10.0",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.9.1",
-        "phpstan/phpstan": "^0.12.77",
+        "phpstan/phpstan": "^1.1",
         "phpunit/phpunit": "~9.5.0",
         "sebastian/phpcpd": "^6.0.3",
         "squizlabs/php_codesniffer": "~3.6.0",
diff --git a/composer.lock b/composer.lock
index 2c28e49a3e7b5..cba9aff43b139 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ae2765feb0e420fd5062ef9d649a63a7",
+    "content-hash": "8d1670b36a51bfc35a857a2c9b106657",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -10255,16 +10255,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.99",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7"
+                "reference": "cb317029197236c571c1b9305b8dd12850d8d85c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b4d40f1d759942f523be267a1bab6884f46ca3f7",
-                "reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cb317029197236c571c1b9305b8dd12850d8d85c",
+                "reference": "cb317029197236c571c1b9305b8dd12850d8d85c",
                 "shasum": ""
             },
             "require": {
@@ -10280,7 +10280,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "0.12-dev"
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
@@ -10293,6 +10293,10 @@
                 "MIT"
             ],
             "description": "PHPStan - PHP Static Analysis Tool",
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "source": "https://github.com/phpstan/phpstan/tree/1.1.1"
+            },
             "funding": [
                 {
                     "url": "https://github.com/ondrejmirtes",
@@ -10311,7 +10315,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-12T20:09:55+00:00"
+            "time": "2021-11-06T22:46:47+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon
index aba7d0b46d297..c6cf0a2a9c188 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon
@@ -2,7 +2,7 @@ parameters:
     checkExplicitMixedMissingReturn: true
     checkPhpDocMissingReturn: true
     reportUnmatchedIgnoredErrors: false
-    excludes_analyse:
+    excludePaths:
         - %rootDir%/../../../lib/internal/Magento/Framework/ObjectManager/Test/Unit/*
         - %rootDir%/../../../*/_files/*
         - %rootDir%/../../../dev/tests/*/Fixtures/*