AC-9831: Block template render enhancement

Author: rizwankhgl

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

@@ -514,6 +514,11 @@ protected function getParameters($value)
         $tokenizer->setString($value);
         $params = $tokenizer->tokenize();
         foreach ($params as $key => $value) {
+            $validKey = strtolower($key);
+            if(strcmp($key,$validKey)) {
+                $params[$validKey] = $value;
+                unset($params[$key]);
+            }
             if ($value !== null && substr($value, 0, 1) === '$') {
                 $params[$key] = $this->getVariable(substr($value, 1), null);
             }

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

@@ -41,6 +41,11 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      */
     public const CACHE_KEY_PREFIX = 'BLOCK_';
 
+    /**
+     * Prefix for custom cache key of block
+     */
+    public const CUSTOM_CACHE_KEY_PREFIX = 'CUSTOM_BLOCK_';
+
     /**
      * @var \Magento\Framework\View\DesignInterface
      */
@@ -1042,7 +1047,7 @@ public function getCacheKeyInfo()
     public function getCacheKey()
     {
         if ($this->hasData('cache_key')) {
-            return static::CACHE_KEY_PREFIX . $this->getData('cache_key');
+            return static::CUSTOM_CACHE_KEY_PREFIX . $this->getData('cache_key');
         }
 
         /**

lib/internal/Magento/Framework/View/Element/Html/Link.php

@@ -184,6 +184,7 @@ private function renderSpecialAttributes(): string
                 );
             }
         }
-        return $this->_escaper->escapeJsQuote($html);
+
+        return $html;
     }
 }

lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php

@@ -161,14 +161,11 @@ public function testLinkHtml(): void
         $this->link->setDataUsingMethod('style', 'display: block;');
         $this->link->setDataUsingMethod('onclick', 'alert("clicked");');
 
-        /** @var Escaper $escaper */
-        $escaper = $this->objectManager->getObject(Escaper::class);
-
         $html = $this->link->toHtml();
         $this->assertEquals(
-            $escaper->escapeJsQuote('<li><a href="http://site.com/link.html" id="idrandom" ></a></li>'
+            '<li><a href="http://site.com/link.html" id="idrandom" ></a></li>'
             .'<style>#idrandom { display: block; }</style>'
-            .'<script>document.querySelector(\'#idrandom\').onclick = function () { alert("clicked"); };</script>'),
+            .'<script>document.querySelector(\'#idrandom\').onclick = function () { alert("clicked"); };</script>',
             $html
         );
     }