MAGETWO-90864: Media Gallery content is not showing when secure keys are enabled

Move Config::parseAdditionalData to Converter

Author: danmooney2

app/code/Magento/PageBuilder/Model/Config.php

@@ -9,39 +9,38 @@
 namespace Magento\PageBuilder\Model;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Data\Argument\InterpreterInterface;
-use Magento\PageBuilder\Model\Config\ContentType\AdditionalData\ProviderInterface;
+use Magento\PageBuilder\Model\Config\ContentType\Converter;
 
 class Config extends \Magento\Framework\Config\Data implements \Magento\PageBuilder\Model\Config\ConfigInterface
 {
     const IS_PAGEBUILDER_ENABLED = 'cms/pagebuilder/enabled';
 
     /**
-     * @var InterpreterInterface
+     * @var ScopeConfigInterface
      */
-    private $argumentInterpreter;
+    private $scopeConfig;
 
     /**
-     * @var ScopeConfigInterface
+     * @var Converter
      */
-    private $scopeConfig;
+    private $converter;
 
     /**
      * @param \Magento\PageBuilder\Model\Config\CompositeReader $reader
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param ScopeConfigInterface $scopeConfig
-     * @param InterpreterInterface $argumentInterpreter
+     * @param Converter $converter
      * @param string $cacheId
      */
     public function __construct(
         \Magento\PageBuilder\Model\Config\CompositeReader $reader,
         \Magento\Framework\Config\CacheInterface $cache,
         ScopeConfigInterface $scopeConfig,
-        InterpreterInterface $argumentInterpreter,
+        Converter $converter,
         $cacheId = 'pagebuilder_config'
     ) {
         $this->scopeConfig = $scopeConfig;
-        $this->argumentInterpreter = $argumentInterpreter;
+        $this->converter = $converter;
         parent::__construct($reader, $cache, $cacheId);
     }
 
@@ -61,7 +60,7 @@ public function getGroups()
     public function getContentTypes(): array
     {
         $types = $this->get('types');
-        $types = $this->parseAdditionalData($types);
+        $types = $this->converter->parseAdditionalData($types);
 
         return $types;
     }
@@ -77,42 +76,4 @@ public function isEnabled(): bool
             \Magento\PageBuilder\Model\Config::IS_PAGEBUILDER_ENABLED
         );
     }
-
-    /**
-     * Convert and evaluate additional data from arguments nodes to array
-     *
-     * @param array $types
-     * @return array
-     */
-    private function parseAdditionalData(array $types): array
-    {
-        $convertToProviders = function ($additionalDatum) use (&$convertToProviders) {
-            $processedData = [];
-
-            foreach ($additionalDatum as $key => $value) {
-                if (is_array($value)) {
-                    $processedData[$key] = $convertToProviders($additionalDatum[$key]);
-                } elseif (is_object($value) && $value instanceof ProviderInterface) {
-                    $processedData[$key] = $value->getData($key)[$key];
-                } else {
-                    $processedData[$key] = $value;
-                }
-            }
-
-            return $processedData;
-        };
-
-        foreach ($types as &$type) {
-            if (!isset($type['additional_data'])) {
-                continue;
-            }
-
-            foreach ($type['additional_data'] as &$additionalDatum) {
-                $additionalDatum = $this->argumentInterpreter->evaluate($additionalDatum);
-                $additionalDatum = $convertToProviders($additionalDatum);
-            }
-        }
-
-        return $types;
-    }
 }

app/code/Magento/PageBuilder/Model/Config/ContentType/Converter.php

@@ -19,14 +19,22 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      */
     private $parser;
 
+    /**
+     * @var InterpreterInterface
+     */
+    private $argumentInterpreter;
+
     /**
      * Converter constructor.
      * @param ArgumentParser $parser
+     * @param InterpreterInterface $argumentInterpreter
      */
     public function __construct(
-        ArgumentParser $parser
+        ArgumentParser $parser,
+        InterpreterInterface $argumentInterpreter
     ) {
         $this->parser = $parser;
+        $this->argumentInterpreter = $argumentInterpreter;
     }
 
     /**
@@ -43,6 +51,44 @@ public function convert($source): array
         ];
     }
 
+    /**
+     * Convert and evaluate additional data from arguments nodes to array
+     *
+     * @param array $types
+     * @return array
+     */
+    public function parseAdditionalData(array $types): array
+    {
+        $convertToProviders = function ($additionalDatum) use (&$convertToProviders) {
+            $processedData = [];
+
+            foreach ($additionalDatum as $key => $value) {
+                $processedData[$key] = $value;
+
+                if (is_array($value)) {
+                    $processedData[$key] = $convertToProviders($additionalDatum[$key]);
+                } elseif (is_object($value) && $value instanceof ProviderInterface) {
+                    $processedData[$key] = $value->getData($key)[$key];
+                }
+            }
+
+            return $processedData;
+        };
+
+        foreach ($types as &$type) {
+            if (!isset($type['additional_data'])) {
+                continue;
+            }
+
+            foreach ($type['additional_data'] as &$additionalDatum) {
+                $additionalDatum = $this->argumentInterpreter->evaluate($additionalDatum);
+                $additionalDatum = $convertToProviders($additionalDatum);
+            }
+        }
+
+        return $types;
+    }
+
     /**
      * Convert types
      *