Skip to content

Commit 39d0579

Browse files
committed
[#267]_Module version in module.xml is missing when creating new module
1 parent 826974d commit 39d0579

File tree

8 files changed

+20
-8
lines changed

8 files changed

+20
-8
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0"?>
22
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
33
#if (${SEQUENCES})
4-
<module name="${PACKAGE}_${MODULE_NAME}">
4+
<module name="${PACKAGE}_${MODULE_NAME}" setup_version="${SETUP_VERSION}">
55
<sequence>
66
${SEQUENCES}
77
</sequence>
88
</module>
99
#else
10-
<module name="${PACKAGE}_${MODULE_NAME}" />
10+
<module name="${PACKAGE}_${MODULE_NAME}" setup_version="${SETUP_VERSION}"/>
1111
#end
1212
</config>

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,20 @@
99
public class ModuleXmlData {
1010
private final String packageName;
1111
private final String moduleName;
12+
private final String moduleVersion;
1213
private PsiDirectory baseDir;
1314
private boolean createModuleDirs;
1415

1516
public ModuleXmlData(
16-
String packageName,
17-
String moduleName,
18-
PsiDirectory baseDir,
19-
boolean createModuleDirs
17+
String packageName,
18+
String moduleName,
19+
String moduleVersion,
20+
PsiDirectory baseDir,
21+
boolean createModuleDirs
2022
) {
2123
this.packageName = packageName;
2224
this.moduleName = moduleName;
25+
this.moduleVersion = moduleVersion;
2326
this.baseDir = baseDir;
2427
this.createModuleDirs = createModuleDirs;
2528
}
@@ -36,6 +39,10 @@ public PsiDirectory getBaseDir() {
3639
return this.baseDir;
3740
}
3841

42+
public String getModuleVersion() {
43+
return this.moduleVersion;
44+
}
45+
3946
public boolean getCreateModuleDirs() {
4047
return this.createModuleDirs;
4148
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ private void generateModuleXml() {
187187
new ModuleXmlGenerator(new ModuleXmlData(
188188
getPackageName(),
189189
getModuleName(),
190+
getModuleVersion(),
190191
getBaseDir(),
191192
true
192193
), project).generate(NewModuleAction.actionName, true);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,6 @@ public PsiFile generate(final String actionName) {
7070
protected void fillAttributes(final Properties attributes) {
7171
attributes.setProperty("PACKAGE", moduleXmlData.getPackageName());
7272
attributes.setProperty("MODULE_NAME", moduleXmlData.getModuleName());
73+
attributes.setProperty("SETUP_VERSION", moduleXmlData.getModuleVersion());
7374
}
7475
}

src/com/magento/idea/magento2plugin/generation/php/MagentoModuleGenerator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ private void generateModuleXml(@NotNull Project project, @NotNull PsiDirectory b
106106
ModuleXmlData moduleXmlData = new ModuleXmlData(
107107
settings.getPackageName(),
108108
settings.getModuleName(),
109+
settings.getModuleVersion(),
109110
baseDir,
110111
false
111112
);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
22
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
4-
<module name="Test_Module"/>
4+
<module name="Test_Module" setup_version="1.0.0"/>
55
</config>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
22
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
4-
<module name="Test_Module"/>
4+
<module name="Test_Module" setup_version="1.0.0"/>
55
</config>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public void testGenerateModuleFile() {
2727
final ModuleXmlData moduleXmlData = new ModuleXmlData(
2828
"Test",
2929
"Module",
30+
"1.0.0",
3031
projectDir,
3132
true
3233
);
@@ -57,6 +58,7 @@ public void testGenerateFileInRoot() {
5758
final ModuleXmlData moduleXmlData = new ModuleXmlData(
5859
"Test",
5960
"Module",
61+
"1.0.0",
6062
projectDir,
6163
false
6264
);

0 commit comments

Comments
 (0)