Provides backward compatibility for the CommandTask::subCommands() me…

…thod
cakephp · Dec 3, 2015 · 58ca430 · 58ca430
1 parent 82e315a
commit 58ca430
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Shell/Task/CommandTask.php b/src/Shell/Task/CommandTask.php
@@ -186,7 +186,7 @@ public function getShell($commandName)
             $pluginDot = '';
         }
 
-        if (!in_array($commandName, $this->commands())) {
+        if (!in_array($commandName, $this->commands()) && (empty($pluginDot) && !in_array($name, $this->commands()))) {
             return false;
         }
 

diff --git a/tests/TestCase/Shell/CompletionShellTest.php b/tests/TestCase/Shell/CompletionShellTest.php
@@ -209,6 +209,20 @@ public function testSubCommandsPlugin()
         $this->assertTextEquals($expected, $output);
     }
 
+    /**
+     * test that using the dot notation when not mandatory works to provide backward compatibility
+     *
+     * @return void
+     */
+    public function testSubCommandsPluginDotNotationBackwardCompatibility()
+    {
+        $this->Shell->runCommand(['subcommands', 'TestPluginTwo.welcome']);
+        $output = $this->out->output;
+
+        $expected = "say_hello\n";
+        $this->assertTextEquals($expected, $output);
+    }
+
     /**
      * test that subCommands with an existing plugin command returns the proper sub commands
      *