Merge pull request #9814 from magento-cia/cia-2.4.9-alpha1-develop-bugfix-05222025

Cia Bugfix 2.4.9 alpha1 develop 05222025

Author: glo71317

app/code/Magento/Email/Model/Template/Filter.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -432,6 +432,10 @@ public function blockDirective($construction)
             $block->setDataUsingMethod($k, $v);
         }
 
+        if (!$block->hasData('cache_key')) {
+            $block->setDataUsingMethod('cache_key', $block->getCacheKey());
+        }
+
         if (isset($blockParameters['output'])) {
             $method = $blockParameters['output'];
         }

app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -15,12 +15,12 @@
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\DataObject;
-use Magento\Framework\Exception\MailException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\App\State;
 use Magento\Framework\Css\PreProcessor\Adapter\CssInliner;
+use Magento\Framework\DataObject;
 use Magento\Framework\Escaper;
+use Magento\Framework\Exception\MailException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\Read;
 use Magento\Framework\Filter\DirectiveProcessor\DependDirective;
@@ -34,16 +34,17 @@
 use Magento\Framework\View\Asset\File;
 use Magento\Framework\View\Asset\File\FallbackContext;
 use Magento\Framework\View\Asset\Repository;
+use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\LayoutFactory;
 use Magento\Framework\View\LayoutInterface;
+use Magento\Store\Model\Information as StoreInformation;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Variable\Model\Source\Variables;
 use Magento\Variable\Model\VariableFactory;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
-use Magento\Store\Model\Information as StoreInformation;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -623,4 +624,81 @@ public static function dataProviderUrlModelCompanyRedirect(): array
             ]
         ];
     }
+
+    /**
+     * Test block directive cache key functionality
+     *
+     * @param bool $hasCacheKey
+     * @param bool $expectGetCacheKey
+     * @param bool $expectSetData
+     * @dataProvider blockDirectiveCacheKeyDataProvider
+     */
+    public function testBlockDirectiveCacheKey($hasCacheKey, $expectGetCacheKey, $expectSetData)
+    {
+        $block = $this->getMockBuilder(AbstractBlock::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->layout->expects($this->once())
+            ->method('createBlock')
+            ->willReturn($block);
+
+        $block->expects($this->once())
+            ->method('hasData')
+            ->with('cache_key')
+            ->willReturn($hasCacheKey);
+
+        if ($expectGetCacheKey) {
+            $block->expects($this->once())
+                ->method('getCacheKey')
+                ->willReturn('test_cache_key');
+        } else {
+            $block->expects($this->never())
+                ->method('getCacheKey');
+        }
+
+        if ($expectSetData) {
+            $block->expects($this->once())
+                ->method('setDataUsingMethod')
+                ->with('cache_key', 'test_cache_key');
+        } else {
+            $block->expects($this->never())
+                ->method('setDataUsingMethod');
+        }
+
+        $block->expects($this->once())
+            ->method('toHtml')
+            ->willReturn('block html');
+
+        $construction = [
+            '{{block class="Magento\\Framework\\View\\Element\\AbstractBlock"}}',
+            'block',
+            ' class="Magento\\Framework\\View\\Element\\AbstractBlock"'
+        ];
+
+        $filter = $this->getModel();
+        $result = $filter->blockDirective($construction);
+        $this->assertEquals('block html', $result);
+    }
+
+    /**
+     * Data provider for testBlockDirectiveCacheKey
+     *
+     * @return array
+     */
+    public static function blockDirectiveCacheKeyDataProvider()
+    {
+        return [
+            'block without cache key' => [
+                'hasCacheKey' => false,
+                'expectGetCacheKey' => true,
+                'expectSetData' => true
+            ],
+            'block with existing cache key' => [
+                'hasCacheKey' => true,
+                'expectGetCacheKey' => false,
+                'expectSetData' => false
+            ]
+        ];
+    }
 }