tv bump 2 (#2)

* misc

* cleanup

* fixup! cleanup

Author: TomasVotruba

.github/workflows/code_analysis.yml

@@ -14,7 +14,7 @@ jobs:
           - name: Setup PHP
             uses: shivammathur/setup-php@v2
             with:
-              php-version: 8.0
+              php-version: 8.1
 
           - name: Validate composer
             run: composer validate

.phpunit.cache/test-results

@@ -25,7 +25,7 @@
         },
         "classmap": [
             "stubs",
-            "tests/Feature/classes"
+            "tests/Source"
         ]
     },
     "extra": {
@@ -35,6 +35,11 @@
             ]
         }
     },
+    "scripts": {
+        "fix-cs": "vendor/bin/ecs check src tests --fix",
+        "check-cs": "vendor/bin/ecs check src tests",
+        "phpstan": "vendor/bin/phpstan"
+    },
     "config": {
         "allow-plugins": {
             "phpstan/extension-installer": true,

composer.json

@@ -16,7 +16,6 @@ parameters:
         - ../stubs/Utility.stub
 
 services:
-    # checked
     -
         class: PHPStanCakePHP2\ClassPropertyExtension\ClassComponentPropertyExtension
         tags:
@@ -27,32 +26,29 @@ 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:
             - phpstan.broker.methodsClassReflectionExtension
 
     -
-        class: PHPStanCakePHP2\Service\SchemaService
-        arguments:
-            schemaPaths: %schemaPaths%
-
-    -
-        class: PHPStanCakePHP2\LoadComponentOnFlyMethodReturnTypeExtension
+        class: PHPStanCakePHP2\ReturnTypeExtension\LoadComponentOnFlyMethodReturnTypeExtension
         tags:
             - phpstan.broker.dynamicMethodReturnTypeExtension
 
+    -
+        class: PHPStanCakePHP2\Service\SchemaService
+        arguments:
+            schemaPaths: %schemaPaths%

config/extension.neon

@@ -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;
 

src/ModelBehaviorsExtension.php renamed to src/ClassMethodExtension/ModelMethodExtension.php

@@ -15,7 +15,7 @@
 use PHPStanCakePHP2\Reflection\PublicReadOnlyPropertyReflection;
 
 /**
- * @see \ClassPropertyExtension\ClassComponentPropertyExtension\ClassComponentPropertyExtensionTest
+ * @see \PHPStanCakePHP2\Tests\ClassPropertyExtension\ClassComponentPropertyExtension\ClassComponentPropertyExtensionTest
  */
 final class ClassComponentPropertyExtension implements PropertiesClassReflectionExtension
 {
@@ -32,8 +32,6 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
             return false;
         }
 
-
-
         $isDefinedInComponentsProperty = (bool) array_filter(
             $this->getDefinedComponentsAsList($classReflection),
             static fn (string $componentName): bool => $componentName === $propertyName

src/ClassPropertyExtension/ClassComponentPropertyExtension.php

@@ -11,6 +11,7 @@
 use PHPStan\Reflection\ParameterReflection;
 use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\Type\ObjectType;
+use PHPStanCakePHP2\Reflection\ModelBehaviorMethodWrapper;
 
 final class ModelBehaviorMethodExtractor
 {

src/ModelBehaviorMethodExtractor.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PHPStanCakePHP2;
+namespace PHPStanCakePHP2\Reflection;
 
 use PHPStan\Reflection\ClassMemberReflection;
 use PHPStan\Reflection\ClassReflection;

src/ModelBehaviorMethodWrapper.php renamed to src/Reflection/ModelBehaviorMethodWrapper.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PHPStanCakePHP2;
+namespace PHPStanCakePHP2\ReturnTypeExtension;
 
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Scalar\String_;
@@ -13,7 +13,7 @@
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 
-class LoadComponentOnFlyMethodReturnTypeExtension implements DynamicMethodReturnTypeExtension
+final class LoadComponentOnFlyMethodReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
     private ReflectionProvider $reflectionProvider;
 

src/LoadComponentOnFlyMethodReturnTypeExtension.php renamed to src/ReturnTypeExtension/LoadComponentOnFlyMethodReturnTypeExtension.php

@@ -2,5 +2,14 @@
 
 class Controller
 {
+    public $components = [];
 
+    public function __get(string $name)
+    {
+        if (isset($this->{$name})) {
+            return $this->{$name};
+        }
+
+        return 'some value';
+    }
 }