cleanup

deprecated-packages · Feb 18, 2024 · 7832a44 · 7832a44
1 parent cf6a177
commit 7832a44
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 126 deletions.
diff --git a/.phpunit.cache/test-results b/.phpunit.cache/test-results
diff --git a/composer.json b/composer.json
@@ -35,20 +35,11 @@
             ]
         }
     },
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> f95775c (fixup! misc)
     "scripts": {
         "fix-cs": "vendor/bin/ecs check src tests --fix",
         "check-cs": "vendor/bin/ecs check src tests",
         "phpstan": "vendor/bin/phpstan"
     },
-<<<<<<< HEAD
->>>>>>> dd66021 (fixup! misc)
-=======
->>>>>>> f95775c (fixup! misc)
     "config": {
         "allow-plugins": {
             "phpstan/extension-installer": true,

diff --git a/config/extension.neon b/config/extension.neon
@@ -16,7 +16,6 @@ parameters:
         - ../stubs/Utility.stub
 
 services:
-    # checked
     -
         class: PHPStanCakePHP2\ClassPropertyExtension\ClassComponentPropertyExtension
         tags:
@@ -27,20 +26,18 @@ services:
         tags:
             - phpstan.broker.propertiesClassReflectionExtension
 
-    # checked
     -
         class: PHPStanCakePHP2\ReturnTypeExtension\ClassRegistryInitExtension
         tags:
             - phpstan.broker.dynamicStaticMethodReturnTypeExtension
 
-    # checked
     -
         class: PHPStanCakePHP2\ClassPropertyExtension\ShellClassPropertyExtension
         tags:
             - phpstan.broker.propertiesClassReflectionExtension
 
     -
-        class: PHPStanCakePHP2\ModelBehaviorsExtension
+        class: PHPStanCakePHP2\ClassMethodExtension\ModelMethodExtension
         arguments:
             behaviorPaths: %behaviorPaths%
         tags:
@@ -50,9 +47,3 @@ services:
         class: PHPStanCakePHP2\Service\SchemaService
         arguments:
             schemaPaths: %schemaPaths%
-
-    -
-        class: PHPStanCakePHP2\LoadComponentOnFlyMethodReturnTypeExtension
-        tags:
-            - phpstan.broker.dynamicMethodReturnTypeExtension
-
diff --git a/src/ModelBehaviorsExtension.php → ...sMethodExtension/ModelMethodExtension.php b/src/ModelBehaviorsExtension.php → ...sMethodExtension/ModelMethodExtension.php
@@ -2,19 +2,20 @@
 
 declare(strict_types=1);
 
-namespace PHPStanCakePHP2;
+namespace PHPStanCakePHP2\ClassMethodExtension;
 
 use Exception;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\MethodsClassReflectionExtension;
 use PHPStan\Reflection\ReflectionProvider;
+use PHPStanCakePHP2\ModelBehaviorMethodExtractor;
 use PHPStanCakePHP2\Reflection\ClassReflectionFinder;
 
 /**
  * Adds methods to {@link Model}s from {@link ModelBehavior} classes.
  */
-final class ModelBehaviorsExtension implements MethodsClassReflectionExtension
+final class ModelMethodExtension implements MethodsClassReflectionExtension
 {
     private ReflectionProvider $reflectionProvider;
 

diff --git a/src/LoadComponentOnFlyMethodReturnTypeExtension.php b/src/LoadComponentOnFlyMethodReturnTypeExtension.php
diff --git a/src/ModelBehaviorMethodExtractor.php b/src/ModelBehaviorMethodExtractor.php
@@ -11,6 +11,7 @@
 use PHPStan\Reflection\ParameterReflection;
 use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\Type\ObjectType;
+use PHPStanCakePHP2\Reflection\ModelBehaviorMethodWrapper;
 
 final class ModelBehaviorMethodExtractor
 {

diff --git a/src/ModelBehaviorMethodWrapper.php → ...Reflection/ModelBehaviorMethodWrapper.php b/src/ModelBehaviorMethodWrapper.php → ...Reflection/ModelBehaviorMethodWrapper.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PHPStanCakePHP2;
+namespace PHPStanCakePHP2\Reflection;
 
 use PHPStan\Reflection\ClassMemberReflection;
 use PHPStan\Reflection\ClassReflection;

diff --git a/tests/Feature/ControllerExtensionsTest.php b/tests/Feature/ControllerExtensionsTest.php
@@ -4,15 +4,19 @@
 
 namespace PHPStanCakePHP2\Tests\Feature;
 
+use Iterator;
 use PHPStan\Testing\TypeInferenceTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
 
-class ControllerExtensionsTest extends TypeInferenceTestCase
+final class ControllerExtensionsTest extends TypeInferenceTestCase
 {
-    /**
-     * @return mixed[]
-     */
-    public static function dataFileAsserts(): \Iterator
+    #[DataProvider('dataFileAsserts')]
+    public function test(string $assertType, string $file, ...$args): void
+    {
+        $this->assertFileAsserts($assertType, $file, ...$args);
+    }
+
+    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');
@@ -21,12 +25,6 @@ public static function dataFileAsserts(): \Iterator
         yield from self::gatherAssertTypes(__DIR__ . '/data/existing_controller_component_from_parent_controller.php');
     }
 
-    #[DataProvider('dataFileAsserts')]
-    public function test(string $assertType, string $file, ...$args): void
-    {
-        $this->assertFileAsserts($assertType, $file, ...$args);
-    }
-
     public static function getAdditionalConfigFiles(): array
     {
         return [

diff --git a/tests/Feature/LoadComponentOnFlyMethodReturnTypeExtensionTest.php b/tests/Feature/LoadComponentOnFlyMethodReturnTypeExtensionTest.php
diff --git a/tests/Feature/data/loading_component_loaded_on_fly.php b/tests/Feature/data/loading_component_loaded_on_fly.php