From 1912738f48a031590eafc451f4ad9ff7a6ae9019 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Mon, 16 Mar 2015 14:43:03 +0200
Subject: [PATCH] MAGETWO-33631: Advanced Developer Workflow
- fixed renderer factory
---
.../Model/View/Asset/PreProcessor/DeveloperChain.php | 6 ++----
.../Developer/Model/View/Page/Config/RendererFactory.php | 5 +++--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/app/code/Magento/Developer/Model/View/Asset/PreProcessor/DeveloperChain.php b/app/code/Magento/Developer/Model/View/Asset/PreProcessor/DeveloperChain.php
index 80436bcd9ef..a96ef445700 100644
--- a/app/code/Magento/Developer/Model/View/Asset/PreProcessor/DeveloperChain.php
+++ b/app/code/Magento/Developer/Model/View/Asset/PreProcessor/DeveloperChain.php
@@ -22,15 +22,13 @@ class DeveloperChain extends Chain
LocalInterface $asset,
$origContent,
$origContentType,
- $origAssetPath = null,
- $frontEndDevelopmentWorkflowType = null
+ $origAssetPath = null
) {
parent::__construct(
$asset,
$origContent,
$origContentType,
- $origAssetPath,
- $frontEndDevelopmentWorkflowType
+ $origAssetPath
);
$this->targetContentType = $this->origContentType;
diff --git a/app/code/Magento/Developer/Model/View/Page/Config/RendererFactory.php b/app/code/Magento/Developer/Model/View/Page/Config/RendererFactory.php
index add6c6202d1..bba4643f4e7 100644
--- a/app/code/Magento/Developer/Model/View/Page/Config/RendererFactory.php
+++ b/app/code/Magento/Developer/Model/View/Page/Config/RendererFactory.php
@@ -20,7 +20,7 @@ class RendererFactory extends \Magento\Framework\View\Page\Config\RendererFactor
*
* @var \Magento\Framework\ObjectManagerInterface
*/
- protected $objectManager = null;
+ protected $objectManager;
/**
* @var \Magento\Framework\App\Config\ScopeConfigInterface
@@ -61,8 +61,9 @@ class RendererFactory extends \Magento\Framework\View\Page\Config\RendererFactor
public function create(array $data = [])
{
$renderer = $this->scopeConfig->getValue(WorkflowType::CONFIG_NAME_PATH, ScopeInterface::SCOPE_STORE);
+
return $this->objectManager->create(
- $renderer,
+ $this->rendererTypes[$renderer],
$data
);
}
--
GitLab