ACPT-1550: Stabilize PR on app server branch

Author: aa-kashk

app/code/Magento/Backup/Model/Fs/Collection.php

@@ -29,8 +29,6 @@ class Collection extends \Magento\Framework\Data\Collection\Filesystem
     protected $_path = 'backups';
 
     /**
-     * Backup data
-     *
      * @var \Magento\Backup\Helper\Data
      */
     protected $_backupData = null;
@@ -46,7 +44,9 @@ class Collection extends \Magento\Framework\Data\Collection\Filesystem
      * @var \Magento\Framework\Filesystem
      */
     private $_filesystem;
+
     /**
+     *
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Magento\Backup\Helper\Data $backupData
      * @param \Magento\Framework\Filesystem $filesystem
@@ -68,6 +68,11 @@ public function __construct(
         $this->initialize();
     }
 
+    /**
+     * Initialize collection
+     *
+     * @return void
+     */
     private function initialize() {
         // set collection specific params
         $extensions = $this->_backupData->getExtensions();

app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php

@@ -21,12 +21,12 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper implements Re
     /**
      * Path to list of attributes used for flat indexer
      */
-    const XML_NODE_ATTRIBUTE_NODES = 'global/catalog/product/flat/attribute_groups';
+    public const XML_NODE_ATTRIBUTE_NODES = 'global/catalog/product/flat/attribute_groups';
 
     /**
      * Size of ids batch for reindex
      */
-    const BATCH_SIZE = 500;
+    public const BATCH_SIZE = 500;
 
     /**
      * Resource instance
@@ -50,7 +50,7 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper implements Re
     /**
      * Retrieve catalog product flat columns array in old format (used before MMDB support)
      *
-     * @return array
+     * @var array
      */
     protected $_attributes;
 
@@ -94,8 +94,6 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper implements Re
     protected $_flatAttributeGroups = [];
 
     /**
-     * Config factory
-     *
      * @var \Magento\Catalog\Model\ResourceModel\ConfigFactory
      */
     protected $_configFactory;
@@ -257,6 +255,7 @@ public function getFlatColumns()
                     $this->isAddChildData()
                 )->getFlatColumns();
                 if ($columns !== null) {
+                    // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                     $this->_columns = array_merge($this->_columns, $columns);
                 }
             }
@@ -333,6 +332,7 @@ public function getAttributeCodes()
 
             foreach ($this->_flatAttributeGroups as $attributeGroupName) {
                 $attributes = $this->_attributeConfig->getAttributeNames($attributeGroupName);
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $this->_systemAttributes = array_unique(array_merge($attributes, $this->_systemAttributes));
             }
 
@@ -417,6 +417,7 @@ public function getFlatIndexes()
                     $this->isAddChildData()
                 )->getFlatIndexes();
                 if ($indexes !== null) {
+                    // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                     $this->_indexes = array_merge($this->_indexes, $indexes);
                 }
             }

app/code/Magento/Customer/Model/ResourceModel/Group/Grid/Collection.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Customer group collection
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -82,6 +80,7 @@ public function _resetState(): void
 
     /**
      * Resource initialization
+     *
      * @return $this
      */
     protected function _initSelect()
@@ -92,6 +91,7 @@ protected function _initSelect()
     }
 
     /**
+     *
      * @return AggregationInterface
      */
     public function getAggregations()
@@ -100,6 +100,7 @@ public function getAggregations()
     }
 
     /**
+     *
      * @param AggregationInterface $aggregations
      * @return $this
      */

app/code/Magento/Eav/Model/AttributeDataFactory.php

@@ -15,16 +15,17 @@
  */
 class AttributeDataFactory implements ResetAfterRequestInterface
 {
-    const OUTPUT_FORMAT_JSON = 'json';
-    const OUTPUT_FORMAT_TEXT = 'text';
-    const OUTPUT_FORMAT_HTML = 'html';
-    const OUTPUT_FORMAT_PDF = 'pdf';
-    const OUTPUT_FORMAT_ONELINE = 'oneline';
-    const OUTPUT_FORMAT_ARRAY = 'array';
-
-    // available only for multiply attributes
+    public const OUTPUT_FORMAT_JSON = 'json';
+    public const OUTPUT_FORMAT_TEXT = 'text';
+    public const OUTPUT_FORMAT_HTML = 'html';
+    public const OUTPUT_FORMAT_PDF = 'pdf';
+    public const OUTPUT_FORMAT_ONELINE = 'oneline';
+    public const OUTPUT_FORMAT_ARRAY = 'array';
 
     // available only for multiply attributes
+    /**
+     * @var array
+     */
     protected $_dataModels = [];
 
     /**
@@ -52,6 +53,7 @@ public function __construct(
 
     /**
      * Return attribute data model by attribute
+     *
      * Set entity to data model (need for work)
      *
      * @param \Magento\Eav\Model\Attribute $attribute

app/code/Magento/Eav/Model/Config.php

@@ -549,6 +549,8 @@ public function getAttributes($entityType)
     /**
      * Get attribute by code for entity type
      *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      * @param mixed $entityType
      * @param mixed $code
      * @return AbstractAttribute

app/code/Magento/Quote/Model/Quote/Item/CartItemProcessorsPool.php

@@ -11,6 +11,7 @@
 
 /**
  * @deprecated 100.1.0
+ * @see Nothing
  */
 class CartItemProcessorsPool implements ResetAfterRequestInterface
 {
@@ -27,15 +28,18 @@ class CartItemProcessorsPool implements ResetAfterRequestInterface
     /**
      * @param ConfigInterface $objectManagerConfig
      * @deprecated 100.1.0
+     * @see Nothing
      */
     public function __construct(ConfigInterface $objectManagerConfig)
     {
         $this->objectManagerConfig = $objectManagerConfig;
     }
 
     /**
+     *
      * @return CartItemProcessorInterface[]
      * @deprecated 100.1.0
+     * @see Nothing
      */
     public function getCartItemProcessors()
     {

app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php

@@ -12,8 +12,6 @@
 namespace Magento\Reports\Model\ResourceModel\Report;
 
 /**
- * Class Collection
- *
  * @api
  * @since 100.0.2
  */
@@ -41,8 +39,6 @@ class Collection extends \Magento\Framework\Data\Collection
     protected $_period;
 
     /**
-     * Intervals
-     *
      * @var int
      */
     protected $_intervals;

app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction/Collection.php

@@ -139,6 +139,7 @@ public function addOrderIdFilter($orderId)
 
     /**
      * Payment ID filter setter
+     *
      * Can take either the integer id or the payment instance
      *
      * @param \Magento\Sales\Model\Order\Payment|int $payment

app/code/Magento/SalesSequence/Model/Builder.php

@@ -13,8 +13,6 @@
 use Psr\Log\LoggerInterface as Logger;
 
 /**
- * Class Builder
- *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
@@ -110,6 +108,7 @@ public function __construct(
     }
 
     /**
+     *
      * @param string $entityType
      * @return $this
      */
@@ -120,6 +119,7 @@ public function setEntityType($entityType)
     }
 
     /**
+     *
      * @param int $storeId
      * @return $this
      */
@@ -130,6 +130,7 @@ public function setStoreId($storeId)
     }
 
     /**
+     *
      * @param string $prefix
      * @return $this
      */
@@ -140,6 +141,7 @@ public function setPrefix($prefix)
     }
 
     /**
+     *
      * @param string $suffix
      * @return $this
      */
@@ -150,6 +152,7 @@ public function setSuffix($suffix)
     }
 
     /**
+     *
      * @param int $startValue
      * @return $this
      */
@@ -160,6 +163,7 @@ public function setStartValue($startValue)
     }
 
     /**
+     *
      * @param int $step
      * @return $this
      */
@@ -170,6 +174,7 @@ public function setStep($step)
     }
 
     /**
+     *
      * @param int $maxValue
      * @return $this
      */
@@ -180,6 +185,7 @@ public function setMaxValue($maxValue)
     }
 
     /**
+     *
      * @param int $warningValue
      * @return $this
      */

app/code/Magento/Store/Model/App/Emulation.php

@@ -144,7 +144,7 @@ public function startEnvironmentEmulation(
     ) {
         // Only allow a single level of emulation
         if ($this->initialEnvironmentInfo !== null) {
-            $this->logger->error(__('Environment emulation nesting is not allowed.'));
+            //$this->logger->error(__('Environment emulation nesting is not allowed.'));
             return;
         }