Merge branch '4.3.0-develop' of github.com:magento/magento2-phpstorm-plugin into 613-diff-overridden-template

Author: bohdan-harniuk

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 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()
     {

src/com/magento/idea/magento2plugin/magento/packages/ComponentType.java

@@ -10,7 +10,8 @@
 @SuppressWarnings({"PMD.FieldNamingConventions"})
 public enum ComponentType {
     module,
-    theme;
+    theme,
+    library;
 
     /**
      * Get component type by value.

src/com/magento/idea/magento2uct/execution/GenerateUctReportCommand.java

@@ -37,6 +37,7 @@
 import com.magento.idea.magento2uct.util.inspection.FilterDescriptorResultsUtil;
 import com.magento.idea.magento2uct.util.inspection.SortDescriptorResultsUtil;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.List;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -84,7 +85,7 @@ public void processTerminated(final @NotNull ProcessEvent event) {
     @SuppressWarnings({"PMD.ExcessiveMethodLength", "PMD.AvoidInstantiatingObjectsInLoops"})
     public void execute() {
         output.write("Upgrade compatibility tool\n");
-        final PsiDirectory rootDirectory = getTargetPsiDirectory();
+        final PsiDirectory rootDirectory = getTargetPsiDirectory(settingsService.getModulePath());
 
         if (rootDirectory == null) {
             output.print(
@@ -93,8 +94,21 @@ public void execute() {
             process.destroyProcess();
             return;
         }
+        final List<PsiDirectory> directoriesToScan = new ArrayList<>();
+        directoriesToScan.add(rootDirectory);
+
+        if (settingsService.getHasAdditionalPath()) {
+            final PsiDirectory additionalDirectory = getTargetPsiDirectory(
+                    settingsService.getAdditionalPath()
+            );
+
+            if (additionalDirectory != null) {
+                directoriesToScan.add(additionalDirectory);
+            }
+        }
+
         final ModuleScanner scanner = new ModuleScanner(
-                rootDirectory,
+                directoriesToScan,
                 new ExcludeMagentoBundledFilter()
         );
         final Summary summary = new Summary(
@@ -136,7 +150,7 @@ public void execute() {
 
                         if (fileProblemsHolder.hasResults()) {
                             if (!isModuleHeaderPrinted) {
-                                outputUtil.printModuleName(componentData.getName());
+                                outputUtil.printModuleName(componentData);
                                 isModuleHeaderPrinted = true;
                             }
                             outputUtil.printProblemFile(filename);
@@ -165,9 +179,10 @@ public void execute() {
                 }
                 summary.trackProcessFinished();
                 summary.setProcessedModules(scanner.getModuleCount());
+                summary.setProcessedThemes(scanner.getThemeCount());
                 outputUtil.printSummary(summary, resolvedEdition);
 
-                if (summary.getProcessedModules() == 0) {
+                if (summary.getProcessedModules() == 0 && summary.getProcessedThemes() == 0) {
                     process.destroyProcess();
                     return;
                 }
@@ -196,11 +211,11 @@ public void execute() {
     /**
      * Get target psi directory.
      *
+     * @param targetDirPath String
+     *
      * @return PsiDirectory
      */
-    private @Nullable PsiDirectory getTargetPsiDirectory() {
-        final String targetDirPath = settingsService.getModulePath();
-
+    private @Nullable PsiDirectory getTargetPsiDirectory(final String targetDirPath) {
         if (targetDirPath == null) {
             return null;
         }