MC-18527: Merge release branch into 2.3-develop

- fix static test failures

Author: krissyhiserote

app/code/Magento/AdminAnalytics/Model/ResourceModel/Viewer/Logger.php

@@ -18,9 +18,6 @@
  */
 class Logger
 {
-    /**
-     * Log table name
-     */
     const LOG_TABLE_NAME = 'admin_analytics_usage_version_log';
 
     /**

app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php

@@ -15,6 +15,7 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @since 100.0.2
  */
 class ListCompare extends \Magento\Framework\DataObject

app/code/Magento/Catalog/Test/Unit/Ui/Component/ColumnFactoryTest.php

@@ -67,9 +67,10 @@ protected function setUp(): void
         $this->uiComponentFactory->method('create')
             ->willReturn($this->column);
 
-        $this->columnFactory = $this->objectManager->getObject(ColumnFactory::class, [
-            'componentFactory' => $this->uiComponentFactory
-        ]);
+        $this->columnFactory = $this->objectManager->getObject(
+            ColumnFactory::class,
+            ['componentFactory' => $this->uiComponentFactory]
+        );
     }
 
     /**

app/code/Magento/Catalog/Ui/Component/Product/MassAction.php

@@ -52,6 +52,7 @@ public function prepare() : void
         foreach ($this->getChildComponents() as $actionComponent) {
             $actionType = $actionComponent->getConfiguration()['type'];
             if ($this->isActionAllowed($actionType)) {
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $config['actions'][] = array_merge($actionComponent->getConfiguration(), ['__disableTmpl' => true]);
             }
         }

app/code/Magento/Customer/Model/Visitor.php

@@ -265,7 +265,7 @@ public function bindCustomerLogout($observer)
      * Create binding of checkout quote
      *
      * @param \Magento\Framework\Event\Observer $observer
-     * @return  \Magento\Customer\Model\Visitor
+     * @return \Magento\Customer\Model\Visitor
      */
     public function bindQuoteCreate($observer)
     {
@@ -283,7 +283,7 @@ public function bindQuoteCreate($observer)
      * Destroy binding of checkout quote
      *
      * @param \Magento\Framework\Event\Observer $observer
-     * @return  \Magento\Customer\Model\Visitor
+     * @return \Magento\Customer\Model\Visitor
      */
     public function bindQuoteDestroy($observer)
     {

app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php

@@ -19,29 +19,14 @@
  */
 class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
 {
-    /**
-     * Pair value separator.
-     */
     const PAIR_VALUE_SEPARATOR = '=';
 
-    /**
-     * Default sort order
-     */
     const DEFAULT_SORT_ORDER = 0;
 
-    /**
-     * Default number of downloads
-     */
     const DEFAULT_NUMBER_OF_DOWNLOADS = 0;
 
-    /**
-     * Default is shareable
-     */
     const DEFAULT_IS_SHAREABLE = 2;
 
-    /**
-     * Default website id
-     */
     const DEFAULT_WEBSITE_ID = 0;
 
     /**
@@ -79,9 +64,6 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      */
     const COL_DOWNLOADABLE_LINKS = 'downloadable_links';
 
-    /**
-     * Default group title
-     */
     const DEFAULT_GROUP_TITLE = '';
 
     /**
@@ -786,6 +768,7 @@ protected function prepareSampleData($rowCol, $entityId = null)
             $rowCol
         );
         foreach ($options as $option) {
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $result[] = array_merge(
                 $this->dataSample,
                 ['product_id' => $entityId],
@@ -810,6 +793,7 @@ protected function prepareLinkData($rowCol, $entityId = null)
             $rowCol
         );
         foreach ($options as $option) {
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $result[] = array_merge(
                 $this->dataLink,
                 ['product_id' => $entityId],

app/code/Magento/ImportExport/Model/Import.php

@@ -107,9 +107,6 @@ class Import extends AbstractModel
      */
     const DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR = ',';
 
-    /**
-     * default empty attribute value constant
-     */
     const DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT = '__EMPTY__VALUE__';
     const DEFAULT_SIZE = 50;
     const MAX_IMPORT_CHUNKS = 4;