AC-6897 template caching improvements

Author: tranthienbinh1989

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

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

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

@@ -1052,7 +1052,7 @@ public function getCacheKey()
         $key[] = (string)$this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY);
 
         $key = implode('|', $key);
-        $key = sha1($key); // use hashing to hide potentially private data
+        $key = hash('sha256', $key); // use hashing to hide potentially private data
         return static::CACHE_KEY_PREFIX . $key;
     }
 

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

@@ -246,7 +246,7 @@ public function testGetCacheKeyByName()
         $nameInLayout = 'testBlock';
         $this->block->setNameInLayout($nameInLayout);
         $encryptionKey = $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY);
-        $cacheKey = sha1($nameInLayout . '|' . $encryptionKey);
+        $cacheKey = hash('sha256', $nameInLayout . '|' . $encryptionKey);
         $this->assertEquals(AbstractBlock::CACHE_KEY_PREFIX . $cacheKey, $this->block->getCacheKey());
     }