Merge remote-tracking branch 'origin/2.4-develop' into MQE-2538

Author: ysapiga

app/code/Magento/Authorization/Model/Role.php

@@ -5,28 +5,32 @@
  */
 namespace Magento\Authorization\Model;
 
+use Magento\Authorization\Model\ResourceModel\Role\Collection;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Model\AbstractModel;
+
 /**
  * Admin Role Model
  *
  * @api
  * @method int getParentId()
- * @method \Magento\Authorization\Model\Role setParentId(int $value)
+ * @method Role setParentId(int $value)
  * @method int getTreeLevel()
- * @method \Magento\Authorization\Model\Role setTreeLevel(int $value)
+ * @method Role setTreeLevel(int $value)
  * @method int getSortOrder()
- * @method \Magento\Authorization\Model\Role setSortOrder(int $value)
+ * @method Role setSortOrder(int $value)
  * @method string getRoleType()
- * @method \Magento\Authorization\Model\Role setRoleType(string $value)
+ * @method Role setRoleType(string $value)
  * @method int getUserId()
- * @method \Magento\Authorization\Model\Role setUserId(int $value)
+ * @method Role setUserId(int $value)
  * @method string getUserType()
- * @method \Magento\Authorization\Model\Role setUserType(string $value)
+ * @method Role setUserType(string $value)
  * @method string getRoleName()
- * @method \Magento\Authorization\Model\Role setRoleName(string $value)
+ * @method Role setRoleName(string $value)
  * @api
  * @since 100.0.2
  */
-class Role extends \Magento\Framework\Model\AbstractModel
+class Role extends AbstractModel
 {
     /**
      * @var string
@@ -38,23 +42,6 @@ class Role extends \Magento\Framework\Model\AbstractModel
      */
     protected $_cacheTag = 'user_assigned_role';
 
-    /**
-     * @param \Magento\Framework\Model\Context $context
-     * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Authorization\Model\ResourceModel\Role $resource
-     * @param \Magento\Authorization\Model\ResourceModel\Role\Collection $resourceCollection
-     * @param array $data
-     */
-    public function __construct( //phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod
-        \Magento\Framework\Model\Context $context,
-        \Magento\Framework\Registry $registry,
-        \Magento\Authorization\Model\ResourceModel\Role $resource,
-        \Magento\Authorization\Model\ResourceModel\Role\Collection $resourceCollection,
-        array $data = []
-    ) {
-        parent::__construct($context, $registry, $resource, $resourceCollection, $data);
-    }
-
     /**
      * @inheritDoc
      */
@@ -70,31 +57,30 @@ public function __sleep()
     public function __wakeup()
     {
         parent::__wakeup();
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-        $this->_resource = $objectManager->get(\Magento\Authorization\Model\ResourceModel\Role::class);
-        $this->_resourceCollection = $objectManager->get(
-            \Magento\Authorization\Model\ResourceModel\Role\Collection::class
-        );
+        $objectManager = ObjectManager::getInstance();
+        $this->_resource = $objectManager->get(ResourceModel\Role::class);
+        $this->_resourceCollection = $objectManager->get(Collection::class);
     }
 
     /**
-     * Class constructor
-     *
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
-        $this->_init(\Magento\Authorization\Model\ResourceModel\Role::class);
+        $this->_init(ResourceModel\Role::class);
     }
 
     /**
-     * Update object into database
+     * Obsolete method of update
      *
      * @return $this
+     * @deprecated Method was never implemented and used.
      */
     public function update()
     {
-        $this->getResource()->update($this);
+        // phpcs:disable Magento2.Functions.DiscouragedFunction
+        trigger_error('Method was never implemented and used.', E_USER_DEPRECATED);
+
         return $this;
     }
 

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

@@ -461,7 +461,7 @@ private function initializeProductCollection()
             // if the product is associated with any category
             if ($categories->count()) {
                 // show products from this category
-                $this->setCategoryId(current($categories->getIterator())->getId());
+                $this->setCategoryId($categories->getIterator()->current()->getId());
             }
         }
 

app/code/Magento/Catalog/Plugin/RemoveImagesFromGalleryAfterRemovingProduct.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Plugin;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Gallery\ReadHandler;
+use Magento\Catalog\Model\ResourceModel\Product\Gallery;
+
+/**
+ * Responsible for deleting images from media gallery after deleting product
+ */
+class RemoveImagesFromGalleryAfterRemovingProduct
+{
+    /**
+     * @var Gallery
+     */
+    private $galleryResource;
+
+    /**
+     * @var ReadHandler
+     */
+    private $mediaGalleryReadHandler;
+
+    /**
+     * @param Gallery $galleryResource
+     * @param ReadHandler $mediaGalleryReadHandler
+     */
+    public function __construct(Gallery $galleryResource, ReadHandler $mediaGalleryReadHandler)
+    {
+        $this->galleryResource = $galleryResource;
+        $this->mediaGalleryReadHandler = $mediaGalleryReadHandler;
+    }
+
+    /**
+     * Delete media gallery after deleting product
+     *
+     * @param ProductRepositoryInterface $subject
+     * @param callable $proceed
+     * @param ProductInterface $product
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundDelete(
+        ProductRepositoryInterface $subject,
+        callable $proceed,
+        ProductInterface $product
+    ): bool {
+        $mediaGalleryAttributeId = $this->mediaGalleryReadHandler->getAttribute()->getAttributeId();
+        $mediaGallery = $this->galleryResource->loadProductGalleryByAttributeId($product, $mediaGalleryAttributeId);
+
+        $result = $proceed($product);
+
+        if ($mediaGallery) {
+            $this->galleryResource->deleteGallery(array_column($mediaGallery, 'value_id'));
+        }
+
+        return $result;
+    }
+}

app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php

@@ -195,7 +195,7 @@ public function testGetIdentities()
 
         $this->catCollectionMock->expects($this->once())
             ->method('getIterator')
-            ->willReturn([$currentCategory]);
+            ->willReturn(new \ArrayIterator([$currentCategory]));
 
         $this->prodCollectionMock->expects($this->any())
             ->method('getIterator')

app/code/Magento/Catalog/etc/di.xml

@@ -1319,4 +1319,8 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Api\ProductRepositoryInterface">
+        <plugin name="remove_images_from_gallery_after_removing_product"
+                type="Magento\Catalog\Plugin\RemoveImagesFromGalleryAfterRemovingProduct"/>
+    </type>
 </config>