Merge branch '5.0.0-develop' into 1239-string-index-out-of-bounds-exception

Author: VitaliyBoyko

resources/META-INF/plugin.xml

@@ -315,6 +315,13 @@
                          enabledByDefault="true" level="WARNING"
                          implementationClass="com.magento.idea.magento2plugin.inspections.xml.PluginAttributeTypeInspection"/>
 
+        <localInspection language="XML" groupPath="XML"
+                         shortName="ModuleScopeInspection"
+                         bundle="magento2.inspection" key="inspection.displayName.ModuleScopeInspection"
+                         groupBundle="magento2.inspection" groupKey="inspection.group.name"
+                         enabledByDefault="true" level="WARNING"
+                         implementationClass="com.magento.idea.magento2plugin.inspections.xml.ModuleScopeInspection"/>
+
         <!-- UCT inspection -->
         <localInspection language="PHP" groupPath="UCT"
                          shortName="ExtendingDeprecatedClass"

resources/fileTemplates/internal/Magento Backend Controller Class.php.ft

@@ -15,7 +15,7 @@ class ${NAME}#if (${EXTENDS}) extends ${EXTENDS}#end#if (${IMPLEMENTS}) implemen
     /**
      * Authorization level of a basic admin session
      */
-    const ADMIN_RESOURCE = '${ACL}';
+    public const ADMIN_RESOURCE = '${ACL}';
 
 #end
     /**

resources/fileTemplates/internal/Magento Customer Eav Attribute Data Patch Class.php.ft

@@ -12,31 +12,31 @@ use $use;
 class ${CLASS_NAME} implements ${IMPLEMENTS}
 {
     /**
-     * @var ${MODULE_DATA_SETUP_INTERFACE}
-     */
-     private $moduleDataSetup;
+    * @var ${MODULE_DATA_SETUP_INTERFACE}
+    */
+    private ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup;
 
-     /**
-     * @var ${EAV_SETUP_FACTORY}
-     */
-    private $eavSetupFactory;
+    /**
+    * @var ${EAV_SETUP_FACTORY}
+    */
+    private ${EAV_SETUP_FACTORY} $eavSetupFactory;
 
     /**
-     * @var ${EAV_CONFIG_CLASS}
-     */
-    private $eavConfig;
+    * @var ${EAV_CONFIG_CLASS}
+    */
+    private ${EAV_CONFIG_CLASS} $eavConfig;
 
     /**
-     * @var ${ATTRIBUTE_RESOURCE}
-     */
-    private $attributeResource;
+    * @var ${ATTRIBUTE_RESOURCE}
+    */
+    private ${ATTRIBUTE_RESOURCE} $attributeResource;
 
-     /**
-     * @param ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup
-     * @param ${EAV_SETUP_FACTORY} $eavSetupFactory
-     * @param ${EAV_CONFIG_CLASS} $eavConfig
-     * @param ${ATTRIBUTE_RESOURCE} $attributeResource
-     */
+    /**
+    * @param ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup
+    * @param ${EAV_SETUP_FACTORY} $eavSetupFactory
+    * @param ${EAV_CONFIG_CLASS} $eavConfig
+    * @param ${ATTRIBUTE_RESOURCE} $attributeResource
+    */
     public function __construct(
         ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup,
         ${EAV_SETUP_FACTORY} $eavSetupFactory,

resources/fileTemplates/internal/Magento Data Model Interface.php.ft

@@ -16,7 +16,7 @@ interface ${NAME}
             #set ($propertyData = $property.split(";"))
             #set ($propertyUpperSnake = $propertyData.get(0))
             #set ($propertyLowerSnake = $propertyData.get(1))
-            const $propertyUpperSnake = "$propertyLowerSnake";
+            public const $propertyUpperSnake = "$propertyLowerSnake";
         #end
     #end
     #if (${PROPERTIES})

resources/fileTemplates/internal/Magento Data Model.php.ft

@@ -26,7 +26,7 @@ class ${NAME} #if (${EXTENDS})extends ${EXTENDS} #end #if (${IMPLEMENTS} && $has
             #set ($propertyData = $property.split(";"))
             #set ($propertyUpperSnake = $propertyData.get(0))
             #set ($propertyLowerSnake = $propertyData.get(1))
-                const $propertyUpperSnake = "$propertyLowerSnake";
+                public const $propertyUpperSnake = "$propertyLowerSnake";
             #end
 
     #end

resources/fileTemplates/internal/Magento Delete Entity By Id Command.php.ft

@@ -16,17 +16,17 @@ class ${CLASS_NAME}
     /**
      * @var ${LOGGER}
      */
-    private $logger;
+    private ${LOGGER} $logger;
 
     /**
      * @var ${MODEL_FACTORY}
      */
-    private $modelFactory;
+    private ${MODEL_FACTORY} $modelFactory;
 
     /**
      * @var ${RESOURCE}
      */
-    private $resource;
+    private ${RESOURCE} $resource;
 
     /**
      * @param ${LOGGER} $logger

resources/fileTemplates/internal/Magento Eav Attribute Data Patch Class.php.ft

@@ -15,12 +15,12 @@ class ${CLASS_NAME} implements ${IMPLEMENTS} {
      /**
      * @var ${MODULE_DATA_SETUP_INTERFACE}
      */
-     private $moduleDataSetup;
+     private ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup;
 
     /**
      * @var ${EAV_SETUP_FACTORY}
      */
-    private $eavSetupFactory;
+    private ${EAV_SETUP_FACTORY} $eavSetupFactory;
 
     /**
      * @param ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup

resources/fileTemplates/internal/Magento Entity Data Mapper.php.ft

@@ -16,7 +16,7 @@ class ${CLASS_NAME}
     /**
      * @var ${DTO_FACTORY}
      */
-    private $entityDtoFactory;
+    private ${DTO_FACTORY} $entityDtoFactory;
 
     /**
      * @param ${DTO_FACTORY} $entityDtoFactory

resources/fileTemplates/internal/Magento Entity Delete Controller Class.php.ft

@@ -18,12 +18,12 @@ class ${CLASS_NAME} extends ${EXTENDS} implements ${IMPLEMENTS_POST}, ${IMPLEMEN
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
+    public const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
 
     /**
      * @var ${DELETE_COMMAND}
      */
-    private $deleteByIdCommand;
+    private ${DELETE_COMMAND} $deleteByIdCommand;
 
     /**
      * @param Context $context

resources/fileTemplates/internal/Magento Entity Edit Action Controller Class.php.ft

@@ -18,7 +18,7 @@ class ${CLASS_NAME} extends ${EXTENDS} implements ${IMPLEMENTS}
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
+    public const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
 
     /**
      * Edit ${ENTITY_NAME} action.