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.

resources/fileTemplates/internal/Magento Entity Index Adminhtml Controller Class.php.ft

@@ -16,7 +16,7 @@ class ${CLASS_NAME} extends ${PARENT_CLASS_NAME} implements ${HTTP_GET_METHOD}
     /**
      * Authorization level of a basic admin session.
      */
-    const ADMIN_RESOURCE = '${ACL}';
+    public const ADMIN_RESOURCE = '${ACL}';
 
     /**
      * Execute action based on request and return result.

resources/fileTemplates/internal/Magento Entity New 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}';
 
     /**
      * Create new ${ENTITY_NAME} action.

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

@@ -18,22 +18,22 @@ class ${CLASS_NAME} extends ${EXTENDS} implements ${IMPLEMENTS}
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
+    public const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
 
      /**
      * @var ${DATA_PERSISTOR}
      */
-    private $dataPersistor;
+    private ${DATA_PERSISTOR} $dataPersistor;
 
     /**
      * @var ${SAVE_COMMAND}
      */
-    private $saveCommand;
+    private ${SAVE_COMMAND} $saveCommand;
 
     /**
      * @var ${ENTITY_DTO_FACTORY}
      */
-    private $entityDataFactory;
+    private ${ENTITY_DTO_FACTORY} $entityDataFactory;
 
     /**
      * @param Context $context

resources/fileTemplates/internal/Magento Get List Query Model.php.ft

@@ -16,27 +16,27 @@ class ${CLASS_NAME}
     /**
      * @var ${COLLECTION_PROCESSOR_TYPE}
      */
-    private $collectionProcessor;
+    private ${COLLECTION_PROCESSOR_TYPE} $collectionProcessor;
 
     /**
      * @var ${ENTITY_COLLECTION_FACTORY_TYPE}
      */
-    private $entityCollectionFactory;
+    private ${ENTITY_COLLECTION_FACTORY_TYPE} $entityCollectionFactory;
 
     /**
      * @var ${ENTITY_DATA_MAPPER_TYPE}
      */
-    private $entityDataMapper;
+    private ${ENTITY_DATA_MAPPER_TYPE} $entityDataMapper;
 
     /**
      * @var ${SEARCH_CRITERIA_BUILDER_TYPE}
      */
-    private $searchCriteriaBuilder;
+    private ${SEARCH_CRITERIA_BUILDER_TYPE} $searchCriteriaBuilder;
 
     /**
      * @var ${SEARCH_RESULT_FACTORY_TYPE}
      */
-    private $searchResultFactory;
+    private ${SEARCH_RESULT_FACTORY_TYPE} $searchResultFactory;
 
     /**
      * @param ${COLLECTION_PROCESSOR_TYPE} $collectionProcessor

resources/fileTemplates/internal/Magento Grid Ui Component Action Column Class.php.ft

@@ -27,7 +27,7 @@ class ${CLASS_NAME} extends ${PARENT_CLASS}
     /**
      * @var ${URL}
      */
-    private $urlBuilder;
+    private ${URL} $urlBuilder;
 
     /**
      * @param ${CONTEXT} $context

resources/fileTemplates/internal/Magento Module Setup Patch File.php.ft

@@ -14,7 +14,7 @@ class ${CLASS_NAME} implements DataPatchInterface
     /**
      * @var ModuleDataSetupInterface
      */
-    private $moduleDataSetup;
+    private ModuleDataSetupInterface $moduleDataSetup;
 
     /**
      * @param ModuleDataSetupInterface $moduleDataSetup

resources/fileTemplates/internal/Magento PHP Form Generic Button Block Class.php.ft

@@ -16,12 +16,12 @@ class ${CLASS_NAME}
     /**
      * @var ${CONTEXT}
      */
-    private $context;
+    private ${CONTEXT} $context;
 
     /**
      * @var ${URL}
      */
-    private $urlBuilder;
+    private ${URL} $urlBuilder;
 
     /**
      * @param ${CONTEXT} $context

resources/fileTemplates/internal/Magento Save Entity Command Model.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 UI Component Custom Data Provider Class.php.ft

@@ -22,12 +22,12 @@ class ${CLASS_NAME} extends ${EXTENDS}
 /**
      * @var ${GET_LIST_QUERY_TYPE}
      */
-    private $getListQuery;
+    private ${GET_LIST_QUERY_TYPE} $getListQuery;
 
     /**
      * @var ${SEARCH_RESULT_FACTORY}
      */
-    private $searchResultFactory;
+    private ${SEARCH_RESULT_FACTORY} $searchResultFactory;
 
     /**
      * @var array

resources/inspectionDescriptions/ModuleScopeInspection.html

@@ -0,0 +1,27 @@
+<html>
+<body>
+<h1>Magento area type check.</h1>
+<p>
+    Magento is organized into these main areas:
+
+    Admin (adminhtml): entry point for this area is pub/index.php. The Admin panel area includes the code needed for store management. The /app/design/adminhtml directory contains all the code for components you’ll see while working in the Admin.
+
+    Storefront (frontend): entry point for this area is pub/index.php. The storefront (or frontend) contains template and layout files that define the appearance of your storefront.
+
+    Basic (base): used as a fallback for files absent in adminhtml and frontend areas.
+
+    Cron (crontab): In pub/cron.php, the \Magento\Framework\App\Cron class always loads the ‘crontab’ area.
+
+    You can also send requests to Magento using the SOAP, REST and GraphQL APIs. These three areas
+
+    Web API REST (webapi_rest): entry point for this area is pub/index.php. The REST area has a front controller that understands how to do URL lookups for REST-based URLs.
+
+    GraphQL (graphql): entry point for this area is pub/index.php.
+
+    Web API SOAP (webapi_soap): entry point for this area is pub/index.php.
+</p>
+<p>
+    See https://developer.adobe.com/commerce/php/architecture/modules/areas/ for more information.
+</p>
+</body>
+</html>

resources/magento2/inspection.properties

@@ -39,3 +39,5 @@ inspection.warning.class.does.not.exist=The class "{0}" does not exist
 inspection.warning.method.does.not.exist=The method "{0}" does not exist in the service class
 inspection.warning.method.should.have.public.access=The method "{0}" should have public access
 inspection.warning.method.should.have.public.access.fix=Change the method access
+inspection.displayName.ModuleScopeInspection=Module Configuration Scope Inspection
+inspection.config.wrong.area = The area of this config file is wrong. Please check the spelling of the parent directory, it should be equal to one of the following: adminhtml, frontend, crontab, webapi_rest, webapi_soap, graphql.

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCategoryEavAttributeDialog.form

@@ -57,7 +57,9 @@
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
-            <properties/>
+            <properties>
+              <text value="Display Settings"/>
+            </properties>
           </component>
           <component id="20b6c" class="javax.swing.JLabel">
             <constraints>

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewProductEavAttributeDialog.form

@@ -47,7 +47,9 @@
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
-            <properties/>
+            <properties>
+              <text value="Product Details"/>
+            </properties>
           </component>
           <component id="20b6c" class="javax.swing.JLabel">
             <constraints>