ACP2E-3781: Exception 'Cannot create rendition for media asset paths' during image insertion

soklymeach · soklymeach · commit e629c0e2ee03 · 2025-03-26T10:30:47.000-05:00
diff --git a/app/code/Magento/MediaGalleryRenditions/Model/Config.php b/app/code/Magento/MediaGalleryRenditions/Model/Config.php
@@ -81,13 +81,9 @@ public function isEnabled(): bool
      */
     public function getWidth(): int
     {
-        try {
-            return $this->getDatabaseValue(self::XML_PATH_MEDIA_GALLERY_RENDITIONS_WIDTH_PATH);
-        } catch (NoSuchEntityException $exception) {
-            $configData = $this->initialConfig->getData('default');
-            $width = $configData['system']['media_gallery_renditions']['width'] ?? 0;
-            return (int) $width;
-        }
+        $width = $this->scopeConfig->getValue(self::XML_PATH_MEDIA_GALLERY_RENDITIONS_WIDTH_PATH)
+            ?? $this->initialConfig->getData('default')['system']['media_gallery_renditions']['width'];
+        return (int)$width;
     }
 
     /**
@@ -97,46 +93,8 @@ public function getWidth(): int
      */
     public function getHeight(): int
     {
-        try {
-            return $this->getDatabaseValue(self::XML_PATH_MEDIA_GALLERY_RENDITIONS_HEIGHT_PATH);
-        } catch (NoSuchEntityException $exception) {
-            $configData = $this->initialConfig->getData('default');
-            $height = $configData['system']['media_gallery_renditions']['height'] ?? 0;
-            return (int) $height;
-        }
-    }
-
-    /**
-     * Get value from database bypassing config cache
-     *
-     * @param string $path
-     * @return int
-     * @throws NoSuchEntityException
-     */
-    private function getDatabaseValue(string $path): int
-    {
-        $connection = $this->resourceConnection->getConnection();
-        $select = $connection->select()
-            ->from(
-                [
-                    'config' => $this->resourceConnection->getTableName(self::TABLE_CORE_CONFIG_DATA)
-                ],
-                [
-                    'value'
-                ]
-            )
-            ->where('config.path = ?', $path);
-        $value = $connection->query($select)->fetchColumn();
-
-        if ($value === false || $value === null) {
-            throw new NoSuchEntityException(
-                __(
-                    'The config value for %path is not saved to database.',
-                    ['path' => $path]
-                )
-            );
-        }
-
-        return (int) $value;
+        $height = $this->scopeConfig->getValue(self::XML_PATH_MEDIA_GALLERY_RENDITIONS_HEIGHT_PATH)
+            ?? $this->initialConfig->getData('default')['system']['media_gallery_renditions']['height'];
+        return (int)$height;
     }
 }
diff --git a/app/code/Magento/MediaGalleryRenditions/Test/Unit/Model/ConfigTest.php b/app/code/Magento/MediaGalleryRenditions/Test/Unit/Model/ConfigTest.php
@@ -10,8 +10,6 @@
 use Magento\Framework\App\Config\Initial;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\DB\Select;
 use Magento\MediaGalleryRenditions\Model\Config;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -38,30 +36,11 @@ class ConfigTest extends TestCase
      */
     private $config;
 
-    /**
-     * @var AdapterInterface|MockObject
-     */
-    private $connectionMock;
-
-    /**
-     * @var Select|MockObject
-     */
-    private $selectMock;
-
     protected function setUp(): void
     {
         $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
         $this->initialConfigMock = $this->createMock(Initial::class);
         $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
-        $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)
-            ->addMethods(['fetchColumn'])
-            ->getMockForAbstractClass();
-        $this->selectMock = $this->createMock(Select::class);
-        $this->resourceConnectionMock->method('getConnection')
-            ->willReturn($this->connectionMock);
-        $this->resourceConnectionMock->method('getTableName')
-            ->with('core_config_data')
-            ->willReturn('core_config_data');
         $this->config = new Config(
             $this->scopeConfigMock,
             $this->initialConfigMock,
@@ -70,43 +49,29 @@ protected function setUp(): void
     }
 
     /**
-     * Test getWidth() with successful database retrieval
+     * Test getWidth() using scopeConfig value
      */
-    public function testGetWidthSuccess(): void
+    public function testGetWidthFromScopeConfig(): void
     {
         $expectedWidth = 800;
-        $this->connectionMock->method('select')
-            ->willReturn($this->selectMock);
-        $this->selectMock->method('from')
-            ->willReturnSelf();
-        $this->selectMock->method('where')
-            ->willReturnSelf();
-        $this->connectionMock->method('query')
-            ->with($this->selectMock)
-            ->willReturnSelf();
-        $this->connectionMock->method('fetchColumn')
-            ->willReturn((string)$expectedWidth);
+        $widthPath = 'system/media_gallery_renditions/width';
+        $this->scopeConfigMock->method('getValue')
+            ->with($widthPath)
+            ->willReturn($expectedWidth);
         $result = $this->config->getWidth();
         $this->assertEquals($expectedWidth, $result);
     }
 
     /**
-     * Test getWidth() with empty database result falling back to initial config
+     * Test getWidth() falling back to initial config
      */
-    public function testGetWidthFallback(): void
+    public function testGetWidthFromInitialConfig(): void
     {
         $expectedWidth = 600;
-        $this->connectionMock->method('select')
-            ->willReturn($this->selectMock);
-        $this->selectMock->method('from')
-            ->willReturnSelf();
-        $this->selectMock->method('where')
-            ->willReturnSelf();
-        $this->connectionMock->method('query')
-            ->with($this->selectMock)
-            ->willReturnSelf();
-        $this->connectionMock->method('fetchColumn')
-            ->willReturn(false);
+        $widthPath = 'system/media_gallery_renditions/width';
+        $this->scopeConfigMock->method('getValue')
+            ->with($widthPath)
+            ->willReturn(null);
         $this->initialConfigMock->method('getData')
             ->with('default')
             ->willReturn([
@@ -121,42 +86,28 @@ public function testGetWidthFallback(): void
     }
 
     /**
-     * Test getHeight() with successful database retrieval
+     * Test getHeight() using scopeConfig value
      */
-    public function testGetHeightSuccess(): void
+    public function testGetHeightFromScopeConfig(): void
     {
         $expectedHeight = 600;
-        $this->connectionMock->method('select')
-            ->willReturn($this->selectMock);
-        $this->selectMock->method('from')
-            ->willReturnSelf();
-        $this->selectMock->method('where')
-            ->willReturnSelf();
-        $this->connectionMock->method('query')
-            ->with($this->selectMock)
-            ->willReturnSelf();
-        $this->connectionMock->method('fetchColumn')
-            ->willReturn((string)$expectedHeight);
+        $heightPath = 'system/media_gallery_renditions/height';
+        $this->scopeConfigMock->method('getValue')
+            ->with($heightPath)
+            ->willReturn($expectedHeight);
         $result = $this->config->getHeight();
         $this->assertEquals($expectedHeight, $result);
     }
 
     /**
-     * Test getHeight() with empty database result falling back to initial config
+     * Test getHeight() falling back to initial config
      */
-    public function testGetHeightFallback(): void
+    public function testGetHeightFromInitialConfig(): void
     {
         $expectedHeight = 400;
-        $this->connectionMock->method('select')
-            ->willReturn($this->selectMock);
-        $this->selectMock->method('from')
-            ->willReturnSelf();
-        $this->selectMock->method('where')
-            ->willReturnSelf();
-        $this->connectionMock->method('query')
-            ->with($this->selectMock)
-            ->willReturnSelf();
-        $this->connectionMock->method('fetchColumn')
+        $heightPath = 'system/media_gallery_renditions/height';
+        $this->scopeConfigMock->method('getValue')
+            ->with($heightPath)
             ->willReturn(null);
         $this->initialConfigMock->method('getData')
             ->with('default')
diff --git a/app/code/Magento/MediaGalleryRenditions/etc/adminhtml/system.xml b/app/code/Magento/MediaGalleryRenditions/etc/adminhtml/system.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
@@ -18,12 +18,12 @@
                     Changing these settings will update all generated images.</comment>
                 <field id="width" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Maximum Width</label>
-                    <validate>validate-zero-or-greater validate-digits</validate>
+                    <validate>validate-zero-or-greater validate-digits required-entry</validate>
                     <comment>Enter the maximum width of an image in pixels.</comment>
                 </field>
                 <field id="height" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Maximum Height</label>
-                    <validate>validate-zero-or-greater validate-digits</validate>
+                    <validate>validate-zero-or-greater validate-digits required-entry</validate>
                     <comment>Enter the maximum height of an image in pixels.</comment>
                 </field>
             </group>
