Merge pull request magento#440 from magento/3.0.3-develop->3.1.0-develop-forwardport

3.0.3 develop >3.1.0 develop forwardport

Author: eduard13

CHANGELOG.md

@@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
 ## 3.1.0
 
+## 3.0.3
+
+### Fixed
+
+- Fixed model generation with same names
+- Fixed NPTR exception in theme directory view model action
+- Fixed observer name validator
+- Fixed plugin name validator
+
 ## 3.0.2
 
 ### Fixed

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

@@ -53,6 +53,9 @@ public class NewModelsDialog extends AbstractDialog {
     private static final String ENTITY_ID_COLUMN_NAME = "Entity ID Column Name";
     private static final String COLLECTION_NAME = "Collection Name";
     private static final String COLLECTION_DIRECTORY = "Collection Directory";
+    public static final String RESOURCE_MODEL = "ResourceModel";
+    public static final String MODEL = "Model";
+    public static final String FQN_ALIAS_KEYWORD = " as ";
 
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
             message = {NotEmptyRule.MESSAGE, MODEL_NAME})
@@ -223,14 +226,24 @@ private void onOK() {
     private PsiFile generateModelFile() {
         final NamespaceBuilder modelNamespace = getModelNamespace();
         final NamespaceBuilder resourceModelNamespace = getResourceModelNamespace();
+        final StringBuilder resourceModelFqn
+                = new StringBuilder(resourceModelNamespace.getClassFqn());
+        String resourceModelName = getResourceModelName();
+
+        if (getModelName().equals(getResourceModelName())) {
+            resourceModelFqn.append(FQN_ALIAS_KEYWORD);
+            resourceModelFqn.append(RESOURCE_MODEL);
+            resourceModelName = RESOURCE_MODEL;
+        }
+
         return new ModuleModelGenerator(new ModelData(
                 getModuleName(),
                 getDbTableName(),
                 getModelName(),
-                getResourceModelName(),
+                resourceModelName,
                 modelNamespace.getClassFqn(),
                 modelNamespace.getNamespace(),
-                resourceModelNamespace.getClassFqn()
+                resourceModelFqn.toString()
         ), project).generate(NewModelsDialog.ACTION_NAME, true);
     }
 
@@ -250,17 +263,33 @@ private PsiFile generateCollectionFile() {
         final NamespaceBuilder resourceModelNamespace = getResourceModelNamespace();
         final NamespaceBuilder modelNamespace = getModelNamespace();
         final NamespaceBuilder collectionNamespace = getCollectionNamespace();
+        final StringBuilder modelFqn = new StringBuilder(modelNamespace.getClassFqn());
+        String modelName = getModelName();
+        final StringBuilder resourceModelFqn
+                = new StringBuilder(resourceModelNamespace.getClassFqn());
+        String resourceModelName = getResourceModelName();
+
+
+        if (getModelName().equals(getResourceModelName())) {
+            modelFqn.append(FQN_ALIAS_KEYWORD);
+            modelFqn.append(MODEL);
+            modelName = MODEL;
+            resourceModelFqn.append(FQN_ALIAS_KEYWORD);
+            resourceModelFqn.append(RESOURCE_MODEL);
+            resourceModelName = RESOURCE_MODEL;
+        }
+
         return new ModuleCollectionGenerator(new CollectionData(
             getModuleName(),
             getDbTableName(),
-            getModelName(),
+            modelName,
             getCollectionName(),
             collectionNamespace.getClassFqn(),
             getCollectionDirectory(),
             collectionNamespace.getNamespace(),
-            getResourceModelName(),
-            resourceModelNamespace.getClassFqn(),
-            modelNamespace.getClassFqn()
+            resourceModelName,
+            resourceModelFqn.toString(),
+            modelFqn.toString()
         ), project).generate(NewModelsDialog.ACTION_NAME, true);
     }
 

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

@@ -150,9 +150,7 @@ protected void fillAttributes(final Properties attributes) {
         attributes.setProperty("NAMESPACE", modelData.getNamespace());
 
         attributes.setProperty("DB_NAME", modelData.getDbTableName());
-        attributes.setProperty("RESOURCE_MODEL", PhpClassGeneratorUtil.getNameFromFqn(
-                modelData.getResourceModelFqn())
-        );
+        attributes.setProperty("RESOURCE_MODEL", modelData.getResourceName());
         final List<String> uses = getUses();
 
         attributes.setProperty(

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

@@ -17,7 +17,6 @@
 import org.jetbrains.annotations.Nullable;
 
 public final class GetModuleNameByDirectoryUtil {
-
     public static final int THEME_SPLIT_COUNT = 1;
     public static final String THEME_DIRECTORY_REGEX = "app\\/design\\/(adminhtml|frontend)\\/";