ENGCOM-6164: Magento 2.3.2 - PWA - graphQl fetching Issue for phtml f…

…ile called in static block #960 #971
magento · Oct 28, 2019 · 5c8ed12 · 5c8ed12
2 parents 68d2137 + 59c4565
commit 5c8ed12
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php
@@ -56,7 +56,7 @@ public function getData(string $blockIdentifier): array
             );
         }
 
-        $renderedContent = $this->widgetFilter->filter($block->getContent());
+        $renderedContent = $this->widgetFilter->filterDirective($block->getContent());
 
         $blockData = [
             BlockInterface::BLOCK_ID => $block->getId(),

diff --git a/app/code/Magento/Widget/Model/Template/FilterEmulate.php b/app/code/Magento/Widget/Model/Template/FilterEmulate.php
@@ -3,18 +3,44 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Widget\Model\Template;
 
+/**
+ * Class FilterEmulate
+ *
+ * @package Magento\Widget\Model\Template
+ */
 class FilterEmulate extends Filter
 {
     /**
      * Generate widget with emulation frontend area
      *
      * @param string[] $construction
-     * @return string
+     *
+     * @return mixed|string
+     * @throws \Exception
      */
     public function widgetDirective($construction)
     {
         return $this->_appState->emulateAreaCode('frontend', [$this, 'generateWidget'], [$construction]);
     }
+
+    /**
+     * Filter the string as template with frontend area emulation
+     *
+     * @param string $value
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function filterDirective($value) : string
+    {
+        return $this->_appState->emulateAreaCode(
+            \Magento\Framework\App\Area::AREA_FRONTEND,
+            [$this, 'filter'],
+            [$value]
+        );
+    }
 }