Merge branch '1.0.1-develop' of https://github.com/magento/magento2-phpstorm-plugin into 252-fixed-issue-with-new-module-group-prepare-release

Vitaliy Boyko · Vitaliy Boyko · commit 46afac26617e · 2020-05-23T15:37:26.000+03:00
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -133,7 +133,7 @@
                          displayName="Inspection for the Module declaration in the `registration.php` file"
                          groupName="Magento 2"
                          enabledByDefault="true"
-                         level="WARNING"
+                         level="ERROR"
                          implementationClass="com.magento.idea.magento2plugin.inspections.php.ModuleDeclarationInRegistrationPhpInspection"/>
 
         <localInspection language="XML" groupPath="XML"
@@ -163,7 +163,7 @@
                          shortName="ModuleDeclarationInModuleXmlInspection"
                          displayName="Inspection for the Module declaration in the `etc/module.xml` file"
                          groupName="Magento 2"
-                         enabledByDefault="true" level="WARNING"
+                         enabledByDefault="true" level="ERROR"
                          implementationClass="com.magento.idea.magento2plugin.inspections.xml.ModuleDeclarationInModuleXmlInspection"/>
 
         <libraryRoot id=".phpstorm.meta.php" path=".phpstorm.meta.php/" runtime="false"/>
diff --git a/src/com/magento/idea/magento2plugin/inspections/php/ModuleDeclarationInRegistrationPhpInspection.java b/src/com/magento/idea/magento2plugin/inspections/php/ModuleDeclarationInRegistrationPhpInspection.java
@@ -53,7 +53,7 @@ public void visitPhpStringLiteralExpression(final StringLiteralExpression expres
                                 actualName,
                                 expectedName
                         ),
-                        ProblemHighlightType.WARNING,
+                        ProblemHighlightType.ERROR,
                         new PhpModuleNameQuickFix(expectedName)
                 );
             }
diff --git a/src/com/magento/idea/magento2plugin/inspections/xml/ModuleDeclarationInModuleXmlInspection.java b/src/com/magento/idea/magento2plugin/inspections/xml/ModuleDeclarationInModuleXmlInspection.java
@@ -69,7 +69,7 @@ public void visitXmlAttributeValue(final XmlAttributeValue value) {
                                 actualName,
                                 expectedName
                         ),
-                        ProblemHighlightType.WARNING,
+                        ProblemHighlightType.ERROR,
                         new XmlModuleNameQuickFix(expectedName)
                 );
             }
diff --git a/src/com/magento/idea/magento2plugin/util/magento/IsFileInEditableModuleUtil.java b/src/com/magento/idea/magento2plugin/util/magento/IsFileInEditableModuleUtil.java
@@ -15,7 +15,7 @@ public final class IsFileInEditableModuleUtil {
     private IsFileInEditableModuleUtil() {}
 
     /**
-     * Module is considered editable if it is declared within `MAGENTO_ROOT/app/code` directory
+     * Module is considered editable if it is declared within `MAGENTO_ROOT/app/code` directory.
      *
      * @param file PsiFile
      * @return boolean

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void visitPhpStringLiteralExpression(final StringLiteralExpression expres`
`53`	`53`	`actualName,`
`54`	`54`	`expectedName`
`55`	`55`	`),`
`56`		`- ProblemHighlightType.WARNING,`
	`56`	`+ ProblemHighlightType.ERROR,`
`57`	`57`	`new PhpModuleNameQuickFix(expectedName)`
`58`	`58`	`);`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public void visitXmlAttributeValue(final XmlAttributeValue value) {`
`69`	`69`	`actualName,`
`70`	`70`	`expectedName`
`71`	`71`	`),`
`72`		`- ProblemHighlightType.WARNING,`
	`72`	`+ ProblemHighlightType.ERROR,`
`73`	`73`	`new XmlModuleNameQuickFix(expectedName)`
`74`	`74`	`);`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public final class IsFileInEditableModuleUtil {`
`15`	`15`	`private IsFileInEditableModuleUtil() {}`
`16`	`16`
`17`	`17`	`/**`
`18`		- * Module is considered editable if it is declared within `MAGENTO_ROOT/app/code` directory
	`18`	+ * Module is considered editable if it is declared within `MAGENTO_ROOT/app/code` directory.
`19`	`19`	`*`
`20`	`20`	`* @param file PsiFile`
`21`	`21`	`* @return boolean`