From da693e40b753236aa085f408ff04c130319c881e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20B=C3=BCrk?= <stefan.buerk@impactmedia.de>
Date: Sat, 15 Oct 2022 20:11:02 +0200
Subject: [PATCH] [BUGFIX] Raise typo3/cms-* to 11.5.4 to be stable with
 minimum deps

This change raises the minimum versions for TYPO3 core packages up
to 11.5.4 as minimum version, which contains needed fixes directly
or through raised core package dependencies to avoid corresponding
php deprecation and return type hint issues with symfony/routing
during composer minimum tests with PHP8.1. Beside this, we need at
least this version as core ships with QueryBuilder forward combat
methods `executeQuery()` and `executeStatement()` only since this
version.

See: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72430

Additional some dev dependencies are changed to avoid conflicts
with recently added core v11/v12 support (root compoer conflicts).
This requires to add (temporarly) two forks as repositories until
fixes are merged and released.

Fixes #635
---
 composer.json | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index c83c27e..a6784bf 100644
--- a/composer.json
+++ b/composer.json
@@ -29,16 +29,16 @@
 	"require": {
 		"php": "~7.4.0 || ~8.0.0 || ~8.1.0",
 		"psr/http-message": "^1.0.1",
-		"typo3/cms-core": "^11.5.2 || ^12.0",
-		"typo3/cms-extbase": "^11.5.2 || ^12.0",
-		"typo3/cms-fluid": "^11.5.2 || ^12.0",
-		"typo3/cms-frontend": "^11.5.2 || ^12.0"
+		"typo3/cms-core": "^11.5.4 || ^12.0",
+		"typo3/cms-extbase": "^11.5.4 || ^12.0",
+		"typo3/cms-fluid": "^11.5.4 || ^12.0",
+		"typo3/cms-frontend": "^11.5.4 || ^12.0"
 	},
 	"require-dev": {
 		"doctrine/dbal": "^2.13.8 || ^3.3.7",
 		"ergebnis/composer-normalize": "^2.28.3",
 		"friendsofphp/php-cs-fixer": "^3.12.0",
-		"helmich/typo3-typoscript-lint": "^2.5.2",
+		"helmich/typo3-typoscript-lint": "lwolf-php81-support-dev",
 		"jangregor/phpstan-prophecy": "^1.0.0",
 		"php-coveralls/php-coveralls": "^2.5.3",
 		"phpspec/prophecy": "^1.15.0",
@@ -48,12 +48,12 @@
 		"phpstan/phpstan-phpunit": "^1.1.1",
 		"phpstan/phpstan-strict-rules": "^1.4.4",
 		"phpunit/phpunit": "^9.5.25",
-		"saschaegerer/phpstan-typo3": "^1.1.2",
+		"saschaegerer/phpstan-typo3": "12.0.x-dev",
 		"sbuerk/typo3-cmscomposerinstallers-testingframework-bridge": "^0.0.1",
 		"seld/jsonlint": "^1.9.0",
 		"squizlabs/php_codesniffer": "^3.7.1",
 		"symfony/yaml": "^5.4 || ^6.1",
-		"typo3/cms-fluid-styled-content": "^11.5.2 || ^12.0",
+		"typo3/cms-fluid-styled-content": "^11.5.4 || ^12.0",
 		"typo3/coding-standards": "^0.5.5",
 		"typo3/testing-framework": "^7.0@dev"
 	},
@@ -63,6 +63,17 @@
 	"conflict": {
 		"typo3/class-alias-loader": "< 1.1.0"
 	},
+	"repositories": {
+		"1_phpstan-typo3_fork": {
+			"type": "vcs",
+			"url": "https://github.com/linawolf/phpstan-typo3.git"
+		},
+		"2_typo3-typoscript-lint_fork": {
+			"type": "vcs",
+			"url": "https://github.com/linawolf/typo3-typoscript-lint.git"
+		}
+	},
+	"minimum-stability": "dev",
 	"prefer-stable": true,
 	"autoload": {
 		"psr-4": {