Merge pull request #268 from coderimus/262-fix-command-namespace

262: Change the CLI command namespace

Author: Vitaliy

build.gradle

@@ -20,6 +20,8 @@ apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'
 apply plugin: 'groovy'
 
+gradle.startParameter.showStacktrace = org.gradle.api.logging.configuration.ShowStacktrace.ALWAYS_FULL
+
 def phpPluginVersion = System.getProperty("phpPluginVersion", "201.7223.91")
 def ideaVersion = System.getProperty("ideaVersion", "2020.1.1")
 def javaVersion = 1.8

resources/magento2/common.properties

@@ -44,7 +44,7 @@ common.cli.create.new.cli.command.title=Create a new Magento 2 CLI Command
 common.cli.generate.error=New CLI Command Generation Error
 common.cli.class.title=CLI Command Class
 common.validationErrorTitle=Validation Error
-common.defaultConsoleDirectory=Console
+common.defaultConsoleDirectory=Console/Command
 common.cronGroup.description.scheduleGenerateEvery=Frequency (in minutes) that schedules are written to the cron_schedule table.
 common.cronGroup.description.scheduleAheadFor=Time (in minutes) in advance that schedules are written to the cron_schedule table.
 common.cronGroup.description.scheduleLifetime=Window of time (in minutes) that cron job must start or will be considered missed ("too late" to run).

testData/actions/generation/generator/CLICommandClassGenerator/generateCLICommandClass/TestCLICommandPHPClass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Foo\Bar\Console;
+namespace Foo\Bar\Console\Command;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;

testData/actions/generation/generator/CLICommandDiXmlGenerator/addingTwoCLICommandToDiXml/di.xml

@@ -4,8 +4,10 @@
     <type name="Magento\Framework\Console\CommandListInterface">
         <arguments>
             <argument name="commands" xsi:type="array">
-                <item name="foo_bar_test_command" xsi:type="object">Foo\Bar\Console\TestCommand</item>
-                <item name="foo_bar_one_more_c_l_i_command" xsi:type="object">Foo\Bar\Console\OneMoreCLICommand</item>
+                <item name="foo_bar_test_command" xsi:type="object">Foo\Bar\Console\Command\TestCommand</item>
+                <item name="foo_bar_one_more_c_l_i_command" xsi:type="object">
+                    Foo\Bar\Console\Command\OneMoreCLICommand
+                </item>
             </argument>
         </arguments>
     </type>

testData/actions/generation/generator/CLICommandDiXmlGenerator/initializeCLICommand/di.xml

@@ -4,7 +4,7 @@
     <type name="Magento\Framework\Console\CommandListInterface">
         <arguments>
             <argument name="commands" xsi:type="array">
-                <item name="foo_bar_test_command" xsi:type="object">Foo\Bar\Console\TestCommand</item>
+                <item name="foo_bar_test_command" xsi:type="object">Foo\Bar\Console\Command\TestCommand</item>
             </argument>
         </arguments>
     </type>

tests/com/magento/idea/magento2plugin/actions/generation/generator/CLICommandClassGeneratorTest.java

@@ -11,10 +11,10 @@
 
 public class CLICommandClassGeneratorTest extends BaseGeneratorTestCase {
     private static final String CLASS_NAME = "TestCLICommandPHPClass";
-    private static final String PARENT_DIRECTORY = "Console";
+    private static final String PARENT_DIRECTORY = "Console/Command";
     private static final String COMMAND_NAME = "bar:test-command";
     private static final String DESCRIPTION = "This is the test command";
-    private static final String NAMESPACE = "Foo\\Bar\\Console";
+    private static final String NAMESPACE = "Foo\\Bar\\Console\\Command";
     private static final String MODULE_NAME = "Foo_Bar";
 
     /**
@@ -38,7 +38,7 @@ public void testGenerateCLICommandClass() {
 
         assertGeneratedFileIsCorrect(
                 expectedFile,
-                "src/app/code/Foo/Bar/Console",
+                "src/app/code/Foo/Bar/Console/Command",
                 cliCommandClass
         );
     }

tests/com/magento/idea/magento2plugin/actions/generation/generator/CLICommandDiXmlGeneratorTest.java

@@ -22,7 +22,7 @@ public class CLICommandDiXmlGeneratorTest extends BaseGeneratorTestCase {
     private static final String CLASS_NAME = "TestCommand";
     private static final String SECOND_CLASS_NAME = "OneMoreCLICommand";
     private static final String MODULE_NAME = "Foo_Bar";
-    private static final String PARENT_DIR = "Console";
+    private static final String PARENT_DIR = "Console\\Command";
     private static final String MODULE_DIR = "src/app/code/Foo/Bar/";
 
     /**