fixup! slip

deprecated-packages · Feb 18, 2024 · 706460c · 706460c
1 parent 86b25d8
commit 706460c
Show file tree

Hide file tree

Showing 34 changed files with 83 additions and 19 deletions.
diff --git a/...ropertyExtension/ClassComponentPropertyExtension/Fixture/existing_component_component.php b/...ropertyExtension/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 */

diff --git a/...opertyExtension/ClassComponentPropertyExtension/Fixture/existing_controller_component.php b/...opertyExtension/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 */

diff --git a/...mponentPropertyExtension/Fixture/existing_controller_component_from_parent_controller.php b/...mponentPropertyExtension/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 */

diff --git a/...ropertyExtension/Fixture/existing_controller_component_with_same_method_name_as_model.php b/...ropertyExtension/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 */

diff --git a/...sPropertyExtension/ClassComponentPropertyExtension/Fixture/invalid_component_property.php b/...sPropertyExtension/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 */

diff --git a/tests/ClassPropertyExtension/ClassModelsPropertyExtension/Fixture/core_model_behavior.php b/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 */

diff --git a/tests/ClassPropertyExtension/ClassModelsPropertyExtension/Fixture/custom_model_behavior.php b/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 */

diff --git a/...ClassPropertyExtension/ClassModelsPropertyExtension/Fixture/existing_controller_model.php b/...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 */

diff --git a/tests/ClassPropertyExtension/ClassModelsPropertyExtension/Fixture/existing_model_model.php b/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 */

diff --git a/...assPropertyExtension/ClassModelsPropertyExtension/Fixture/invalid_controller_property.php b/...assPropertyExtension/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 */

diff --git a/tests/ClassPropertyExtension/ClassModelsPropertyExtension/Fixture/invalid_model_property.php b/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 */

diff --git a/tests/ClassPropertyExtension/ShellClassPropertyExtension/Fixture/existing_shell_model.php b/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) {

diff --git a/tests/ClassPropertyExtension/ShellClassPropertyExtension/Fixture/existing_shell_task.php b/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 */

diff --git a/tests/ClassPropertyExtension/ShellClassPropertyExtension/Fixture/invalid_shell_property.php b/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 */

diff --git a/tests/Feature/classes/Console/Command/BasicShell.php b/tests/Feature/classes/Console/Command/BasicShell.php
diff --git a/tests/Feature/classes/Console/Command/Task/BasicTask.php b/tests/Feature/classes/Console/Command/Task/BasicTask.php
diff --git a/tests/Feature/classes/Controller/Component/SecondComponent.php b/tests/Feature/classes/Controller/Component/SecondComponent.php
diff --git a/tests/Feature/classes/Model/BasicModel.php b/tests/Feature/classes/Model/BasicModel.php
diff --git a/tests/Feature/classes/Model/SecondModel.php b/tests/Feature/classes/Model/SecondModel.php
diff --git a/.../ReturnTypeExtension/ClassRegistryInitExtension/Fixture/basic_model_class_const_fetch.php b/.../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);

diff --git a/tests/Feature/classes/Config/Schema/app.php → tests/Source/Config/Schema/app.php b/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
 {
     /**

diff --git a/tests/Source/Console/Command/BasicShell.php b/tests/Source/Console/Command/BasicShell.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace PHPStanCakePHP2\Tests\Source\Console\Command;
+use Shell;
+
+class BasicShell extends Shell
+{
+}
diff --git a/tests/Source/Console/Command/Task/BasicTask.php b/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
+{
+}
diff --git a/...ure/classes/Controller/BaseController.php → tests/Source/Controller/BaseController.php b/...ure/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
 {
     /**

diff --git a/...re/classes/Controller/BasicController.php → tests/Source/Controller/BasicController.php b/...re/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
 {
     /**

diff --git a/...s/Controller/Component/BasicComponent.php → ...e/Controller/Component/BasicComponent.php b/...s/Controller/Component/BasicComponent.php → ...e/Controller/Component/BasicComponent.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace PHPStanCakePHP2\Tests\Source\Controller\Component;
+use Component;
+
 class BasicComponent extends Component
 {
     /**

diff --git a/...roller/Component/SameAsModelComponent.php → ...roller/Component/SameAsModelComponent.php b/...roller/Component/SameAsModelComponent.php → ...roller/Component/SameAsModelComponent.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace PHPStanCakePHP2\Tests\Source\Controller\Component;
+use Component;
+
 class SameAsModelComponent extends Component
 {
     public function sameMethod(): int

diff --git a/tests/Source/Controller/Component/SecondComponent.php b/tests/Source/Controller/Component/SecondComponent.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace PHPStanCakePHP2\Tests\Source\Controller\Component;
+use Component;
+
+class SecondComponent extends Component
+{
+}
diff --git a/...sses/Controller/SameAsModelController.php → ...urce/Controller/SameAsModelController.php b/...sses/Controller/SameAsModelController.php → ...urce/Controller/SameAsModelController.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace PHPStanCakePHP2\Tests\Source\Controller;
+
+use PHPStanCakePHP2\Tests\Source\Controller\Component\BasicComponent;
+
 class SameAsModelController extends BaseController
 {
     /**

diff --git a/tests/Source/Model/BasicModel.php b/tests/Source/Model/BasicModel.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace PHPStanCakePHP2\Tests\Source\Model;
+use Model;
+
+class BasicModel extends Model
+{
+}
diff --git a/.../classes/Model/Behavior/BasicBehavior.php → ...s/Source/Model/Behavior/BasicBehavior.php b/.../classes/Model/Behavior/BasicBehavior.php → ...s/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

diff --git a/tests/Feature/classes/Model/SameAsModel.php → tests/Source/Model/SameAsModel.php b/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

diff --git a/tests/Source/Model/SecondModel.php b/tests/Source/Model/SecondModel.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace PHPStanCakePHP2\Tests\Source\Model;
+use Model;
+
+class SecondModel extends Model
+{
+}
diff --git a/tests/config/phpstan.neon b/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