Browse Source

Move console helpers in Shell/Helper to Command/Helper.

ADmad 4 years ago
parent
commit
7cfbc58f3f

+ 1 - 1
src/Shell/Helper/ProgressHelper.php

@@ -14,7 +14,7 @@ declare(strict_types=1);
  * @since         3.1.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Shell\Helper;
+namespace Cake\Command\Helper;
 
 use Cake\Console\Helper;
 use RuntimeException;

+ 1 - 1
src/Shell/Helper/TableHelper.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
  * @since         3.1.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Shell\Helper;
+namespace Cake\Command\Helper;
 
 use Cake\Console\Helper;
 use UnexpectedValueException;

+ 1 - 1
src/Command/I18nExtractCommand.php

@@ -404,7 +404,7 @@ class I18nExtractCommand extends Command
      */
     protected function _extractTokens(Arguments $args, ConsoleIo $io): void
     {
-        /** @var \Cake\Shell\Helper\ProgressHelper $progress */
+        /** @var \Cake\Command\Helper\ProgressHelper $progress */
         $progress = $io->helper('progress');
         $progress->init(['total' => count($this->_files)]);
         $isVerbose = $args->getOption('verbose');

+ 1 - 6
src/Console/HelperRegistry.php

@@ -60,12 +60,7 @@ class HelperRegistry extends ObjectRegistry
      */
     protected function _resolveClassName(string $class): ?string
     {
-        $name = App::className($class, 'Command/Helper', 'Helper');
-        if ($name === null) {
-            return App::className($class, 'Shell/Helper', 'Helper');
-        }
-
-        return $name;
+        return App::className($class, 'Command/Helper', 'Helper');
     }
 
     /**

+ 2 - 2
tests/TestCase/Console/HelperRegistryTest.php

@@ -18,8 +18,8 @@ namespace Cake\Test\TestCase\Console;
 use Cake\Console\HelperRegistry;
 use Cake\TestSuite\TestCase;
 use TestApp\Command\Helper\CommandHelper;
-use TestApp\Shell\Helper\SimpleHelper;
-use TestPlugin\Shell\Helper\ExampleHelper;
+use TestApp\Command\Helper\SimpleHelper;
+use TestPlugin\Command\Helper\ExampleHelper;
 
 /**
  * HelperRegistryTest

+ 1 - 1
tests/test_app/Plugin/TestPlugin/src/Shell/Helper/ExampleHelper.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace TestPlugin\Shell\Helper;
+namespace TestPlugin\Command\Helper;
 
 use Cake\Console\Helper;
 

+ 1 - 1
tests/test_app/TestApp/Shell/Helper/SimpleHelper.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace TestApp\Shell\Helper;
+namespace TestApp\Command\Helper;
 
 use Cake\Console\Helper;