Merge pull request #6461 from magento-performance/MC-39959

MC-39959: [AWS S3] Bug fixes

Author: joanhe

app/code/Magento/Captcha/Cron/DeleteExpiredImages.php

@@ -6,6 +6,7 @@
 namespace Magento\Captcha\Cron;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\DriverPool;
 
 /**
  * Captcha cron actions
@@ -48,7 +49,7 @@ public function __construct(
     ) {
         $this->_helper = $helper;
         $this->_adminHelper = $adminHelper;
-        $this->_mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->_mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA, DriverPool::FILE);
         $this->_storeManager = $storeManager;
     }
 

app/code/Magento/Catalog/Model/Config/CatalogMediaConfig.php

@@ -16,8 +16,8 @@ class CatalogMediaConfig
 {
     private const XML_PATH_CATALOG_MEDIA_URL_FORMAT = 'web/url/catalog_media_url_format';
 
-    const IMAGE_OPTIMIZATION_PARAMETERS = 'image_optimization_parameters';
-    const HASH = 'hash';
+    public const IMAGE_OPTIMIZATION_PARAMETERS = 'image_optimization_parameters';
+    public const HASH = 'hash';
 
     /**
      * @var ScopeConfigInterface
@@ -41,10 +41,16 @@ public function __construct(ScopeConfigInterface $scopeConfig)
      */
     public function getMediaUrlFormat($scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null): string
     {
-        return $this->scopeConfig->getValue(
-            CatalogMediaConfig::XML_PATH_CATALOG_MEDIA_URL_FORMAT,
+        $value = $this->scopeConfig->getValue(
+            self::XML_PATH_CATALOG_MEDIA_URL_FORMAT,
             $scopeType,
             $scopeCode
         );
+
+        if ($value === null) {
+            return self::HASH;
+        }
+
+        return (string)$value;
     }
 }