[TASK] Remove phpstan/phpstan conflict

mteu · Sep 13, 2024 · 7beffee · 7beffee
1 parent d46e109
commit 7beffee
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 32 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
 		"mteu/docblock-rules": "^0.3",
 		"mteu/zealous-stan": "^0.6",
 		"phpstan/extension-installer": "^1.4",
-		"phpstan/phpstan": "^1.11",
+		"phpstan/phpstan": "^1.12",
 		"phpstan/phpstan-phpunit": "^1.4",
 		"phpunit/php-code-coverage": "^10.1",
 		"phpunit/phpcov": "^9.0",
@@ -31,9 +31,6 @@
 		"typo3/coding-standards": "^0.8.0",
 		"typo3/testing-framework": "^8.2"
 	},
-	"conflict": {
-		"phpstan/phpstan": ">=1.11.9"
-	},
 	"autoload": {
 		"psr-4": {
 			"mteu\\StreamWriter\\": "Classes/"

diff --git a/composer.lock b/composer.lock