Deliver magento-partners/magento2ce#25: used implementation from magento-partners/magento2ce#15 to reduce cyclomatic complexity to appropriate level

Author: Volodymyr Kublytskyi

app/code/Magento/Theme/Model/Design/Config/Validator.php

@@ -64,21 +64,8 @@ public function validate(DesignConfigInterface $designConfig)
         }
 
         foreach ($elements as $name => $data) {
-            // Load template object by configured template id
-            $template = $this->templateFactory->create();
-            $scopeId = false;
-            if ($designConfig->getScope() == 'stores') {
-                $scopeId = $designConfig->getScopeId();
-            }
-            $template->emulateDesign($scopeId);
             $templateId = $data['value'];
-            if (is_numeric($templateId)) {
-                $template->load($templateId);
-            } else {
-                $template->loadDefault($templateId);
-            }
-            $text = $template->getTemplateText();
-            $template->revertDesign();
+            $text = $this->getTemplateText($templateId, $designConfig);
             // Check if template body has a reference to the same config path
             if (preg_match_all(Template::CONSTRUCTION_TEMPLATE_PATTERN, $text, $constructions, PREG_SET_ORDER)) {
                 foreach ($constructions as $construction) {
@@ -98,6 +85,36 @@ public function validate(DesignConfigInterface $designConfig)
         }
     }
 
+    /**
+     * @param $designConfig
+     * @return mixed
+     */
+    private function getScopeId($designConfig)
+    {
+        if ($designConfig->getScope() == 'stores') {
+            return $designConfig->getScopeId();
+        }
+        return false;
+    }
+    /**
+     * @param $designConfig
+     * @return mixed
+     */
+    private function getTemplateText($templateId, $designConfig)
+    {
+        // Load template object by configured template id
+        $template = $this->templateFactory->create();
+        $template->emulateDesign($this->getScopeId($designConfig));
+        if (is_numeric($templateId)) {
+            $template->load($templateId);
+        } else {
+            $template->loadDefault($templateId);
+        }
+        $text = $template->getTemplateText();
+        $template->revertDesign();
+        return $text;
+    }
+
     /**
      * Return associative array of parameters.
      *