ACPT-1052: Some Luma Storefront Scenarios Are Broken

 - fix  review comments

Author: andimov

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

@@ -25,9 +25,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CategoryRepository implements
-    CategoryRepositoryInterface,
-    ResetAfterRequestInterface
+class CategoryRepository implements CategoryRepositoryInterface, ResetAfterRequestInterface
 {
     /**
      * @var Category[]

app/code/Magento/Catalog/Model/ResourceModel/Attribute/WebsiteAttributesSynchronizer.php

@@ -420,14 +420,9 @@ private function getPlaceholderValues(array $insertions)
     {
         $placeholderValues = [];
         foreach ($insertions as $insertion) {
-            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
-            $placeholderValues = array_merge(
-                $placeholderValues,
-                $insertion
-            );
+            $placeholderValues[] = $insertion;
         }
-
-        return $placeholderValues;
+        return array_merge(...$placeholderValues);
     }
 
     /**

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

@@ -852,7 +852,7 @@ protected function _afterDelete(DataObject $object)
      */
     public function _resetState(): void
     {
-        parent::_resetState(); // TODO: Change the autogenerated stub
+        parent::_resetState();
         $this->availableCategoryIdsCache = [];
     }
 }

app/code/Magento/Catalog/Model/ResourceModel/Url.php

@@ -10,11 +10,11 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Catalog\Api\Data\CategoryInterface;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
+use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**

app/code/Magento/Directory/Model/Country.php

@@ -212,10 +212,10 @@ public function getFormat($type)
     /**
      * Get country name
      *
-     * @param ?string $locale
+     * @param mixed $locale
      * @return string
      */
-    public function getName(string $locale = null)
+    public function getName($locale = null)
     {
         if ($locale == null) {
             $cache_key = 'name_default';

app/code/Magento/GraphQlCache/Controller/Plugin/GraphQl.php

@@ -62,7 +62,7 @@ class GraphQl
      * @param LoggerInterface $logger
      * @param HttpRequestProcessor $requestProcessor
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @param ResponseHttp $response @deprecated do not useʼ
+     * @param ResponseHttp $response @deprecated do not use
      * @param Registry $registry
      */
     public function __construct(

lib/internal/Magento/Framework/GraphQl/Query/Fields.php

@@ -10,8 +10,8 @@
 use GraphQL\Language\AST\DocumentNode;
 use GraphQL\Language\AST\Node;
 use GraphQL\Language\AST\NodeKind;
-use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * This class holds a list of all queried fields and is used to enable performance optimization for schema loading.

lib/internal/Magento/Framework/View/Asset/Repository.php

@@ -6,12 +6,12 @@
 
 namespace Magento\Framework\View\Asset;
 
-use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
-use Magento\Framework\UrlInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
 
 /**
  * A repository service for view assets