MC-16607: Fix Unrelated Static Test Failures

- improve performance
- standardize

Author: anthoula

app/code/Magento/PageBuilder/Plugin/Filter/CustomVarTemplatePlugin.php renamed to app/code/Magento/PageBuilder/Plugin/Filter/CustomVarTemplate.php

@@ -8,22 +8,23 @@
 namespace Magento\PageBuilder\Plugin\Filter;
 
 use Magento\Store\Model\Store;
+use Magento\Framework\Escaper;
 
 /**
  * Plugin to the template filter to escape custom variable directives
  */
-class CustomVarTemplatePlugin
+class CustomVarTemplate
 {
     /**
-     * @var \Magento\Framework\Escaper
+     * @var Escaper
      */
     private $escaper;
 
     /**
-     * @param \Magento\Framework\Escaper $escaper
+     * @param Escaper $escaper
      */
     public function __construct(
-        \Magento\Framework\Escaper $escaper
+        Escaper $escaper
     ) {
         $this->escaper = $escaper;
     }
@@ -32,24 +33,21 @@ public function __construct(
      * Determine if custom variable directive's return value needs to be escaped and do so if true
      *
      * @param \Magento\Framework\Filter\Template $subject
-     * @param \Closure $proceed
-     * @param string[] $construction
+     * @param string $result
      * @return string
      */
-    public function aroundCustomvarDirective(
+    public function afterCustomvarDirective(
         \Magento\Framework\Filter\Template $subject,
-        \Closure $proceed,
-        $construction
+        $result
     ) {
         // Determine the need to escape the return value of observed method.
         // Admin context requires store ID of 0; in that context return value should be escaped
         $shouldEscape = $subject->getStoreId() !== null && (int) $subject->getStoreId() === Store::DEFAULT_STORE_ID;
 
-        if (!$shouldEscape) {
-            return $proceed($construction);
+        if ($shouldEscape) {
+            return $this->escaper->escapeHtml($result);
+        } else {
+            return $result;
         }
-
-        $result = $proceed($construction);
-        return $this->escaper->escapeHtml($result);
     }
 }

app/code/Magento/PageBuilder/Plugin/Filter/TemplatePlugin.php

@@ -45,20 +45,18 @@ class TemplatePlugin
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\View\ConfigInterface $viewConfig
      * @param \Magento\Framework\Math\Random $mathRandom
-     * @param \Magento\Framework\Serialize\Serializer\Json|null $json
+     * @param \Magento\Framework\Serialize\Serializer\Json $json
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\View\ConfigInterface $viewConfig,
         \Magento\Framework\Math\Random $mathRandom,
-        \Magento\Framework\Serialize\Serializer\Json $json = null
+        \Magento\Framework\Serialize\Serializer\Json $json
     ) {
         $this->logger = $logger;
         $this->viewConfig = $viewConfig;
         $this->mathRandom = $mathRandom;
-        $this->json = $json ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Framework\Serialize\Serializer\Json::class
-        );
+        $this->json = $json;
     }
 
     /**

app/code/Magento/PageBuilder/etc/frontend/di.xml

@@ -11,6 +11,6 @@
     </type>
     <type name="Magento\Framework\Filter\Template">
         <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
-        <plugin name="escapeCustomVarDirectives" type="Magento\PageBuilder\Plugin\Filter\CustomVarTemplatePlugin"/>
+        <plugin name="escapeCustomVarDirectives" type="Magento\PageBuilder\Plugin\Filter\CustomVarTemplate"/>
     </type>
 </config>