slip

.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

.gitignore

@@ -6,4 +6,4 @@
 composer.lock
 
 # tests
-.phpunit.result
+.phpunit.result.cache

composer.json

@@ -25,7 +25,7 @@
         },
         "classmap": [
             "stubs",
-            "tests/Feature/classes"
+            "tests/Source"
         ]
     },
     "extra": {

tests/ClassPropertyExtension/ClassComponentPropertyExtension/ClassComponentPropertyExtensionTest.php

@@ -24,6 +24,10 @@ 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');
+
+        yield from self::gatherAssertTypes(__DIR__ . '/Fixture/existing_controller_component.php');
+        yield from self::gatherAssertTypes(__DIR__ . '/Fixture/existing_controller_component_from_parent_controller.php');
+        yield from self::gatherAssertTypes(__DIR__ . '/Fixture/existing_controller_component_with_same_method_name_as_model.php');
     }
 
     public static function getAdditionalConfigFiles(): array

tests/ClassPropertyExtension/ClassComponentPropertyExtension/Fixture/existing_component_component.php

@@ -2,6 +2,7 @@
 
 declare(strict_types = 1);
 
+use PHPStanCakePHP2\Tests\Source\Controller\Component\BasicComponent;
 use function PHPStan\Testing\assertType;
 
 /** @var BasicComponent $parentComponent */

tests/Feature/data/existing_controller_component.php → tests/ClassPropertyExtension/ClassComponentPropertyExtension/Fixture/existing_controller_component.php

@@ -2,6 +2,7 @@
 
 declare(strict_types = 1);
 
+use PHPStanCakePHP2\Tests\Source\Controller\BasicController;
 use function PHPStan\Testing\assertType;
 
 /** @var BasicController $controller */

tests/Feature/data/existing_controller_component_from_parent_controller.php → tests/ClassPropertyExtension/ClassComponentPropertyExtension/Fixture/existing_controller_component_from_parent_controller.php

@@ -2,6 +2,7 @@
 
 declare(strict_types = 1);
 
+use PHPStanCakePHP2\Tests\Source\Controller\SameAsModelController;
 use function PHPStan\Testing\assertType;
 
 /** @var SameAsModelController $controller */

tests/Feature/data/existing_controller_component_with_same_method_name_as_model.php → tests/ClassPropertyExtension/ClassComponentPropertyExtension/Fixture/existing_controller_component_with_same_method_name_as_model.php

@@ -2,6 +2,7 @@
 
 declare(strict_types = 1);
 
+use PHPStanCakePHP2\Tests\Source\Controller\SameAsModelController;
 use function PHPStan\Testing\assertType;
 
 /** @var SameAsModelController $controller */

tests/ClassPropertyExtension/ClassComponentPropertyExtension/Fixture/invalid_component_property.php

@@ -2,6 +2,7 @@
 
 declare(strict_types = 1);
 
+use PHPStanCakePHP2\Tests\Source\Controller\Component\BasicComponent;
 use function PHPStan\Testing\assertType;
 
 /** @var BasicComponent $component */

tests/ClassPropertyExtension/ClassModelsPropertyExtension/ClassModelPropertyExtensionsTest.php

@@ -24,6 +24,9 @@ public static function dataFileAsserts(): \Iterator
         yield from self::gatherAssertTypes(__DIR__ . '/Fixture/custom_model_behavior.php');
         yield from self::gatherAssertTypes(__DIR__ . '/Fixture/invalid_model_property.php');
         yield from self::gatherAssertTypes(__DIR__ . '/Fixture/existing_model_model.php');
+
+        yield from self::gatherAssertTypes(__DIR__ . '/Fixture/existing_controller_model.php');
+        yield from self::gatherAssertTypes(__DIR__ . '/Fixture/invalid_controller_property.php');
     }
 
     /**

tests/ClassPropertyExtension/ClassModelsPropertyExtension/Fixture/core_model_behavior.php

@@ -2,6 +2,7 @@
 
 declare(strict_types = 1);
 
+use PHPStanCakePHP2\Tests\Source\Model\BasicModel;
 use function PHPStan\Testing\assertType;
 
 /** @var BasicModel $model */

tests/ClassPropertyExtension/ClassModelsPropertyExtension/Fixture/custom_model_behavior.php

@@ -2,6 +2,7 @@
 
 declare(strict_types = 1);
 
+use PHPStanCakePHP2\Tests\Source\Model\BasicModel;
 use function PHPStan\Testing\assertType;
 
 /** @var BasicModel $model */

tests/Feature/data/existing_controller_model.php → tests/ClassPropertyExtension/ClassModelsPropertyExtension/Fixture/existing_controller_model.php

@@ -2,6 +2,7 @@
 
 declare(strict_types = 1);
 
+use PHPStanCakePHP2\Tests\Source\Controller\BasicController;
 use function PHPStan\Testing\assertType;
 
 /** @var BasicController $controller */

tests/ClassPropertyExtension/ClassModelsPropertyExtension/Fixture/existing_model_model.php

@@ -2,6 +2,7 @@
 
 declare(strict_types = 1);
 
+use PHPStanCakePHP2\Tests\Source\Model\BasicModel;
 use function PHPStan\Testing\assertType;
 
 /** @var BasicModel $model */

tests/Feature/data/invalid_controller_property.php → tests/ClassPropertyExtension/ClassModelsPropertyExtension/Fixture/invalid_controller_property.php

@@ -2,6 +2,7 @@
 
 declare(strict_types = 1);
 
+use PHPStanCakePHP2\Tests\Source\Controller\BasicController;
 use function PHPStan\Testing\assertType;
 
 /** @var BasicController $controller */

tests/ClassPropertyExtension/ClassModelsPropertyExtension/Fixture/invalid_model_property.php

@@ -2,6 +2,7 @@
 
 declare(strict_types = 1);
 
+use PHPStanCakePHP2\Tests\Source\Model\BasicModel;
 use function PHPStan\Testing\assertType;
 
 /** @var BasicModel $model */

tests/ClassPropertyExtension/ShellClassPropertyExtension/Fixture/existing_shell_model.php

@@ -2,6 +2,7 @@
 
 declare(strict_types = 1);
 
+use PHPStanCakePHP2\Tests\Source\Console\Command\BasicShell;
 use function PHPStan\Testing\assertType;
 
 $assign = function (BasicShell $shell) {

tests/ClassPropertyExtension/ShellClassPropertyExtension/Fixture/existing_shell_task.php

@@ -2,6 +2,7 @@
 
 declare(strict_types = 1);
 
+use PHPStanCakePHP2\Tests\Source\Console\Command\BasicShell;
 use function PHPStan\Testing\assertType;
 
 /** @var BasicShell $shell */

tests/ClassPropertyExtension/ShellClassPropertyExtension/Fixture/invalid_shell_property.php

@@ -2,6 +2,7 @@
 
 declare(strict_types = 1);
 
+use PHPStanCakePHP2\Tests\Source\Console\Command\BasicShell;
 use function PHPStan\Testing\assertType;
 
 /** @var BasicShell $shell */

tests/ReturnTypeExtension/ClassRegistryInitExtension/Fixture/basic_model_class_const_fetch.php

@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use PHPStanCakePHP2\Tests\Source\Model\BasicModel;
 use function PHPStan\Testing\assertType;
 
 $class = ClassRegistry::init(BasicModel::class);

tests/Feature/classes/Config/Schema/app.php → tests/Source/Config/Schema/app.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace PHPStanCakePHP2\Tests\Source\Config\Schema;
+use CakeSchema;
+
 class AppSchema extends CakeSchema
 {
     /**

tests/Source/Console/Command/BasicShell.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace PHPStanCakePHP2\Tests\Source\Console\Command;
+use Shell;
+
+class BasicShell extends Shell
+{
+}

tests/Source/Console/Command/Task/BasicTask.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace PHPStanCakePHP2\Tests\Source\Console\Command\Task;
+use Shell;
+
+class BasicTask extends Shell
+{
+}

tests/Feature/classes/Controller/BaseController.php → tests/Source/Controller/BaseController.php

@@ -2,6 +2,9 @@
 
 declare(strict_types=1);
 
+namespace PHPStanCakePHP2\Tests\Source\Controller;
+use Controller;
+
 class BaseController extends Controller
 {
     /**

tests/Feature/classes/Controller/BasicController.php → tests/Source/Controller/BasicController.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace PHPStanCakePHP2\Tests\Source\Controller;
+use Controller;
+
 class BasicController extends Controller
 {
     /**

tests/Feature/classes/Controller/Component/BasicComponent.php → tests/Source/Controller/Component/BasicComponent.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace PHPStanCakePHP2\Tests\Source\Controller\Component;
+use Component;
+
 class BasicComponent extends Component
 {
     /**

tests/Feature/classes/Controller/Component/SameAsModelComponent.php → tests/Source/Controller/Component/SameAsModelComponent.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace PHPStanCakePHP2\Tests\Source\Controller\Component;
+use Component;
+
 class SameAsModelComponent extends Component
 {
     public function sameMethod(): int

tests/Source/Controller/Component/SecondComponent.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace PHPStanCakePHP2\Tests\Source\Controller\Component;
+use Component;
+
+class SecondComponent extends Component
+{
+}

tests/Feature/classes/Controller/SameAsModelController.php → tests/Source/Controller/SameAsModelController.php

@@ -1,5 +1,9 @@
 <?php
 
+namespace PHPStanCakePHP2\Tests\Source\Controller;
+
+use PHPStanCakePHP2\Tests\Source\Controller\Component\BasicComponent;
+
 class SameAsModelController extends BaseController
 {
     /**

tests/Source/Model/BasicModel.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace PHPStanCakePHP2\Tests\Source\Model;
+use Model;
+
+class BasicModel extends Model
+{
+}

tests/Feature/classes/Model/Behavior/BasicBehavior.php → tests/Source/Model/Behavior/BasicBehavior.php

@@ -1,5 +1,9 @@
 <?php
 
+namespace PHPStanCakePHP2\Tests\Source\Model\Behavior;
+use Model;
+use ModelBehavior;
+
 class BasicBehavior extends ModelBehavior
 {
     public function behaviorMethod(Model $model, string $string): string

tests/Feature/classes/Model/SameAsModel.php → tests/Source/Model/SameAsModel.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace PHPStanCakePHP2\Tests\Source\Model;
+use Model;
+
 class SameAsModel extends Model
 {
     public function sameMethod(): string

tests/Source/Model/SecondModel.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace PHPStanCakePHP2\Tests\Source\Model;
+use Model;
+
+class SecondModel extends Model
+{
+}

tests/config/phpstan.neon

@@ -1,10 +1,10 @@
 parameters:
     behaviorPaths:
-        - tests/Feature/classes/Model/Behavior/*.php
+        - tests/Source/Model/Behavior/*.php
 
     # @todo add exists validatoin to avoid misspaths
     schemaPaths:
-        - tests/Feature/classes/Config/Schema/*.php
+        - tests/Source/Config/Schema/*.php
 
 includes:
     - ../../config/extension.neon