Merge pull request #848 from artemii-karkusha/issue_698

698: Add "module" prefix to module name in composer.json

Author: bohdan-harniuk

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModuleDialog.java

@@ -53,6 +53,8 @@ public class NewModuleDialog extends AbstractDialog implements ListSelectionList
     private static final String MODULE_VERSION = "module version";
     private static final String MODULE_NAME = "module name";
     private static final String PACKAGE_NAME = "package name";
+    private static final String MAGENTO_BEFORE_DECLARATIVE_SCHEMA_VERSION = "2.2.11";
+    private static final String DEFAULT_MODULE_PREFIX = "module";
 
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
             message = {NotEmptyRule.MESSAGE, PACKAGE_NAME})
@@ -106,7 +108,6 @@ public class NewModuleDialog extends AbstractDialog implements ListSelectionList
     private String detectedPackageName;
     private final ModuleIndex moduleIndex;
     private final CamelCaseToHyphen camelCaseToHyphen;
-    private static final String MAGENTO_BEFORE_DECLARATIVE_SCHEMA_VERSION = "2.2.11";
 
     /**
      * Constructor.
@@ -245,6 +246,11 @@ public String getPackageName() {
         return this.packageName.getText().trim();
     }
 
+    /**
+     * Getter for Module Name.
+     *
+     * @return String
+     */
     public String getModuleName() {
         return this.moduleName.getText().trim();
     }
@@ -332,6 +338,7 @@ public static void open(
     private String getComposerPackageName() {
         return camelCaseToHyphen.convert(getPackageName())
                 .concat("/")
+                .concat(DEFAULT_MODULE_PREFIX + "-")
                 .concat(camelCaseToHyphen.convert(getModuleName()));
     }
 

testData/actions/generation/generator/ModuleComposerJsonGenerator/generateFileInRoot/composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "test/module",
+  "name": "test/module-test",
   "version": "1.0.0-dev",
   "description": "test-description",
   "type": "magento2-module",
@@ -17,7 +17,7 @@
       "registration.php"
     ],
     "psr-4": {
-      "TestWithDependencies\\Module\\": ""
+      "TestWithDependencies\\Test\\": ""
     }
   }
 }

testData/actions/generation/generator/ModuleComposerJsonGenerator/generateModuleFile/composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "test/module",
+  "name": "test/module-test",
   "version": "1.0.0-dev",
   "description": "test-description",
   "type": "magento2-module",
@@ -17,7 +17,7 @@
       "registration.php"
     ],
     "psr-4": {
-      "TestWithDependencies\\Module\\": ""
+      "TestWithDependencies\\Test\\": ""
     }
   }
 }

testData/actions/generation/generator/ModuleComposerJsonGenerator/generateModuleFileWithoutDependencies/composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "test/module",
+  "name": "test/module-test",
   "version": "1.0.0-dev",
   "description": "test-description",
   "type": "magento2-module",
@@ -15,7 +15,7 @@
       "registration.php"
     ],
     "psr-4": {
-      "TestWithoutDependencies\\Module\\": ""
+      "TestWithoutDependencies\\Test\\": ""
     }
   }
 }

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

@@ -25,7 +25,7 @@ public void testGenerateModuleFile() {
         final PsiDirectory projectDir = getProjectDirectory();
 
         final String expectedDirectory =
-                projectDir.getVirtualFile().getPath() + "/TestWithDependencies/Module";
+                projectDir.getVirtualFile().getPath() + "/TestWithDependencies/Test";
         final PsiFile composerJson = generateComposerJson(
                 true,
                 projectDir,
@@ -65,7 +65,7 @@ public void testGenerateModuleFileWithoutDependencies() {
         final PsiFile expectedFile = myFixture.configureByFile(filePath);
         final PsiDirectory projectDir = getProjectDirectory();
         final String expectedDirectory = projectDir.getVirtualFile().getPath()
-                + "/TestWithoutDependencies/Module";
+                + "/TestWithoutDependencies/Test";
         final PsiFile composerJson = generateComposerJson(
                 true,
                 projectDir,
@@ -102,10 +102,10 @@ private PsiFile generateComposerJson(
         );
         final ModuleComposerJsonData composerJsonData = new ModuleComposerJsonData(
                 packageName,
-                "Module",
+                "Test",
                 projectDir,
                 "test-description",
-                "test/module",
+                "test/module-test",
                 "1.0.0-dev",
                 licenses,
                 dependencies,