[TASK] Make the data providers static

This is required in newer PHPUnit versions. Also bump the PHPStan dependency as needed to have some methods static: phpstan/phpstan-src@ea2670a
sascha-egerer · Jan 30, 2024 · a40ae22 · a40ae22
1 parent 2ff4e0c
commit a40ae22
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 30 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
 	"prefer-stable": true,
 	"require": {
 		"php": "^7.4 || ^8.0",
-		"phpstan/phpstan": "^1.8.9",
+		"phpstan/phpstan": "^1.10.9",
 		"nikic/php-parser": "^4.15.1",
 		"typo3/cms-core": "^10.4 || ^11.5 || ^12.4 || ^13.0",
 		"typo3/cms-extbase": "^10.4 || ^11.5 || ^12.4 || ^13.0",

diff --git a/tests/Unit/Rule/ValidatorResolverOptionsRule/ValidatorResolverOptionsRuleTest.php b/tests/Unit/Rule/ValidatorResolverOptionsRule/ValidatorResolverOptionsRuleTest.php
@@ -13,7 +13,7 @@ final class ValidatorResolverOptionsRuleTest extends RuleTestCase
 {
 
 	/**
-	 * @dataProvider provideDataWithErrors()
+	 * @dataProvider provideDataWithErrors
 	 *
 	 * @param list<array{0: string, 1: int, 2?: string}> $expectedErrorMessagesWithLines
 	 */
@@ -27,7 +27,7 @@ public function testRuleWithoutErrors(): void
 		$this->analyse([__DIR__ . '/Fixture/CreateValidatorWithCorrectOptions.php'], []);
 	}
 
-	public function provideDataWithErrors(): \Iterator
+	public static function provideDataWithErrors(): \Iterator
 	{
 		yield [
 			__DIR__ . '/Fixture/CreateValidatorWithUnresolvableType.php',

diff --git a/tests/Unit/Type/ContextDynamicReturnTypeExtensionTest.php b/tests/Unit/Type/ContextDynamicReturnTypeExtensionTest.php
@@ -10,10 +10,10 @@ class ContextDynamicReturnTypeExtensionTest extends TypeInferenceTestCase
 	/**
 	 * @return iterable<mixed>
 	 */
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
 		// path to a file with actual asserts of expected types:
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/context-get-aspect-return-types.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/context-get-aspect-return-types.php');
 	}
 
 	/**
@@ -23,7 +23,7 @@ public function dataFileAsserts(): iterable
 	 * @param string $file
 	 * @param mixed ...$args
 	 */
-	public function testFileAsserts(
+	public static function testFileAsserts(
 		string $assertType,
 		string $file,
 		...$args

diff --git a/...meAspectGetDynamicReturnTypeExtension/DateTimeAspectGetDynamicReturnTypeExtensionTest.php b/...meAspectGetDynamicReturnTypeExtension/DateTimeAspectGetDynamicReturnTypeExtensionTest.php
@@ -11,9 +11,9 @@ final class DateTimeAspectGetDynamicReturnTypeExtensionTest extends TypeInferenc
 	 *
 	 * @return iterable<mixed>
 	 */
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/datetime-aspect-get-return-types.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/datetime-aspect-get-return-types.php');
 	}
 
 	/**

diff --git a/...pEnvDynamicReturnTypeExtension/GeneralUtilityGetIndpEnvDynamicReturnTypeExtensionTest.php b/...pEnvDynamicReturnTypeExtension/GeneralUtilityGetIndpEnvDynamicReturnTypeExtensionTest.php
@@ -10,9 +10,9 @@ final class GeneralUtilityGetIndpEnvDynamicReturnTypeExtensionTest extends TypeI
 	/**
 	 * @return iterable<mixed>
 	 */
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/GeneralUtilityGetIndpEnvTest.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/GeneralUtilityGetIndpEnvTest.php');
 	}
 
 	/**

diff --git a/...s/Unit/Type/MathUtilityTypeSpecifyingExtension/MathUtilityTypeSpecifyingExtensionTest.php b/...s/Unit/Type/MathUtilityTypeSpecifyingExtension/MathUtilityTypeSpecifyingExtensionTest.php
@@ -10,9 +10,9 @@ final class MathUtilityTypeSpecifyingExtensionTest extends TypeInferenceTestCase
 	/**
 	 * @return iterable<mixed>
 	 */
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/MathUtilityTest.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/MathUtilityTest.php');
 	}
 
 	/**

diff --git a/tests/Unit/Type/ObjectStorageStubFileTest.php b/tests/Unit/Type/ObjectStorageStubFileTest.php
@@ -10,9 +10,9 @@ class ObjectStorageStubFileTest extends TypeInferenceTestCase
 	/**
 	 * @return iterable<mixed>
 	 */
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/object-storage-stub-files.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/object-storage-stub-files.php');
 	}
 
 	/**

diff --git a/tests/Unit/Type/PropertyMapperReturnTypeExtension/PropertyMapperReturnTypeExtensionTest.php b/tests/Unit/Type/PropertyMapperReturnTypeExtension/PropertyMapperReturnTypeExtensionTest.php
@@ -10,9 +10,9 @@ final class PropertyMapperReturnTypeExtensionTest extends TypeInferenceTestCase
 	/**
 	 * @return iterable<mixed>
 	 */
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/property-converter-types.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/property-converter-types.php');
 	}
 
 	/**

diff --git a/tests/Unit/Type/QueryFactoryStubFileTest.php b/tests/Unit/Type/QueryFactoryStubFileTest.php
@@ -10,9 +10,9 @@ class QueryFactoryStubFileTest extends TypeInferenceTestCase
 	/**
 	 * @return iterable<mixed>
 	 */
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/query-factory-stub-files.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/query-factory-stub-files.php');
 	}
 
 	/**

diff --git a/...ultToArrayDynamicReturnTypeExtension/QueryResultToArrayDynamicReturnTypeExtensionTest.php b/...ultToArrayDynamicReturnTypeExtension/QueryResultToArrayDynamicReturnTypeExtensionTest.php
@@ -10,9 +10,9 @@ final class QueryResultToArrayDynamicReturnTypeExtensionTest extends TypeInferen
 	/**
 	 * @return iterable<mixed>
 	 */
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/query-result-to-array.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/query-result-to-array.php');
 	}
 
 	/**

diff --git a/tests/Unit/Type/RepositoryQueryDynamicReturnTypeExtensionTest.php b/tests/Unit/Type/RepositoryQueryDynamicReturnTypeExtensionTest.php
@@ -10,9 +10,9 @@ class RepositoryQueryDynamicReturnTypeExtensionTest extends TypeInferenceTestCas
 	/**
 	 * @return iterable<mixed>
 	 */
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/custom-query-type.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/custom-query-type.php');
 	}
 
 	/**

diff --git a/tests/Unit/Type/RepositoryStubFileTest.php b/tests/Unit/Type/RepositoryStubFileTest.php
@@ -10,9 +10,9 @@ class RepositoryStubFileTest extends TypeInferenceTestCase
 	/**
 	 * @return iterable<mixed>
 	 */
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/repository-stub-files.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/repository-stub-files.php');
 	}
 
 	/**

diff --git a/tests/Unit/Type/RequestGetAttributeDynamicReturnTypeExtensionTest.php b/tests/Unit/Type/RequestGetAttributeDynamicReturnTypeExtensionTest.php
@@ -10,10 +10,10 @@ class RequestGetAttributeDynamicReturnTypeExtensionTest extends TypeInferenceTes
 	/**
 	 * @return iterable<mixed>
 	 */
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
 		// path to a file with actual asserts of expected types:
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/request-get-attribute-return-types.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/request-get-attribute-return-types.php');
 	}
 
 	/**

diff --git a/tests/Unit/Type/SiteGetAttributeDynamicReturnTypeExtensionTest.php b/tests/Unit/Type/SiteGetAttributeDynamicReturnTypeExtensionTest.php
@@ -10,10 +10,10 @@ class SiteGetAttributeDynamicReturnTypeExtensionTest extends TypeInferenceTestCa
 	/**
 	 * @return iterable<mixed>
 	 */
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
 		// path to a file with actual asserts of expected types:
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/site-get-attribute-return-types.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/site-get-attribute-return-types.php');
 	}
 
 	/**

diff --git a/...e/UserAspectGetDynamicReturnTypeExtension/UserAspectGetDynamicReturnTypeExtensionTest.php b/...e/UserAspectGetDynamicReturnTypeExtension/UserAspectGetDynamicReturnTypeExtensionTest.php
@@ -11,9 +11,9 @@ final class UserAspectGetDynamicReturnTypeExtensionTest extends TypeInferenceTes
 	 *
 	 * @return iterable<mixed>
 	 */
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/user-aspect-get-return-types.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/user-aspect-get-return-types.php');
 	}
 
 	/**