From 414febb2989096202dc5f476fc75ac68375dc131 Mon Sep 17 00:00:00 2001
From: Sascha Egerer <sascha.egerer@flowd.de>
Date: Fri, 3 May 2024 16:36:37 +0200
Subject: [PATCH 1/5] Update dependencies and make php-parse a dev dependency

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

diff --git a/composer.json b/composer.json
index 75f0f8d..e3093c5 100644
--- a/composer.json
+++ b/composer.json
@@ -12,8 +12,7 @@
 	"prefer-stable": true,
 	"require": {
 		"php": "^7.4 || ^8.0",
-		"phpstan/phpstan": "^1.10.9",
-		"nikic/php-parser": "^4.15.1",
+		"phpstan/phpstan": "^1.10",
 		"typo3/cms-core": "^11.5 || ^12.4 || ^13.0",
 		"typo3/cms-extbase": "^11.5 || ^12.4 || ^13.0",
 		"bnf/phpstan-psr-container": "^1.0",
@@ -22,14 +21,14 @@
 		"ext-simplexml": "*"
 	},
 	"require-dev": {
-		"consistence-community/coding-standard": "^3.11.1",
-		"slevomat/coding-standard": "^7.2.1",
-		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
-		"php-parallel-lint/php-parallel-lint": "^1.3.2",
-		"phing/phing": "^2.17.4",
-		"phpstan/phpstan-strict-rules": "^1.5.1",
-		"phpunit/phpunit": "^9.6.16",
-		"symfony/polyfill-php80": "^1.28.0",
+		"nikic/php-parser": "^v4.19.1",
+		"consistence-community/coding-standard": "^3.10",
+		"dealerdirect/phpcodesniffer-composer-installer": "^1.0",
+		"php-parallel-lint/php-parallel-lint": "^1.4",
+		"phing/phing": "^2.17",
+		"phpstan/phpstan-strict-rules": "^1.5",
+		"phpunit/phpunit": "^9.6",
+		"symfony/polyfill-php80": "^1.29",
 		"phpstan/phpstan-phpunit": "^1.3"
 	},
 	"autoload": {

From 0d791b7ebfb780cc4fa5962ceca88cd802d8fa8c Mon Sep 17 00:00:00 2001
From: Sascha Egerer <sascha.egerer@flowd.de>
Date: Fri, 3 May 2024 17:23:46 +0200
Subject: [PATCH 2/5] Set minimium php version for phpcf

---
 phpcs.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpcs.xml b/phpcs.xml
index 46bb609..4df87aa 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -5,6 +5,8 @@
 	<arg name="encoding" value="utf-8"/>
 	<arg name="tab-width" value="4"/>
 	<arg value="sp"/>
+	<config name="php_version" value="70400"/>
+
 	<file>src</file>
 	<file>tests</file>
 

From 2f4cb147e99847903f4ece02652a99b18597fbb2 Mon Sep 17 00:00:00 2001
From: Sascha Egerer <sascha.egerer@flowd.de>
Date: Fri, 3 May 2024 17:25:29 +0200
Subject: [PATCH 3/5] Adjust TYPO3 version in test matrix to use 13.1 instead
 of 13.0

---
 .github/workflows/tests.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5e7c534..e6e544c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -60,16 +60,16 @@ jobs:
           - typo3-version: "^12.4"
             php-version: "8.3"
             composer-flags: " --prefer-lowest"
-          - typo3-version: "^13.0"
+          - typo3-version: "^13.1"
             php-version: "8.2"
             composer-flags: ""
-          - typo3-version: "^13.0"
+          - typo3-version: "^13.1"
             php-version: "8.2"
             composer-flags: " --prefer-lowest"
-          - typo3-version: "^13.0"
+          - typo3-version: "^13.1"
             php-version: "8.3"
             composer-flags: ""
-          - typo3-version: "^13.0"
+          - typo3-version: "^13.1"
             php-version: "8.3"
             composer-flags: " --prefer-lowest"
 

From 26ca88c26126cbad8902ca18b0908be5660a76d6 Mon Sep 17 00:00:00 2001
From: Sascha Egerer <sascha.egerer@flowd.de>
Date: Fri, 3 May 2024 17:32:08 +0200
Subject: [PATCH 4/5] Define min version for phpstan to be 1.10.9

We need at least phpstan 1.10.9 due to
https://github.com/phpstan/phpstan-src/commit/ea2670a086f0f699b92dd6b2535504771054498c
---
 build.xml     | 2 --
 composer.json | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index cd267c0..5f67749 100644
--- a/build.xml
+++ b/build.xml
@@ -37,7 +37,6 @@
 			passthru="true"
 			checkreturn="true"
 		>
-			<arg line="--runtime-set php_version 70400"/>
 		</exec>
 	</target>
 
@@ -49,7 +48,6 @@
 			checkreturn="true"
 			level="error"
 		>
-			<arg line="--runtime-set php_version 70400"/>
 		</exec>
 	</target>
 
diff --git a/composer.json b/composer.json
index e3093c5..8d44bee 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
 	"prefer-stable": true,
 	"require": {
 		"php": "^7.4 || ^8.0",
-		"phpstan/phpstan": "^1.10",
+		"phpstan/phpstan": "^1.10.9",
 		"typo3/cms-core": "^11.5 || ^12.4 || ^13.0",
 		"typo3/cms-extbase": "^11.5 || ^12.4 || ^13.0",
 		"bnf/phpstan-psr-container": "^1.0",

From cc153de0d41810b6b18b6f0317921fe117dd5a5e Mon Sep 17 00:00:00 2001
From: Sascha Egerer <sascha.egerer@flowd.de>
Date: Sat, 4 May 2024 21:29:53 +0200
Subject: [PATCH 5/5] Ignore some phpcs rules that fail with PHP 7.4

---
 phpcs.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/phpcs.xml b/phpcs.xml
index 4df87aa..6ddfca3 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -19,6 +19,13 @@
 		<exclude name="Squiz.Commenting.FunctionComment.MissingParamTag"/>
 		<exclude name="Squiz.Commenting.FunctionComment.ParamNameNoMatch"/>
 		<exclude name="Squiz.PHP.Heredoc.NotAllowed"/>
+
+		<!-- These exclude configs can be dropped once PHP 7.4 support is dropped -->
+		<exclude name="SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment.MultiLinePropertyComment"/>
+		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameAfterKeyword.NonFullyQualifiedExtends"/>
+		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameAfterKeyword.NonFullyQualifiedImplements"/>
+		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameAfterKeyword.NonFullyQualifiedUse"/>
+		<exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.IncorrectWhitespaceBetweenOpenTagAndDeclare"/>
 	</rule>
 	<rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses">
 		<properties>