Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 16, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f7489fd
698: Added to remove substring the module from module name. Added pre…
artemii-karkusha Dec 14, 2021
d58cb8b
698: Changed composer.json files for test. Changed of tests testGener…
artemii-karkusha Dec 14, 2021
db5625f
698: Changed of tests testGenerateModuleFileWithoutDependencies, test…
artemii-karkusha Dec 14, 2021
c4c39f8
698: Changed Javadoc. Refactor.
artemii-karkusha Dec 15, 2021
49bf302
698: Changed of parameters for function removeSubstringFormString to …
artemii-karkusha Dec 15, 2021
25867b3
698: Moved properties on top of class NewModuleDialog. Removed of fun…
artemii-karkusha Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModuleDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -332,6 +338,7 @@ public static void open(
private String getComposerPackageName() {
return camelCaseToHyphen.convert(getPackageName())
.concat("/")
.concat(DEFAULT_MODULE_PREFIX + "-")
.concat(camelCaseToHyphen.convert(getModuleName()));
}

Expand Down
4 changes: 2 additions & 2 deletions ...actions/generation/generator/ModuleComposerJsonGenerator/generateFileInRoot/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "test/module",
"name": "test/module-test",
"version": "1.0.0-dev",
"description": "test-description",
"type": "magento2-module",
Expand All @@ -17,7 +17,7 @@
"registration.php"
],
"psr-4": {
"TestWithDependencies\\Module\\": ""
"TestWithDependencies\\Test\\": ""
}
}
}
4 changes: 2 additions & 2 deletions ...actions/generation/generator/ModuleComposerJsonGenerator/generateModuleFile/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "test/module",
"name": "test/module-test",
"version": "1.0.0-dev",
"description": "test-description",
"type": "magento2-module",
Expand All @@ -17,7 +17,7 @@
"registration.php"
],
"psr-4": {
"TestWithDependencies\\Module\\": ""
"TestWithDependencies\\Test\\": ""
}
}
}
4 changes: 2 additions & 2 deletions ...generator/ModuleComposerJsonGenerator/generateModuleFileWithoutDependencies/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "test/module",
"name": "test/module-test",
"version": "1.0.0-dev",
"description": "test-description",
"type": "magento2-module",
Expand All @@ -15,7 +15,7 @@
"registration.php"
],
"psr-4": {
"TestWithoutDependencies\\Module\\": ""
"TestWithoutDependencies\\Test\\": ""
}
}
}
8 changes: 4 additions & 4 deletions ...nto/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down