Keep support for PHP7.4 and TYPO3 10

sascha-egerer · sascha-egerer · commit 771cd0ec6b53 · 2023-05-10T12:58:50.000+02:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,6 +12,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - typo3-version: "^10.4"
+            php-version: "7.4"
+            composer-flags: ""
+          - typo3-version: "^10.4"
+            php-version: "7.4"
+            composer-flags: " --prefer-lowest"
+          - typo3-version: "^11.5"
+            php-version: "7.4"
+            composer-flags: ""
+          - typo3-version: "^11.5"
+            php-version: "7.4"
+            composer-flags: " --prefer-lowest"
           - typo3-version: "^11.5"
             php-version: "8.0"
             composer-flags: ""
diff --git a/build.xml b/build.xml
@@ -36,8 +36,8 @@
 			logoutput="true"
 			passthru="true"
 			checkreturn="true"
-			level="error"
 		>
+			<arg line="--runtime-set php_version 70400"/>
 		</exec>
 	</target>
 
@@ -49,6 +49,7 @@
 			checkreturn="true"
 			level="error"
 		>
+			<arg line="--runtime-set php_version 70400"/>
 		</exec>
 	</target>
 
diff --git a/composer.json b/composer.json
@@ -8,11 +8,11 @@
 	"minimum-stability": "dev",
 	"prefer-stable": true,
 	"require": {
-		"php": "^8.0",
+		"php": "^7.4 || ^8.0",
 		"phpstan/phpstan": "^1.8.9",
 		"nikic/php-parser": "^4.15.1",
-		"typo3/cms-core": "^11.5 || ^12.3",
-		"typo3/cms-extbase": "^11.5 || ^12.3",
+		"typo3/cms-core": "^10.4 || ^11.5 || ^12.4",
+		"typo3/cms-extbase": "^10.4 || ^11.5 || ^12.4",
 		"bnf/phpstan-psr-container": "^1.0",
 		"composer/semver": "^3.3"
 	},
diff --git a/tests/Unit/Type/ContextDynamicReturnTypeExtensionTest.php b/tests/Unit/Type/ContextDynamicReturnTypeExtensionTest.php
@@ -26,7 +26,7 @@ public function dataFileAsserts(): iterable
 	public function testFileAsserts(
 		string $assertType,
 		string $file,
-		mixed ...$args
+		...$args
 	): void
 	{
 		$this->assertFileAsserts($assertType, $file, ...$args);
diff --git a/tests/Unit/Type/GeneralUtilityGetIndpEnvDynamicReturnTypeExtension/GeneralUtilityGetIndpEnvDynamicReturnTypeExtensionTest.php b/tests/Unit/Type/GeneralUtilityGetIndpEnvDynamicReturnTypeExtension/GeneralUtilityGetIndpEnvDynamicReturnTypeExtensionTest.php
@@ -24,7 +24,7 @@ public function dataFileAsserts(): iterable
 	public function testFileAsserts(
 		string $assertType,
 		string $file,
-		mixed ...$args
+		...$args
 	): void
 	{
 		$this->assertFileAsserts($assertType, $file, ...$args);
diff --git a/tests/Unit/Type/MathUtilityTypeSpecifyingExtension/MathUtilityTypeSpecifyingExtensionTest.php b/tests/Unit/Type/MathUtilityTypeSpecifyingExtension/MathUtilityTypeSpecifyingExtensionTest.php
@@ -24,7 +24,7 @@ public function dataFileAsserts(): iterable
 	public function testFileAsserts(
 		string $assertType,
 		string $file,
-		mixed ...$args
+		...$args
 	): void
 	{
 		$this->assertFileAsserts($assertType, $file, ...$args);
diff --git a/tests/Unit/Type/ObjectStorageStubFileTest.php b/tests/Unit/Type/ObjectStorageStubFileTest.php
@@ -25,7 +25,7 @@ public function dataFileAsserts(): iterable
 	public function testFileAsserts(
 		string $assertType,
 		string $file,
-		mixed ...$args
+		...$args
 	): void
 	{
 		$this->assertFileAsserts($assertType, $file, ...$args);
diff --git a/tests/Unit/Type/PropertyMapperReturnTypeExtension/PropertyMapperReturnTypeExtensionTest.php b/tests/Unit/Type/PropertyMapperReturnTypeExtension/PropertyMapperReturnTypeExtensionTest.php
@@ -25,7 +25,7 @@ public function dataFileAsserts(): iterable
 	public function testFileAsserts(
 		string $assertType,
 		string $file,
-		mixed ...$args
+		...$args
 	): void
 	{
 		$this->assertFileAsserts($assertType, $file, ...$args);
diff --git a/tests/Unit/Type/QueryFactoryStubFileTest.php b/tests/Unit/Type/QueryFactoryStubFileTest.php
@@ -25,7 +25,7 @@ public function dataFileAsserts(): iterable
 	public function testFileAsserts(
 		string $assertType,
 		string $file,
-		mixed ...$args
+		...$args
 	): void
 	{
 		$this->assertFileAsserts($assertType, $file, ...$args);
diff --git a/tests/Unit/Type/QueryResultToArrayDynamicReturnTypeExtension/QueryResultToArrayDynamicReturnTypeExtensionTest.php b/tests/Unit/Type/QueryResultToArrayDynamicReturnTypeExtension/QueryResultToArrayDynamicReturnTypeExtensionTest.php
@@ -25,7 +25,7 @@ public function dataFileAsserts(): iterable
 	public function testFileAsserts(
 		string $assertType,
 		string $file,
-		mixed ...$args
+		...$args
 	): void
 	{
 		$this->assertFileAsserts($assertType, $file, ...$args);
diff --git a/tests/Unit/Type/RepositoryQueryDynamicReturnTypeExtensionTest.php b/tests/Unit/Type/RepositoryQueryDynamicReturnTypeExtensionTest.php
@@ -25,7 +25,7 @@ public function dataFileAsserts(): iterable
 	public function testFileAsserts(
 		string $assertType,
 		string $file,
-		mixed ...$args
+		...$args
 	): void
 	{
 		$this->assertFileAsserts($assertType, $file, ...$args);
diff --git a/tests/Unit/Type/RepositoryStubFileTest.php b/tests/Unit/Type/RepositoryStubFileTest.php
@@ -25,7 +25,7 @@ public function dataFileAsserts(): iterable
 	public function testFileAsserts(
 		string $assertType,
 		string $file,
-		mixed ...$args
+		...$args
 	): void
 	{
 		$this->assertFileAsserts($assertType, $file, ...$args);
diff --git a/tests/Unit/Type/RequestGetAttributeDynamicReturnTypeExtensionTest.php b/tests/Unit/Type/RequestGetAttributeDynamicReturnTypeExtensionTest.php
@@ -26,7 +26,7 @@ public function dataFileAsserts(): iterable
 	public function testFileAsserts(
 		string $assertType,
 		string $file,
-		mixed ...$args
+		...$args
 	): void
 	{
 		$this->assertFileAsserts($assertType, $file, ...$args);
diff --git a/tests/Unit/Type/SiteGetAttributeDynamicReturnTypeExtensionTest.php b/tests/Unit/Type/SiteGetAttributeDynamicReturnTypeExtensionTest.php
@@ -26,7 +26,7 @@ public function dataFileAsserts(): iterable
 	public function testFileAsserts(
 		string $assertType,
 		string $file,
-		mixed ...$args
+		...$args
 	): void
 	{
 		$this->assertFileAsserts($assertType, $file, ...$args);

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function dataFileAsserts(): iterable`
`26`	`26`	`public function testFileAsserts(`
`27`	`27`	`string $assertType,`
`28`	`28`	`string $file,`
`29`		`- mixed ...$args`
	`29`	`+ ...$args`
`30`	`30`	`): void`
`31`	`31`	`{`
`32`	`32`	`$this->assertFileAsserts($assertType, $file, ...$args);`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function dataFileAsserts(): iterable`
`24`	`24`	`public function testFileAsserts(`
`25`	`25`	`string $assertType,`
`26`	`26`	`string $file,`
`27`		`- mixed ...$args`
	`27`	`+ ...$args`
`28`	`28`	`): void`
`29`	`29`	`{`
`30`	`30`	`$this->assertFileAsserts($assertType, $file, ...$args);`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function dataFileAsserts(): iterable`
`25`	`25`	`public function testFileAsserts(`
`26`	`26`	`string $assertType,`
`27`	`27`	`string $file,`
`28`		`- mixed ...$args`
	`28`	`+ ...$args`
`29`	`29`	`): void`
`30`	`30`	`{`
`31`	`31`	`$this->assertFileAsserts($assertType, $file, ...$args);`