misc

deprecated-packages · Feb 18, 2024 · 0a17ef5 · 0a17ef5
1 parent 588ba32
commit 0a17ef5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 20 deletions.
diff --git a/...PropertyExtension/ClassComponentPropertyExtension/ClassComponentPropertyExtensionTest.php b/...PropertyExtension/ClassComponentPropertyExtension/ClassComponentPropertyExtensionTest.php
@@ -22,7 +22,7 @@ public function test(string $assertType, string $file, ...$args): void
     /**
      * @return mixed[]
      */
-    public static function dataFileAsserts(): iterable
+    public static function dataFileAsserts(): \Iterator
     {
         yield from self::gatherAssertTypes(__DIR__ . '/Fixture/existing_component_component.php');
         yield from self::gatherAssertTypes(__DIR__ . '/Fixture/invalid_component_property.php');

diff --git a/.../ClassPropertyExtension/ClassModelsPropertyExtension/ClassModelPropertyExtensionsTest.php b/.../ClassPropertyExtension/ClassModelsPropertyExtension/ClassModelPropertyExtensionsTest.php
@@ -21,7 +21,7 @@ public function test(string $assertType, string $file, ...$args): void
     /**
      * @return mixed[]
      */
-    public static function dataFileAsserts(): iterable
+    public static function dataFileAsserts(): \Iterator
     {
         yield from self::gatherAssertTypes(__DIR__ . '/Fixture/core_model_behavior.php');
 //        yield from self::gatherAssertTypes(__DIR__ . '/Fixture/custom_model_behavior.php');

diff --git a/tests/ClassPropertyExtension/ShellClassPropertyExtension/ShellClassPropertyExtensionTest.php b/tests/ClassPropertyExtension/ShellClassPropertyExtension/ShellClassPropertyExtensionTest.php
@@ -19,7 +19,7 @@ public function test(string $assertType, string $file, ...$args): void
         $this->assertFileAsserts($assertType, $file, ...$args);
     }
 
-    public static function dataFileAsserts(): iterable
+    public static function dataFileAsserts(): \Iterator
     {
         yield from self::gatherAssertTypes(__DIR__ . '/Fixture/existing_shell_model.php');
         yield from self::gatherAssertTypes(__DIR__ . '/Fixture/existing_shell_task.php');

diff --git a/tests/Feature/ControllerExtensionsTest.php b/tests/Feature/ControllerExtensionsTest.php
@@ -12,7 +12,7 @@ class ControllerExtensionsTest extends TypeInferenceTestCase
     /**
      * @return mixed[]
      */
-    public static function dataFileAsserts(): iterable
+    public static function dataFileAsserts(): \Iterator
     {
         yield from self::gatherAssertTypes(__DIR__ . '/data/existing_controller_model.php');
         yield from self::gatherAssertTypes(__DIR__ . '/data/existing_controller_component.php');

diff --git a/tests/Feature/LoadComponentOnFlyMethodReturnTypeExtensionTest.php b/tests/Feature/LoadComponentOnFlyMethodReturnTypeExtensionTest.php
@@ -5,30 +5,23 @@
 namespace PHPStanCakePHP2\Tests\Feature;
 
 use PHPStan\Testing\TypeInferenceTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
-class LoadComponentOnFlyMethodReturnTypeExtensionTest extends TypeInferenceTestCase
+final class LoadComponentOnFlyMethodReturnTypeExtensionTest extends TypeInferenceTestCase
 {
-    /**
-     * @return mixed[]
-     */
-    public static function dataFileAsserts(): iterable
+    #[DataProvider('dataFileAsserts')]
+    public function test(string $assertType, string $file, ...$args): void
     {
-        yield from self::gatherAssertTypes(__DIR__ . '/data/loading_component_loaded_on_fly.php');
+        $this->assertFileAsserts($assertType, $file, ...$args);
     }
 
-    /**
-     * @dataProvider dataFileAsserts
-     * @param mixed $args
-     */
-    public function testControllerExtensions(string $assertType, string $file, ...$args): void
+    public static function dataFileAsserts(): \Iterator
     {
-        $this->assertFileAsserts($assertType, $file, ...$args);
+        yield from self::gatherAssertTypes(__DIR__ . '/data/loading_component_loaded_on_fly.php');
     }
 
     public static function getAdditionalConfigFiles(): array
     {
-        return [
-            __DIR__ . '/data/phpstan.neon',
-        ];
+        return [__DIR__ . '/data/phpstan.neon'];
     }
 }
diff --git a/tests/ReturnTypeExtension/ClassRegistryInitExtension/ClassRegistryInitExtensionTest.php b/tests/ReturnTypeExtension/ClassRegistryInitExtension/ClassRegistryInitExtensionTest.php
@@ -15,7 +15,7 @@ final class ClassRegistryInitExtensionTest extends TypeInferenceTestCase
     /**
      * @return mixed[]
      */
-    public static function dataFileAsserts(): iterable
+    public static function dataFileAsserts(): \Iterator
     {
         yield from self::gatherAssertTypes(__DIR__ . '/Fixture/variable_reference.php');
         yield from self::gatherAssertTypes(__DIR__ . '/Fixture/not_a_class.php');