Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into 04-29-24-Tier4-Bugfix-Delivery

Author: thiaramus

app/code/Magento/Catalog/Model/Category/FileInfo.php

@@ -14,14 +14,15 @@
 use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem\ExtendedDriverInterface;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class FileInfo
  *
  * Provides information about requested file
  */
-class FileInfo
+class FileInfo implements ResetAfterRequestInterface
 {
     /**
      * Path in /pub/media directory
@@ -31,12 +32,12 @@ class FileInfo
     /**
      * @var Filesystem
      */
-    private $filesystem;
+    private readonly Filesystem $filesystem;
 
     /**
      * @var Mime
      */
-    private $mime;
+    private readonly Mime $mime;
 
     /**
      * @var WriteInterface
@@ -56,7 +57,7 @@ class FileInfo
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
      */
-    private $storeManager;
+    private readonly StoreManagerInterface $storeManager;
 
     /**
      * @param Filesystem $filesystem
@@ -73,6 +74,16 @@ public function __construct(
         $this->storeManager = $storeManager;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->mediaDirectory = null;
+        $this->baseDirectory = null;
+        $this->pubDirectory = null;
+    }
+
     /**
      * Get WriteInterface instance
      *

app/code/Magento/RemoteStorage/Driver/Adapter/Cache/Generic.php

@@ -8,13 +8,14 @@
 namespace Magento\RemoteStorage\Driver\Adapter\Cache;
 
 use Magento\Framework\App\CacheInterface as MagentoCacheInterface;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\RemoteStorage\Driver\Adapter\PathUtil;
 
 /**
  * Generic cache implementation for filesystem storage.
  */
-class Generic implements CacheInterface
+class Generic implements CacheInterface, ResetAfterRequestInterface
 {
     /**
      * @var array
@@ -66,6 +67,15 @@ public function __construct(
         $this->pathUtil = $pathUtil;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->cacheData = [];
+        $this->cachePathPurgeQueue = [];
+    }
+
     /**
      * @inheritdoc
      */