Merge branch '4.3.0-develop' of github.com:magento/magento2-phpstorm-plugin into mainline-eav-attr-code-genearators

� Conflicts:
�	resources/magento2/validation.properties
�	src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/annotation/RuleRegistry.java

Author: Vitaliy Boyko

resources/META-INF/plugin.xml

@@ -75,6 +75,7 @@
             <action id="MagentoCreateViewFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewViewXmlAction"/>
             <action id="MagentoCreateWebapiFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewWebapiXmlAction"/>
             <action id="MagentoCreateWidgetFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewWidgetXmlAction"/>
+            <action id="MagentoCreateLayoutFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewLayoutXmlAction"/>
             <!-- Context dependent actions -->
             <separator/>
             <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewXml"/>
@@ -125,7 +126,10 @@
         <action id="InjectAViewModelAction.Menu" class="com.magento.idea.magento2plugin.actions.generation.InjectAViewModelAction">
             <add-to-group group-id="EditorPopupMenu"/>
         </action>
-        <action id="OverrideInTheme.Menu" class="com.magento.idea.magento2plugin.actions.generation.OverrideInThemeAction">
+        <action id="OverrideTemplateInTheme.Menu" class="com.magento.idea.magento2plugin.actions.generation.OverrideTemplateInThemeAction">
+            <add-to-group group-id="ProjectViewPopupMenu"/>
+        </action>
+        <action id="OverrideLayoutInTheme.Menu" class="com.magento.idea.magento2plugin.actions.generation.OverrideLayoutInThemeAction">
             <add-to-group group-id="ProjectViewPopupMenu"/>
         </action>
         <action id="MagentoCreateAWebApiDeclaration.Menu" class="com.magento.idea.magento2plugin.actions.generation.NewWebApiDeclarationAction">
@@ -134,6 +138,12 @@
         <action id="MagentoCreateAWebApiInterfaceForService.Menu" class="com.magento.idea.magento2plugin.actions.generation.NewWebApiInterfaceAction">
             <add-to-group group-id="EditorPopupMenu"/>
         </action>
+        <action id="MagentoInjectConstructorArgumentAction.Menu" class="com.magento.idea.magento2plugin.actions.generation.InjectConstructorArgumentAction">
+            <add-to-group group-id="EditorPopupMenu"/>
+        </action>
+        <action id="MagentoCompareTemplate.Menu" class="com.magento.idea.magento2plugin.actions.comparator.CompareTemplateAction">
+            <add-to-group group-id="EditorPopupMenu"/>
+        </action>
 
         <action id="CopyMagentoPath"
                 class="com.magento.idea.magento2plugin.actions.CopyMagentoPath"
@@ -616,5 +626,7 @@
         <frameworkProjectConfigurableProvider implementation="com.magento.idea.magento2plugin.project.ConfigurableProvider"/>
         <frameworkUsageProvider implementation="com.magento.idea.magento2plugin.project.UsagesProvider"/>
         <libraryRoot id="phpstorm.meta.php" path="/.phpstorm.meta.php/" runtime="false"/>
+
+        <referenceResolver2 implementation="com.magento.idea.magento2plugin.lang.php.MagentoProxyDeclarationFilter" order="first"/>
     </extensions>
 </idea-plugin>

resources/fileTemplates/internal/Magento CLI Command Class.php.ft

@@ -12,7 +12,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 class ${NAME} extends Command
 {
         /**
-         * @inheritDoc
+         * Initialization of the command.
          */
         protected function configure()
         {
@@ -22,7 +22,7 @@ class ${NAME} extends Command
         }
 
         /**
-         * CLI command description
+         * CLI command description.
          *
          * @param InputInterface $input
          * @param OutputInterface $output

resources/fileTemplates/internal/Magento Collection Class.php.ft

@@ -17,7 +17,7 @@ class ${NAME}#if (${EXTENDS}) extends ${EXTENDS}#end#if (${IMPLEMENTS}) implemen
     protected $_eventPrefix = '${DB_NAME}_collection';
 
     /**
-     * @inheritdoc
+     * Initialize collection model.
      */
     protected function _construct()
     {

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

@@ -19,7 +19,7 @@ class ${NAME} #if (${EXTENDS})extends ${EXTENDS} #end #if (${IMPLEMENTS} && $has
 {
       #if (${PROPERTIES} && !$hasInterface)
             /**
-             * String constants for property names
+             * String constants for property names.
              */
             #set ($properties = ${PROPERTIES})
         #foreach ($property in $properties.split(","))
@@ -41,17 +41,11 @@ class ${NAME} #if (${EXTENDS})extends ${EXTENDS} #end #if (${IMPLEMENTS} && $has
             #if(!($foreach.first))
 
             #end
-            #if ($hasInterface)
-            /**
-             * @inheritDoc
-             */
-            #else
             /**
              * Getter for $propertyUpperCamel.
              *
              * @return $propertyType|null
              */
-            #end
             public function get$propertyUpperCamel(): ?$propertyType
             {
                 #if($propertyType == 'string')
@@ -62,19 +56,13 @@ class ${NAME} #if (${EXTENDS})extends ${EXTENDS} #end #if (${IMPLEMENTS} && $has
                 #end
             }
 
-            #if ($hasInterface)
-            /**
-             * @inheritDoc
-             */
-            #else
             /**
              * Setter for $propertyUpperCamel.
              *
              * @param $propertyType|null $$propertyLowerCamel
              *
              * @return void
              */
-            #end
             public function set$propertyUpperCamel(?$propertyType $$propertyLowerCamel): void
             {
                 $this->setData(self::$propertyUpperSnake, $$propertyLowerCamel);

resources/fileTemplates/internal/Magento Entity Search Results.php.ft

@@ -14,15 +14,21 @@ use $use;
 class ${CLASS_NAME} extends ${PARENT_CLASS_NAME} implements ${INTERFACE_NAME}
 {
     /**
-     * @inheritDoc
+     * Set items list.
+     *
+     * @param array $items
+     *
+     * @return ${INTERFACE_NAME}
      */
     public function setItems(array $items): ${INTERFACE_NAME}
     {
         return parent::setItems($items);
     }
 
     /**
-     * @inheritDoc
+     * Get items list.
+     *
+     * @return array
      */
     public function getItems(): array
     {

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

@@ -20,11 +20,9 @@ class ${CLASS_NAME} extends ${PARENT_CLASS}
 
     /**
      * Url paths.
-     * #@+
      */
     private const EDIT_URL_PATH = '${EDIT_URL_PATH}';
     private const DELETE_URL_PATH = '${DELETE_URL_PATH}';
-    /** #@- */
 
     /**
      * @var ${URL}
@@ -55,7 +53,11 @@ class ${CLASS_NAME} extends ${PARENT_CLASS}
     }
 
     /**
-     * @inheritDoc
+     * Prepare data source.
+     *
+     * @param array $dataSource
+     *
+     * @return array
      */
     public function prepareDataSource(array $dataSource): array
     {

resources/fileTemplates/internal/Magento Layout XML.xml.ft

@@ -1,4 +1,10 @@
 <?xml version="1.0"?>
 #parse("XML File Header.xml")
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+#if (${IS_ADMIN} == "true")
+    #set ($isAdmin = true)
+#else
+    #set ($isAdmin = false)
+#end
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" #if ($isAdmin)layout="admin-1column"#end
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
 </page>

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

@@ -17,7 +17,9 @@ class ${NAME}#if (${EXTENDS}) extends ${EXTENDS}#end#if (${IMPLEMENTS}) implemen
     protected $_eventPrefix = '${DB_NAME}_model';
 
     /**
-     * @inheritdoc
+     * Initialize magento model.
+     *
+     * @return void
      */
     protected function _construct()
     {

resources/fileTemplates/internal/Magento Resource Model Class.php.ft

@@ -17,7 +17,7 @@ class ${NAME}#if (${EXTENDS}) extends ${EXTENDS}#end#if (${IMPLEMENTS}) implemen
     protected $_eventPrefix = '${DB_NAME}_resource_model';
 
     /**
-     * @inheritdoc
+     * Initialize resource model.
      */
     protected function _construct()
     {

resources/fileTemplates/internal/Magento UI Component Custom Data Provider Class.php.ft

@@ -76,7 +76,9 @@ class ${CLASS_NAME} extends ${EXTENDS}
     }
 
     /**
-     * @inheritDoc
+     * Returns searching result.
+     *
+     * @return ${SEARCH_RESULT_FACTORY}
      */
     public function getSearchResult()
     {
@@ -119,7 +121,9 @@ class ${CLASS_NAME} extends ${EXTENDS}
     }
 #else
     /**
-     * @inheritDoc
+     * Get data.
+     *
+     * @return array
      */
     public function getData()
     {

resources/inspectionDescriptions/CallingDeprecatedMethod.html

@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1439] Call Adobe Commerce @deprecated method: The deprecated method will be removed in upcoming versions. Consider relying on methods declared in API interfaces instead.</p>
+<p>[1439] Call Magento 2 @deprecated method: The deprecated method will be removed in upcoming versions. Consider relying on methods declared in API interfaces instead.</p>
 <!-- tooltip end -->
 </body>
 </html>

resources/inspectionDescriptions/ExtendingDeprecatedClass.html

@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1131] Extending from Adobe Commerce @deprecated class: The extended class will be removed in upcoming versions. Inheritance is not recommended way of extending Adobe Commerce functionality. Update code to use a class marked as @api.</p>
+<p>[1131] Extending from Magento 2 @deprecated class: The extended class will be removed in upcoming versions. Inheritance is not recommended way of extending Magento Open Source|Adobe Commerce functionality. Update code to use a class marked as @api.</p>
 <!-- tooltip end -->
 </body>
 </html>

resources/inspectionDescriptions/ImplementedDeprecatedInterface.html

@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1338] Implemented Adobe Commerce @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider removing the interface inheritance, using an interface marked as @api or an interface introduced within your implementation instead.</p>
+<p>[1338] Implemented Magento 2 @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider removing the interface inheritance, using an interface marked as @api or an interface introduced within your implementation instead.</p>
 <!-- tooltip end -->
 </body>
 </html>

resources/inspectionDescriptions/ImportingDeprecatedClass.html

@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1132] Importing Adobe Commerce @deprecated class: The extended class will be removed in upcoming versions. Consider using Adobe Commerce class marked as @api instead.</p>
+<p>[1132] Importing Magento 2 @deprecated class: The extended class will be removed in upcoming versions. Consider using Magento Open Source|Adobe Commerce class marked as @api instead.</p>
 <!-- tooltip end -->
 </body>
 </html>

resources/inspectionDescriptions/ImportingDeprecatedInterface.html

@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1332] Imported Adobe Commerce @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider using an interface or class marked as @api instead.</p>
+<p>[1332] Imported Magento 2 @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider using an interface or class marked as @api instead.</p>
 <!-- tooltip end -->
 </body>
-</html>
+</html>

resources/inspectionDescriptions/InheritedDeprecatedInterface.html

@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1337] Inherited from Adobe Commerce @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider removing the interface inheritance, using an interface marked as @api or an interface introduced within your implementation instead.</p>
+<p>[1337] Inherited from Magento 2 @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider removing the interface inheritance, using an interface marked as @api or an interface introduced within your implementation instead.</p>
 <!-- tooltip end -->
 </body>
 </html>

resources/inspectionDescriptions/OverridingDeprecatedConstant.html

@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1235] Overriding Adobe Commerce @deprecated constant: The deprecated constant will be removed in upcoming versions. Consider using a constant marked as @api or a private constant within your implementation instead.</p>
+<p>[1235] Overriding Magento 2 @deprecated constant: The deprecated constant will be removed in upcoming versions. Consider using a constant marked as @api or a private constant within your implementation instead.</p>
 <!-- tooltip end -->
 </body>
 </html>

resources/inspectionDescriptions/OverridingDeprecatedProperty.html

@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1535] Overriding Adobe Commerce @deprecated property: The deprecated property will be removed in upcoming versions. Consider relying on methods declared in API interfaces or using a private property within your implementation instead.</p>
+<p>[1535] Overriding Magento 2 @deprecated property: The deprecated property will be removed in upcoming versions. Consider relying on methods declared in API interfaces or using a private property within your implementation instead.</p>
 <!-- tooltip end -->
 </body>
 </html>

resources/inspectionDescriptions/UsingDeprecatedClass.html

@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1134] Using Adobe Commerce @deprecated class: The extended class will be removed in upcoming versions. Consider using Adobe Commerce class marked as @api instead.</p>
+<p>[1134] Using Magento 2 @deprecated class: The extended class will be removed in upcoming versions. Consider using Magento Open Source|Adobe Commerce class marked as @api instead.</p>
 <!-- tooltip end -->
 </body>
 </html>

resources/inspectionDescriptions/UsingDeprecatedConstant.html

@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1234] Using Adobe Commerce @deprecated constant: The deprecated constant will be removed in upcoming versions. Consider using a constant marked as @api or a private constant within your implementation instead.</p>
+<p>[1234] Using Magento 2 @deprecated constant: The deprecated constant will be removed in upcoming versions. Consider using a constant marked as @api or a private constant within your implementation instead.</p>
 <!-- tooltip end -->
 </body>
 </html>

resources/inspectionDescriptions/UsingDeprecatedInterface.html

@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1334] Used Adobe Commerce @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider using an interface or class marked as @api instead.</p>
+<p>[1334] Used Magento 2 @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider using an interface or class marked as @api instead.</p>
 <!-- tooltip end -->
 </body>
 </html>

resources/inspectionDescriptions/UsingDeprecatedProperty.html

@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1534] Using Adobe Commerce @deprecated property: The deprecated method will be removed in upcoming versions. Consider relying on methods declared in API interfaces instead.</p>
+<p>[1534] Using Magento 2 @deprecated property: The deprecated method will be removed in upcoming versions. Consider relying on methods declared in API interfaces instead.</p>
 <!-- tooltip end -->
 </body>
 </html>

resources/magento2/common.properties

@@ -72,4 +72,5 @@ common.template.type=Email Type
 common.diagnostic.reportButtonText=Report Me
 common.diagnostic.reportSubmittedTitle=The report is successfully submitted!
 common.diagnostic.reportSubmittedMessage=Thank you for submitting your report! We will check it as soon as possible.
+common.layout.filename=Layout File Name
 common.targetMethod=Target Method

resources/magento2/validation.properties

@@ -9,6 +9,7 @@ validator.alphaAndDashCharacters=The {0} field must contain alphabets and dashes
 validator.alreadyDeclared={0} is already declared in the {1} module
 validator.startWithNumberOrCapitalLetter=The {0} field must start with a number or a capital letter
 validator.onlyNumbers=The {0} field must contain numbers only
+validator.onlyIntegerOrFloatNumbers=The {0} field must contain only integer or float numbers
 validator.mustNotBeNegative={0} must not be negative
 validator.identifier=The {0} field must contain letters, numbers, dashes, and underscores only
 validator.identifier.colon=The {0} field must contain letters, numbers, colons, dashes, and underscores only
@@ -41,4 +42,9 @@ validator.lowerSnakeCase=The {0} field must be of the lower snake case format
 validator.menuIdentifierInvalid=The menu identifier is invalid
 validator.someFieldsHaveErrors=Please, check the dialog. Some fields have errors
 validator.dbSchema.invalidColumnType=Invalid ''{0}'' column type specified
-validator.commaSeparatedString.isNotValid=The {0} field must contain comma separated string without whitespaces
+validator.arrayValuesDialog.invalidValueForRowWithName=Invalid value ''{0}'' specified for the row with name ''{1}''
+validator.arrayValuesDialog.namesMustBeUnique=Duplicated items names
+validator.arrayValuesDialog.nameMustNotBeEmpty=The array name cannot be empty
+validator.layoutNameRuleInvalid=The layout name is invalid
+validator.layoutNameUnderscoreQtyInvalid=Wrong layout name, please check
+validator.commaSeparatedString.isNotValid=The {0} field must contain comma separated string without whitespaces