Merge pull request #145 from oliverklee/task/static-data-providers

sascha-egerer · web-flow · commit 0cecc8fc6c4d · 2024-01-30T13:31:53.000+01:00
[TASK] Make the data providers static
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');
 	}
 
 	/**
diff --git a/tests/Unit/Type/DateTimeAspectGetDynamicReturnTypeExtension/DateTimeAspectGetDynamicReturnTypeExtensionTest.php b/tests/Unit/Type/DateTimeAspectGetDynamicReturnTypeExtension/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/tests/Unit/Type/GeneralUtilityGetIndpEnvDynamicReturnTypeExtension/GeneralUtilityGetIndpEnvDynamicReturnTypeExtensionTest.php b/tests/Unit/Type/GeneralUtilityGetIndpEnvDynamicReturnTypeExtension/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/tests/Unit/Type/MathUtilityTypeSpecifyingExtension/MathUtilityTypeSpecifyingExtensionTest.php b/tests/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/tests/Unit/Type/QueryResultToArrayDynamicReturnTypeExtension/QueryResultToArrayDynamicReturnTypeExtensionTest.php b/tests/Unit/Type/QueryResultToArrayDynamicReturnTypeExtension/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/tests/Unit/Type/UserAspectGetDynamicReturnTypeExtension/UserAspectGetDynamicReturnTypeExtensionTest.php b/tests/Unit/Type/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');
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ final class ValidatorResolverOptionsRuleTest extends RuleTestCase`
`13`	`13`	`{`
`14`	`14`
`15`	`15`	`/**`
`16`		`- * @dataProvider provideDataWithErrors()`
	`16`	`+ * @dataProvider provideDataWithErrors`
`17`	`17`	`*`
`18`	`18`	`* @param list<array{0: string, 1: int, 2?: string}> $expectedErrorMessagesWithLines`
`19`	`19`	`*/`
`@@ -27,7 +27,7 @@ public function testRuleWithoutErrors(): void`
`27`	`27`	`$this->analyse([__DIR__ . '/Fixture/CreateValidatorWithCorrectOptions.php'], []);`
`28`	`28`	`}`
`29`	`29`
`30`		`- public function provideDataWithErrors(): \Iterator`
	`30`	`+ public static function provideDataWithErrors(): \Iterator`
`31`	`31`	`{`
`32`	`32`	`yield [`
`33`	`33`	`__DIR__ . '/Fixture/CreateValidatorWithUnresolvableType.php',`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,10 @@ class ContextDynamicReturnTypeExtensionTest extends TypeInferenceTestCase`
`10`	`10`	`/**`
`11`	`11`	`* @return iterable<mixed>`
`12`	`12`	`*/`
`13`		`- public function dataFileAsserts(): iterable`
	`13`	`+ public static function dataFileAsserts(): iterable`
`14`	`14`	`{`
`15`	`15`	`// path to a file with actual asserts of expected types:`
`16`		`- yield from $this->gatherAssertTypes(__DIR__ . '/data/context-get-aspect-return-types.php');`
	`16`	`+ yield from self::gatherAssertTypes(__DIR__ . '/data/context-get-aspect-return-types.php');`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ final class DateTimeAspectGetDynamicReturnTypeExtensionTest extends TypeInferenc`
`11`	`11`	`*`
`12`	`12`	`* @return iterable<mixed>`
`13`	`13`	`*/`
`14`		`- public function dataFileAsserts(): iterable`
	`14`	`+ public static function dataFileAsserts(): iterable`
`15`	`15`	`{`
`16`		`- yield from $this->gatherAssertTypes(__DIR__ . '/data/datetime-aspect-get-return-types.php');`
	`16`	`+ yield from self::gatherAssertTypes(__DIR__ . '/data/datetime-aspect-get-return-types.php');`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ final class GeneralUtilityGetIndpEnvDynamicReturnTypeExtensionTest extends TypeI`
`10`	`10`	`/**`
`11`	`11`	`* @return iterable<mixed>`
`12`	`12`	`*/`
`13`		`- public function dataFileAsserts(): iterable`
	`13`	`+ public static function dataFileAsserts(): iterable`
`14`	`14`	`{`
`15`		`- yield from $this->gatherAssertTypes(__DIR__ . '/data/GeneralUtilityGetIndpEnvTest.php');`
	`15`	`+ yield from self::gatherAssertTypes(__DIR__ . '/data/GeneralUtilityGetIndpEnvTest.php');`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ final class MathUtilityTypeSpecifyingExtensionTest extends TypeInferenceTestCase`
`10`	`10`	`/**`
`11`	`11`	`* @return iterable<mixed>`
`12`	`12`	`*/`
`13`		`- public function dataFileAsserts(): iterable`
	`13`	`+ public static function dataFileAsserts(): iterable`
`14`	`14`	`{`
`15`		`- yield from $this->gatherAssertTypes(__DIR__ . '/data/MathUtilityTest.php');`
	`15`	`+ yield from self::gatherAssertTypes(__DIR__ . '/data/MathUtilityTest.php');`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ class ObjectStorageStubFileTest extends TypeInferenceTestCase`
`10`	`10`	`/**`
`11`	`11`	`* @return iterable<mixed>`
`12`	`12`	`*/`
`13`		`- public function dataFileAsserts(): iterable`
	`13`	`+ public static function dataFileAsserts(): iterable`
`14`	`14`	`{`
`15`		`- yield from $this->gatherAssertTypes(__DIR__ . '/data/object-storage-stub-files.php');`
	`15`	`+ yield from self::gatherAssertTypes(__DIR__ . '/data/object-storage-stub-files.php');`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ final class PropertyMapperReturnTypeExtensionTest extends TypeInferenceTestCase`
`10`	`10`	`/**`
`11`	`11`	`* @return iterable<mixed>`
`12`	`12`	`*/`
`13`		`- public function dataFileAsserts(): iterable`
	`13`	`+ public static function dataFileAsserts(): iterable`
`14`	`14`	`{`
`15`		`- yield from $this->gatherAssertTypes(__DIR__ . '/data/property-converter-types.php');`
	`15`	`+ yield from self::gatherAssertTypes(__DIR__ . '/data/property-converter-types.php');`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ class QueryFactoryStubFileTest extends TypeInferenceTestCase`
`10`	`10`	`/**`
`11`	`11`	`* @return iterable<mixed>`
`12`	`12`	`*/`
`13`		`- public function dataFileAsserts(): iterable`
	`13`	`+ public static function dataFileAsserts(): iterable`
`14`	`14`	`{`
`15`		`- yield from $this->gatherAssertTypes(__DIR__ . '/data/query-factory-stub-files.php');`
	`15`	`+ yield from self::gatherAssertTypes(__DIR__ . '/data/query-factory-stub-files.php');`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ final class QueryResultToArrayDynamicReturnTypeExtensionTest extends TypeInferen`
`10`	`10`	`/**`
`11`	`11`	`* @return iterable<mixed>`
`12`	`12`	`*/`
`13`		`- public function dataFileAsserts(): iterable`
	`13`	`+ public static function dataFileAsserts(): iterable`
`14`	`14`	`{`
`15`		`- yield from $this->gatherAssertTypes(__DIR__ . '/data/query-result-to-array.php');`
	`15`	`+ yield from self::gatherAssertTypes(__DIR__ . '/data/query-result-to-array.php');`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ class RepositoryQueryDynamicReturnTypeExtensionTest extends TypeInferenceTestCas`
`10`	`10`	`/**`
`11`	`11`	`* @return iterable<mixed>`
`12`	`12`	`*/`
`13`		`- public function dataFileAsserts(): iterable`
	`13`	`+ public static function dataFileAsserts(): iterable`
`14`	`14`	`{`
`15`		`- yield from $this->gatherAssertTypes(__DIR__ . '/data/custom-query-type.php');`
	`15`	`+ yield from self::gatherAssertTypes(__DIR__ . '/data/custom-query-type.php');`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`