🔃 [Magento Community Engineering] Community Contributions - 2.4-develop latest changes

Accepted Community Pull Requests:
 - #32186: Customers that have unsubscribed to the newsletter in the time span from when the queue was created and the actual sending of the newsletter still receive newsletters (by @engcom-Charlie)
 - #32273: `catalog_product_entity_media_gallery` not cleared when related products deleted. (by @engcom-Charlie)
 - #30755: MC-38592 Fixed load regions for scope (by @bogutskyy)
 - #31961: Removed CliCacheFlushActionGroup usage for Wishlist module (by @sergiy-v)
 - #32212: Magento_Authorization model Rules/Role calling a resource model function update, that is not exist in resource model(Rules/Role) (by @engcom-Charlie)
 - #28973: Scheduled price rule time zone correction (by @AntonEvers)
 - #32389: Update ListProduct.php (by @mamsincl)


Fixed GitHub Issues:
 - #32116: Customers that have unsubscribed to the newsletter in the time span from when the queue was created and the actual sending of the newsletter still receive newsletters (reported by @victortodoran) has been fixed in #32186 by @engcom-Charlie in 2.4-develop branch
   Related commits:
     1. 35468fc
     2. 23bfcdd
     3. d594fa7
     4. 0ecec5d
     5. d98dc43
     6. ec464f5
     7. 64066c4
     8. f3c3a1d

 - #17727: `catalog_product_entity_media_gallery` not cleared when related products deleted. (reported by @likemusic) has been fixed in #32273 by @engcom-Charlie in 2.4-develop branch
   Related commits:
     1. b2c47af
     2. b40d857
     3. 98237f1

 - #30577: Can't place order on admin: "regionId" is required (reported by @kassner) has been fixed in #30755 by @bogutskyy in 2.4-develop branch
   Related commits:
     1. e8507db
     2. 228cb68
     3. 4e48a7a
     4. 165a1c1
     5. 3bfc316
     6. b611bae
     7. cbe1cd9
     8. ef066ad
     9. 95bf7dc
     10. ee50311
     11. 9e061d1

 - #31962: [Issue] Removed CliCacheFlushActionGroup usage for Wishlist module (reported by @m2-assistant[bot]) has been fixed in #31961 by @sergiy-v in 2.4-develop branch
   Related commits:
     1. 020bc36
     2. 9437843
     3. b629ddb
     4. f1fdf84

 - #30756: Magento_Authorization model Rules/Role calling a resource model function update, that is not exist in resource model(Rules/Role)   (reported by @narendrarwt) has been fixed in #32212 by @engcom-Charlie in 2.4-develop branch
   Related commits:
     1. 8615941

 - #29549: [Issue] Scheduled price rule time zone correction (reported by @m2-assistant[bot]) has been fixed in #28973 by @AntonEvers in 2.4-develop branch
   Related commits:
     1. 5972daa
     2. 0e68e70
     3. c7def24
     4. c614f89
     5. 3cbc4f6
     6. 46a769f
     7. d9a0f6f
     8. 6bf3dfc
     9. f2d7be3
     10. 6eef782
     11. d6b3c40
     12. fa821da
     13. ee7176f

 - #32088: ArrayIterator incompatible method current() php 7.4 (reported by @jeroenkosse) has been fixed in #32389 by @mamsincl in 2.4-develop branch
   Related commits:
     1. e5b3bb3
     2. b13fcbb

Author: gabrieldagama

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>