MAGETWO-92524: Architectural Review

Refactor

Author: danmooney2

app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Parser.php

@@ -39,27 +39,34 @@ public function toArray(array $additionalData): array
     {
         $parsedAdditionalData = [];
 
-        $convertToProviders = function ($additionalDatum) use (&$convertToProviders) {
-            $processedData = [];
+        foreach ($additionalData as $key => $additionalDataItem) {
+            $additionalDataItem = $this->argumentInterpreter->evaluate($additionalDataItem);
+            $parsedAdditionalData[$key] = $this->evaluateProviders($additionalDataItem);
+        }
 
-            foreach ($additionalDatum as $key => $value) {
-                $processedData[$key] = $value;
+        return $parsedAdditionalData;
+    }
 
-                if (is_array($value)) {
-                    $processedData[$key] = $convertToProviders($additionalDatum[$key]);
-                } elseif (is_object($value) && $value instanceof ProviderInterface) {
-                    $processedData[$key] = $value->getData($key)[$key];
-                }
-            }
+    /**
+     * Evaluate ProviderInterface objects
+     *
+     * @param array $additionalDataItem
+     * @return array
+     */
+    private function evaluateProviders(array $additionalDataItem): array
+    {
+        $processedData = [];
 
-            return $processedData;
-        };
+        foreach ($additionalDataItem as $key => $value) {
+            $processedData[$key] = $value;
 
-        foreach ($additionalData as $key => $additionalDatum) {
-            $additionalDatum = $this->argumentInterpreter->evaluate($additionalDatum);
-            $parsedAdditionalData[$key] = $convertToProviders($additionalDatum);
+            if (is_array($value)) {
+                $processedData[$key] = $this->evaluateProviders($additionalDataItem[$key]);
+            } elseif (is_object($value) && $value instanceof ProviderInterface) {
+                $processedData[$key] = $value->getData($key)[$key];
+            }
         }
 
-        return $parsedAdditionalData;
+        return $processedData;
     }
 }