more cleanup

Author: LordSimal

composer.json

@@ -11,6 +11,7 @@
         }
     ],
     "minimum-stability": "dev",
+    "prefer-stable": true,
     "require": {
         "php": ">=8.1.0",
         "phpstan/phpstan": "^1.0",

extension.neon

@@ -66,10 +66,6 @@ services:
 		tags:
 			- phpstan.broker.dynamicMethodReturnTypeExtension
 	-
-		class: CakeDC\PHPStan\Type\ShellHelperLoadDynamicReturnTypeExtension
-		tags:
-			- phpstan.broker.dynamicMethodReturnTypeExtension
-	-
-		factory: CakeDC\PHPStan\Type\ShellHelperLoadDynamicReturnTypeExtension(Cake\Console\ConsoleIo)
+		class: CakeDC\PHPStan\Type\ConsoleHelperLoadDynamicReturnTypeExtension
 		tags:
 			- phpstan.broker.dynamicMethodReturnTypeExtension

src/Traits/BaseCakeRegistryReturnTrait.php

@@ -19,6 +19,8 @@
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 
+use function Cake\Core\pluginSplit;
+
 trait BaseCakeRegistryReturnTrait
 {
     /**
@@ -88,6 +90,6 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
      */
     protected function pluginSplit($baseName): array
     {
-        return \pluginSplit($baseName);
+        return pluginSplit($baseName);
     }
 }

…HelperLoadDynamicReturnTypeExtension.php …HelperLoadDynamicReturnTypeExtension.phpsrc/Type/ShellHelperLoadDynamicReturnTypeExtension.php renamed to src/Type/ConsoleHelperLoadDynamicReturnTypeExtension.php src/Type/ShellHelperLoadDynamicReturnTypeExtension.php renamed to src/Type/ConsoleHelperLoadDynamicReturnTypeExtension.php

@@ -12,16 +12,16 @@
 
 namespace CakeDC\PHPStan\Type;
 
+use Cake\Console\ConsoleIo;
+use Cake\Controller\Component;
 use CakeDC\PHPStan\Traits\BaseCakeRegistryReturnTrait;
-use Cake\Console\Helper;
-use Cake\Console\Shell;
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\Type;
 
-class ShellHelperLoadDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
+class ConsoleHelperLoadDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
     use BaseCakeRegistryReturnTrait;
 
@@ -37,13 +37,11 @@ class ShellHelperLoadDynamicReturnTypeExtension implements DynamicMethodReturnTy
     /**
      * TableLocatorDynamicReturnTypeExtension constructor.
      *
-     * @param string|null $className The target className.
-     * @param string|null $methodName The dynamic method to handle.
      */
-    public function __construct(?string $className = null, ?string $methodName = null)
+    public function __construct()
     {
-        $this->className = $className ?? Shell::class;
-        $this->methodName = $methodName ?? 'helper';
+        $this->className = ConsoleIo::class;
+        $this->methodName = 'helper';
     }
 
     /**
@@ -58,25 +56,9 @@ public function getTypeFromMethodCall(
         MethodCall $methodCall,
         Scope $scope
     ): Type {
-        $defaultClass = Helper::class;
-        $namespaceFormat = [
-            '%s\\Command\Helper\\%sHelper',
-            '%s\\Shell\Helper\\%sHelper'
-        ];
+        $defaultClass = Component::class;
+        $namespaceFormat = '%s\\Command\Helper\\%sHelper';
 
         return $this->getRegistryReturnType($methodReflection, $methodCall, $scope, $defaultClass, $namespaceFormat);
     }
-
-    /**
-     * @param string $baseName
-     * @return array
-     * @psalm-return array{string|null, string}
-     */
-    protected function pluginSplit($baseName): array
-    {
-        list($plugin, $name) = pluginSplit($baseName);
-        $name = \ucfirst($name);
-
-        return [$plugin, $name];
-    }
 }

tests/TestCase/Type/ShellHelperLoadDynamicReturnTypeExtensionTest.php

@@ -10,7 +10,7 @@
  *  @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-namespace App\Shell\Helper;
+namespace App\Command\Helper;
 
 use Cake\Console\Helper;
 
@@ -24,16 +24,16 @@ class BazBazHelper extends Helper
      */
     public function output(array $args): void
     {
-        $this->_io->success('Sample text');
+        $this->_io->success('Sample heading');
     }
 
     /**
-     * Sample foo method.
+     * Custom method
      *
      * @return string
      */
     public function foo(): string
     {
-        return 'sample text';
+        return 'Invoked!';
     }
 }

…s/test_app/Shell/Helper/BazBazHelper.php …test_app/Command/Helper/BazBazHelper.phptests/test_app/Shell/Helper/BazBazHelper.php renamed to tests/test_app/Command/Helper/BazBazHelper.php tests/test_app/Shell/Helper/BazBazHelper.php renamed to tests/test_app/Command/Helper/BazBazHelper.php

@@ -23,10 +23,7 @@ class MyTestLoadCommand extends Command
      */
     public function execute(Arguments $args, ConsoleIo $io)
     {
-        $article = $this->loadModel('VeryCustomize00009Articles')
-            ->newSample();
-
-        $io->out(strval($article->get('title')));
+        $this->fetchTable('VeryCustomize00009Articles')->newSample();
 
         $io->helper('progress')->increment(1);
         $io->out($io->helper('BazBaz')->foo());

tests/test_app/Command/MyTestLoadCommand.php

@@ -24,8 +24,7 @@ class MyTestLoadComponentController extends Controller
      */
     public function myTest()
     {
-        $model = TableRegistry::getTableLocator()->get('MyCustomSources');
-        $this->loadComponent('Paginator')->paginate($model);
+        $this->loadComponent('Flash')->success('Something');
     }
 
     /**
@@ -36,7 +35,7 @@ public function myTest()
     public function lately()
     {
         //getLatestOne is defined at HelloWorld101010ArticlesTable
-        $latest = $this->loadModel('CakeDC/MyPlugin.HelloWorld101010Articles')
+        $latest = $this->fetchTable('CakeDC/MyPlugin.HelloWorld101010Articles')
             ->getLatestOne();
         $this->set('latest', $latest);
     }

tests/test_app/Controller/MyTestLoadComponentController.php

@@ -23,7 +23,7 @@ class MyTestLoadMailer extends Mailer
      */
     protected function sampleLoading()
     {
-        $article = $this->loadModel('VeryCustomize00009Articles')
+        $article = $this->fetchTable('VeryCustomize00009Articles')
             ->newSample();
         $this->viewBuilder()->setVar('article', $article);
     }

tests/test_app/Mailer/MyTestLoadMailer.php

@@ -28,6 +28,7 @@ public function process()
             ->where(['created <=' => new \DateTime('-30 days')])
             ->all();
 
+        /** @var \Cake\ORM\Entity $record */
         foreach ($records as $record) {
             $Table->fixArticle($record);
         }