Merge remote-tracking branch 'origin/2.4-develop-fast-lane-prs' into 2.4-develop-fast-lane-prs

Author: slavvka

app/code/Magento/AsynchronousOperations/Model/BulkManagement.php

@@ -3,25 +3,26 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\AsynchronousOperations\Model;
 
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\ResourceConnection;
 use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
 use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory;
 use Magento\AsynchronousOperations\Api\Data\OperationInterface;
-use Magento\Framework\MessageQueue\BulkPublisherInterface;
-use Magento\Framework\EntityManager\EntityManager;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory;
 use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Bulk\BulkManagementInterface;
+use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\MessageQueue\BulkPublisherInterface;
+use Psr\Log\LoggerInterface;
 
 /**
- * Class BulkManagement
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * Asynchronous Bulk Management
  */
-class BulkManagement implements \Magento\Framework\Bulk\BulkManagementInterface
+class BulkManagement implements BulkManagementInterface
 {
     /**
      * @var EntityManager
@@ -54,12 +55,12 @@ class BulkManagement implements \Magento\Framework\Bulk\BulkManagementInterface
     private $resourceConnection;
 
     /**
-     * @var \Magento\Authorization\Model\UserContextInterface
+     * @var UserContextInterface
      */
     private $userContext;
 
     /**
-     * @var \Psr\Log\LoggerInterface
+     * @var LoggerInterface
      */
     private $logger;
 
@@ -71,7 +72,7 @@ class BulkManagement implements \Magento\Framework\Bulk\BulkManagementInterface
      * @param BulkPublisherInterface $publisher
      * @param MetadataPool $metadataPool
      * @param ResourceConnection $resourceConnection
-     * @param \Psr\Log\LoggerInterface $logger
+     * @param LoggerInterface $logger
      * @param UserContextInterface $userContext
      */
     public function __construct(
@@ -81,8 +82,8 @@ public function __construct(
         BulkPublisherInterface $publisher,
         MetadataPool $metadataPool,
         ResourceConnection $resourceConnection,
-        \Psr\Log\LoggerInterface $logger,
-        UserContextInterface $userContext = null
+        LoggerInterface $logger,
+        UserContextInterface $userContext
     ) {
         $this->entityManager = $entityManager;
         $this->bulkSummaryFactory= $bulkSummaryFactory;
@@ -91,7 +92,7 @@ public function __construct(
         $this->resourceConnection = $resourceConnection;
         $this->publisher = $publisher;
         $this->logger = $logger;
-        $this->userContext = $userContext ?: ObjectManager::getInstance()->get(UserContextInterface::class);
+        $this->userContext = $userContext;
     }
 
     /**

app/code/Magento/AsynchronousOperations/Model/MassConsumer.php

@@ -3,17 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AsynchronousOperations\Model;
 
-use Magento\Framework\Registry;
 use Magento\Framework\MessageQueue\CallbackInvokerInterface;
 use Magento\Framework\MessageQueue\ConsumerConfigurationInterface;
+use Magento\Framework\MessageQueue\ConsumerInterface;
 use Magento\Framework\MessageQueue\EnvelopeInterface;
 use Magento\Framework\MessageQueue\QueueInterface;
-use Magento\Framework\MessageQueue\ConsumerInterface;
+use Magento\Framework\Registry;
 
 /**
  * Class Consumer used to process OperationInterface messages.
@@ -28,19 +27,19 @@ class MassConsumer implements ConsumerInterface
     private $invoker;
 
     /**
-     * @var \Magento\Framework\MessageQueue\ConsumerConfigurationInterface
+     * @var ConsumerConfigurationInterface
      */
     private $configuration;
 
     /**
-     * @var Registry
+     * @var MassConsumerEnvelopeCallbackFactory
      */
-    private $registry;
+    private $massConsumerEnvelopeCallback;
 
     /**
-     * @var MassConsumerEnvelopeCallbackFactory
+     * @var Registry
      */
-    private $massConsumerEnvelopeCallback;
+    private $registry;
 
     /**
      * Initialize dependencies.
@@ -54,13 +53,12 @@ public function __construct(
         CallbackInvokerInterface $invoker,
         ConsumerConfigurationInterface $configuration,
         MassConsumerEnvelopeCallbackFactory $massConsumerEnvelopeCallback,
-        Registry $registry = null
+        Registry $registry
     ) {
         $this->invoker = $invoker;
         $this->configuration = $configuration;
         $this->massConsumerEnvelopeCallback = $massConsumerEnvelopeCallback;
-        $this->registry = $registry ?? \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(Registry::class);
+        $this->registry = $registry;
     }
 
     /**

app/code/Magento/AsynchronousOperations/Model/MassSchedule.php

@@ -3,24 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AsynchronousOperations\Model;
 
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\DataObject\IdentityGeneratorInterface;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\AsynchronousOperations\Api\Data\ItemStatusInterfaceFactory;
 use Magento\AsynchronousOperations\Api\Data\AsyncResponseInterface;
 use Magento\AsynchronousOperations\Api\Data\AsyncResponseInterfaceFactory;
 use Magento\AsynchronousOperations\Api\Data\ItemStatusInterface;
-use Magento\Framework\Bulk\BulkManagementInterface;
-use Magento\Framework\Exception\BulkException;
-use Psr\Log\LoggerInterface;
+use Magento\AsynchronousOperations\Api\Data\ItemStatusInterfaceFactory;
 use Magento\AsynchronousOperations\Model\ResourceModel\Operation\OperationRepository;
 use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Bulk\BulkManagementInterface;
+use Magento\Framework\DataObject\IdentityGeneratorInterface;
 use Magento\Framework\Encryption\Encryptor;
+use Magento\Framework\Exception\BulkException;
+use Magento\Framework\Exception\LocalizedException;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class MassSchedule used for adding multiple entities as Operations to Bulk Management with the status tracking
@@ -30,7 +28,7 @@
 class MassSchedule
 {
     /**
-     * @var \Magento\Framework\DataObject\IdentityGeneratorInterface
+     * @var IdentityGeneratorInterface
      */
     private $identityService;
 
@@ -45,7 +43,7 @@ class MassSchedule
     private $itemStatusInterfaceFactory;
 
     /**
-     * @var \Magento\Framework\Bulk\BulkManagementInterface
+     * @var BulkManagementInterface
      */
     private $bulkManagement;
 
@@ -60,7 +58,7 @@ class MassSchedule
     private $operationRepository;
 
     /**
-     * @var \Magento\Authorization\Model\UserContextInterface
+     * @var UserContextInterface
      */
     private $userContext;
 
@@ -79,7 +77,7 @@ class MassSchedule
      * @param LoggerInterface $logger
      * @param OperationRepository $operationRepository
      * @param UserContextInterface $userContext
-     * @param Encryptor|null $encryptor
+     * @param Encryptor $encryptor
      */
     public function __construct(
         IdentityGeneratorInterface $identityService,
@@ -88,17 +86,17 @@ public function __construct(
         BulkManagementInterface $bulkManagement,
         LoggerInterface $logger,
         OperationRepository $operationRepository,
-        UserContextInterface $userContext = null,
-        Encryptor $encryptor = null
+        UserContextInterface $userContext,
+        Encryptor $encryptor
     ) {
         $this->identityService = $identityService;
         $this->itemStatusInterfaceFactory = $itemStatusInterfaceFactory;
         $this->asyncResponseFactory = $asyncResponseFactory;
         $this->bulkManagement = $bulkManagement;
         $this->logger = $logger;
         $this->operationRepository = $operationRepository;
-        $this->userContext = $userContext ?: ObjectManager::getInstance()->get(UserContextInterface::class);
-        $this->encryptor = $encryptor ?: ObjectManager::getInstance()->get(Encryptor::class);
+        $this->userContext = $userContext;
+        $this->encryptor = $encryptor;
     }
 
     /**

app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultVideoBundleProductTest.xml

@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-110"/>
             <group value="Bundle"/>
+            <skip>
+                <issueId value="MC-32197"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>

app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductSettingsTest.xml

@@ -126,7 +126,7 @@
 
         <!-- Verify Url Key after changing -->
         <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage">
-            <argument name="productUrl" value="{{ApiBundleProduct.name}}"/>
+            <argument name="productUrl" value="{{ApiBundleProduct.urlKey}}"/>
         </actionGroup>
 
         <!-- Assert product design settings "Layout empty" -->

app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml

@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-205"/>
             <group value="Bundle"/>
+            <skip>
+                <issueId value="MC-32197"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>

app/code/Magento/Catalog/Block/Product/Image.php

@@ -14,7 +14,7 @@
  * @method string getHeight()
  * @method string getLabel()
  * @method float getRatio()
- * @method string getCustomAttributes()
+ * @method array getCustomAttributes()
  * @method string getClass()
  * @since 100.0.2
  */

app/code/Magento/Catalog/Block/Product/ImageFactory.php

@@ -68,20 +68,17 @@ public function __construct(
     }
 
     /**
-     * Retrieve image custom attributes for HTML element
+     * Remove class from custom attributes
      *
      * @param array $attributes
-     * @return string
+     * @return array
      */
-    private function getStringCustomAttributes(array $attributes): string
+    private function filterCustomAttributes(array $attributes): array
     {
-        $result = [];
-        foreach ($attributes as $name => $value) {
-            if ($name != 'class') {
-                $result[] = $name . '="' . $value . '"';
-            }
+        if (isset($attributes['class'])) {
+            unset($attributes['class']);
         }
-        return !empty($result) ? implode(' ', $result) : '';
+        return $attributes;
     }
 
     /**
@@ -170,7 +167,7 @@ public function create(Product $product, string $imageId, array $attributes = nu
                 'height' => $imageMiscParams['image_height'],
                 'label' => $this->getLabel($product, $imageMiscParams['image_type']),
                 'ratio' => $this->getRatio($imageMiscParams['image_width'] ?? 0, $imageMiscParams['image_height'] ?? 0),
-                'custom_attributes' => $this->getStringCustomAttributes($attributes),
+                'custom_attributes' => $this->filterCustomAttributes($attributes),
                 'class' => $this->getClass($attributes),
                 'product_id' => $product->getId()
             ],

app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml

@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-111"/>
             <group value="Catalog"/>
+            <skip>
+                <issueId value="MC-32197"/>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="EnableAdminAccountSharingActionGroup" stepKey="enableAdminAccountSharing"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoVirtualProductTest.xml

@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-109"/>
             <group value="Catalog"/>
+            <skip>
+                <issueId value="MC-32197"/>
+            </skip>
         </annotations>
 
         <!-- Replacing steps in base AdminAddDefaultVideoSimpleProductTest -->