MC-18977: Revert change of ENGCOM-3260

- fix static failures

Author: krissyhiserote

app/code/Magento/Catalog/Block/Product/ProductList/Related.php

@@ -141,6 +141,7 @@ public function getIdentities()
     {
         $identities = [];
         foreach ($this->getItems() as $item) {
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $identities = array_merge($identities, $item->getIdentities());
         }
         return $identities;

app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php

@@ -264,6 +264,7 @@ public function getIdentities()
     {
         $identities = [];
         foreach ($this->getItems() as $item) {
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $identities = array_merge($identities, $item->getIdentities());
         }
         return $identities;

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

@@ -837,6 +837,7 @@ public function getStoreIds()
                 }
                 foreach ($websiteIds as $websiteId) {
                     $websiteStores = $this->_storeManager->getWebsite($websiteId)->getStoreIds();
+                    // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                     $storeIds = array_merge($storeIds, $websiteStores);
                 }
             }

app/code/Magento/Tax/Model/App/Action/ContextPlugin.php

@@ -52,6 +52,8 @@ class ContextPlugin
      * @param \Magento\Tax\Helper\Data $taxHelper
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\PageCache\Model\Config $cacheConfig
+     *
+     * phpcs:ignore Magento2.Classes.DiscouragedDependencies
      */
     public function __construct(
         \Magento\Customer\Model\Session $customerSession,