[#267]_fix setup_version

Author: iamdylanngo

resources/fileTemplates/internal/Magento Module Xml.xml.ft

@@ -1,12 +1,24 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     #if (${SEQUENCES})
-        <module name="${PACKAGE}_${MODULE_NAME}" setup_version="${SETUP_VERSION}">
-            <sequence>
-                ${SEQUENCES}
-            </sequence>
-        </module>
+        #if (${SETUP_VERSION})
+            <module name="${PACKAGE}_${MODULE_NAME}" setup_version="${SETUP_VERSION}">
+                <sequence>
+                    ${SEQUENCES}
+                </sequence>
+            </module>
+        #else
+            <module name="${PACKAGE}_${MODULE_NAME}">
+                <sequence>
+                    ${SEQUENCES}
+                </sequence>
+            </module>
+        #end
     #else
-        <module name="${PACKAGE}_${MODULE_NAME}" setup_version="${SETUP_VERSION}"/>
+        #if (${SETUP_VERSION})
+            <module name="${PACKAGE}_${MODULE_NAME}" setup_version="${SETUP_VERSION}"/>
+        #else
+            <module name="${PACKAGE}_${MODULE_NAME}"/>
+        #end
     #end
 </config>

src/com/magento/idea/magento2plugin/actions/generation/data/ModuleXmlData.java

@@ -10,7 +10,7 @@
 public class ModuleXmlData {
     private final String packageName;
     private final String moduleName;
-    private final String moduleVersion;
+    private final String setupVersion;
     private final PsiDirectory baseDir;
     private final boolean createModuleDirs;
 
@@ -19,20 +19,20 @@ public class ModuleXmlData {
      *
      * @param packageName Package name
      * @param moduleName Module name
-     * @param moduleVersion Module version
+     * @param setupVersion Setup version
      * @param baseDir Base directory
      * @param createModuleDirs Create module Dirs
      */
     public ModuleXmlData(
             final String packageName,
             final String moduleName,
-            final String moduleVersion,
+            final String setupVersion,
             final PsiDirectory baseDir,
             final boolean createModuleDirs
     ) {
         this.packageName = packageName;
         this.moduleName = moduleName;
-        this.moduleVersion = moduleVersion;
+        this.setupVersion = setupVersion;
         this.baseDir = baseDir;
         this.createModuleDirs = createModuleDirs;
     }
@@ -49,8 +49,8 @@ public PsiDirectory getBaseDir() {
         return this.baseDir;
     }
 
-    public String getModuleVersion() {
-        return this.moduleVersion;
+    public String getSetupVersion() {
+        return this.setupVersion;
     }
 
     public boolean getCreateModuleDirs() {

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

@@ -22,6 +22,7 @@
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.project.Settings;
 import com.magento.idea.magento2plugin.util.CamelCaseToHyphen;
+import com.magento.idea.magento2plugin.util.magento.MagentoVersion;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -72,6 +73,8 @@ public class NewModuleDialog extends AbstractDialog implements ListSelectionList
     private JLabel moduleDescriptionLabel;//NOPMD
     private JLabel moduleNameLabel;//NOPMD
 
+    private static final String MAGENTO_OLD_VERSION = "2.2.11";
+
     /**
      * Constructor.
      *
@@ -187,7 +190,7 @@ private void generateModuleXml() {
         new ModuleXmlGenerator(new ModuleXmlData(
                 getPackageName(),
                 getModuleName(),
-                getModuleVersion(),
+                getSetupVersion(),
                 getBaseDir(),
                 true
         ), project).generate(NewModuleAction.actionName, true);
@@ -225,10 +228,39 @@ public String getModuleDescription() {
         return this.moduleDescription.getText().trim();
     }
 
+    /**
+     * get Module Version.
+     *
+     * @return string
+     */
     public String getModuleVersion() {
         return this.moduleVersion.getText().trim();
     }
 
+    /**
+     * get Module Version.
+     *
+     * @return string|null
+     */
+    public String getSetupVersion() {
+        String setupVersion = null;
+        final String magentoVersion = getMagentoVersion();
+
+        if (!MagentoVersion.compareMagentoVersion(magentoVersion, MAGENTO_OLD_VERSION)) {
+            setupVersion = this.moduleVersion.getText().trim();
+        }
+        return setupVersion;
+    }
+
+    /**
+     * get Magento Version.
+     *
+     * @return string
+     */
+    public String getMagentoVersion() {
+        return this.getSettings().magentoVersion;
+    }
+
     /**
      * Getter for module license.
      *
@@ -328,4 +360,14 @@ public void valueChanged(final ListSelectionEvent listSelectionEvent) {
         handleModuleCustomLicenseInputVisibility();
         handleModuleSelectedDependencies();
     }
+
+    /**
+     * get setting.
+     *
+     * @return Settings
+     */
+    public Settings getSettings() {
+        return Settings.getInstance(project);
+    }
+
 }

src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGenerator.java

@@ -67,9 +67,12 @@ public PsiFile generate(final String actionName) {
         );
     }
 
+    @Override
     protected void fillAttributes(final Properties attributes) {
         attributes.setProperty("PACKAGE", moduleXmlData.getPackageName());
         attributes.setProperty("MODULE_NAME", moduleXmlData.getModuleName());
-        attributes.setProperty("SETUP_VERSION", moduleXmlData.getModuleVersion());
+        if (moduleXmlData.getSetupVersion() != null) {
+            attributes.setProperty("SETUP_VERSION", moduleXmlData.getSetupVersion());
+        }
     }
 }

src/com/magento/idea/magento2plugin/util/magento/MagentoVersion.java

@@ -70,4 +70,26 @@ public static String get(final Project project, final String magentoPath) {
     private static String getFilePath(final String magentoPath) {
         return magentoPath + File.separator + ComposerJson.FILE_NAME;
     }
+
+    /**
+     * compare Magento Version.
+     *
+     * @param str1 String
+     * @param str2 String
+     * @return boolean
+     */
+    public static boolean compareMagentoVersion(final String str1, final String str2) {
+        if (str1.equals(str2)) return true;
+
+        final String[] str1s = str1.split("\\.");
+        final String[] str2s = str2.split("\\.");
+        for (int i = 0; i < 2; i++) {
+            final Integer value1 = Integer.parseInt(str1s[i]);
+            final Integer value2 = Integer.parseInt(str2s[i]);
+            if (value1 > value2) {
+                return true;
+            }
+        }
+        return false;
+    }
 }