From 78d368b5834c6c1ad8a04c190945674c897236c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20B=C3=BCrk?= <stefan.buerk@impactmedia.de>
Date: Sun, 16 Jan 2022 18:58:04 +0100
Subject: [PATCH 1/3] [TASK] Raise php:"^7.2 || ^8.0 || ^8.1" and add allowed
 plugins

Raise php version support and add allowed plugins along the way
to have composer 2.2.x support onboarded.
---
 composer.json | 10 ++++++++--
 composer.lock |  6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 9b619dd..e7a60a4 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
     "description": "TYPO3 rules for PHPStan",
     "license": "GPL-2.0-or-later",
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^7.2 || ^8.0 || ^8.1",
         "phpstan/phpstan": "^0.12.44"
     },
     "require-dev": {
@@ -19,7 +19,13 @@
         "platform": {
             "php": "7.2"
         },
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true,
+            "typo3/class-alias-loader": true,
+            "typo3/cms-composer-installers": true,
+            "ergebnis/composer-normalize": true
+        }
     },
     "autoload": {
         "psr-4": {
diff --git a/composer.lock b/composer.lock
index 772a7c2..1c7e5cf 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": "d2429daa14912975daa78dec72c5ba58",
+    "content-hash": "6256332673487bf024e89e36dedfb93d",
     "packages": [
         {
             "name": "phpstan/phpstan",
@@ -8261,11 +8261,11 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^7.2 || ^8.0"
+        "php": "^7.2 || ^8.0 || ^8.1"
     },
     "platform-dev": [],
     "platform-overrides": {
         "php": "7.2"
     },
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "2.2.0"
 }

From f34c32d3763612505718625a96ff9894f2354fa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20B=C3=BCrk?= <stefan.buerk@impactmedia.de>
Date: Sun, 16 Jan 2022 19:01:36 +0100
Subject: [PATCH 2/3] [TASK] Raise "phpstan/phpstan":"^0.12.99 || ^1.2.0"

Raise phpstan to support 0.x and 1.x (1.2.x) of phpstan
as a dual install way (experimental).
---
 composer.json |  2 +-
 composer.lock | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index e7a60a4..2c5ab0c 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "license": "GPL-2.0-or-later",
     "require": {
         "php": "^7.2 || ^8.0 || ^8.1",
-        "phpstan/phpstan": "^0.12.44"
+        "phpstan/phpstan": "^0.12.99 || ^1.2.0"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.3",
diff --git a/composer.lock b/composer.lock
index 1c7e5cf..f590752 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6256332673487bf024e89e36dedfb93d",
+    "content-hash": "46469f6e5b49fd1dc0cad7ab29adbcf3",
     "packages": [
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.44",
+            "version": "0.12.99",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "330b45776ea77f167b150e24787412414a8fa469"
+                "reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/330b45776ea77f167b150e24787412414a8fa469",
-                "reference": "330b45776ea77f167b150e24787412414a8fa469",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b4d40f1d759942f523be267a1bab6884f46ca3f7",
+                "reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7",
                 "shasum": ""
             },
             "require": {
@@ -48,13 +48,17 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/0.12.44"
+                "source": "https://github.com/phpstan/phpstan/tree/0.12.99"
             },
             "funding": [
                 {
                     "url": "https://github.com/ondrejmirtes",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/phpstan",
+                    "type": "github"
+                },
                 {
                     "url": "https://www.patreon.com/phpstan",
                     "type": "patreon"
@@ -64,7 +68,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-09-24T15:28:47+00:00"
+            "time": "2021-09-12T20:09:55+00:00"
         }
     ],
     "packages-dev": [

From c12e3e326cd69171048bad1b48b7e2fb88cb6a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20B=C3=BCrk?= <stefan.buerk@impactmedia.de>
Date: Sun, 16 Jan 2022 19:06:38 +0100
Subject: [PATCH 3/3] [BUGFIX] Use correct composer.json config sorting to
 satisfy ergebnis/composer-normalize

---
 composer.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 2c5ab0c..2f87f7a 100644
--- a/composer.json
+++ b/composer.json
@@ -16,16 +16,16 @@
         "typo3/cms-extbase": "^10.4 || 11.*.*@dev"
     },
     "config": {
-        "platform": {
-            "php": "7.2"
-        },
-        "sort-packages": true,
         "allow-plugins": {
             "composer/package-versions-deprecated": true,
             "typo3/class-alias-loader": true,
             "typo3/cms-composer-installers": true,
             "ergebnis/composer-normalize": true
-        }
+        },
+        "platform": {
+            "php": "7.2"
+        },
+        "sort-packages": true
     },
     "autoload": {
         "psr-4": {