Merge branch 'AC-9831' into cia-2.4.7-beta3-develop-bugfix-11302023

Author: pawan-adobe-security

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

@@ -81,11 +81,6 @@ class Filter extends Template
      */
     protected $_modifiers = ['nl2br' => ''];
 
-    /**
-     * @var string
-     */
-    private const CACHE_KEY_PREFIX = "EMAIL_FILTER_";
-
     /**
      * @var bool
      */
@@ -414,10 +409,6 @@ public function blockDirective($construction)
         $skipParams = ['class', 'id', 'output'];
         $blockParameters = $this->getParameters($construction[2]);
 
-        if (isset($blockParameters['cache_key'])) {
-            $blockParameters['cache_key'] = self::CACHE_KEY_PREFIX . $blockParameters['cache_key'];
-        }
-
         $block = null;
 
         if (isset($blockParameters['class'])) {

lib/internal/Magento/Framework/Filter/Template/Tokenizer/Parameter.php

@@ -25,7 +25,7 @@ public function tokenize()
             }
 
             if ($this->char() !== '=') {
-                $parameterName .= strtolower($this->char());
+                $parameterName .= $this->char();
             } else {
                 $parameters[$parameterName] = $this->getValue();
                 $parameterName = '';

lib/internal/Magento/Framework/View/Element/AbstractBlock.php

@@ -12,6 +12,7 @@
 use Magento\Framework\Cache\LockGuardedCacheLoader;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\DataObject\IdentityInterface;
+use Magento\Framework\Exception\RuntimeException;
 
 /**
  * Base class for all blocks.
@@ -1043,17 +1044,13 @@ public function getCacheKeyInfo()
      * Get Key for caching block content
      *
      * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws RuntimeException
      */
     public function getCacheKey()
     {
         if ($this->hasData('cache_key')) {
             if (preg_match('/[^a-z0-9\-\_]/i', $this->getData('cache_key'))) {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    __(
-                        'Please enter cache key with only alphanumeric or hash string.'
-                    )
-                );
+                throw new RuntimeException(__('Please enter cache key with only alphanumeric or hash string.'));
             }
 
             return static::CUSTOM_CACHE_KEY_PREFIX . $this->getData('cache_key');

lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php

@@ -15,7 +15,7 @@
 use Magento\Framework\Config\View;
 use Magento\Framework\Escaper;
 use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\RuntimeException;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\Session\SidResolverInterface;
@@ -246,13 +246,13 @@ public function testGetCacheKey()
     /**
      * Test for invalid cacheKey name
      * @return void
-     * @throws LocalizedException
+     * @throws RuntimeException
      */
     public function testGetCacheKeyFail(): void
     {
         $cacheKey = "test&''Key";
         $this->block->setData('cache_key', $cacheKey);
-        $this->expectException(LocalizedException::class);
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage((string)__('Please enter cache key with only alphanumeric or hash string.'));
         $this->block->getCacheKey();
     }