diff --git a/app/code/Magento/Theme/Model/Design/Config/Storage.php b/app/code/Magento/Theme/Model/Design/Config/Storage.php index 8857e79297fa0ae8c6dace9aa6d95bc987710ca1..5e47d1aefe4e0255174833e55e6f8e77b0bd73aa 100644 --- a/app/code/Magento/Theme/Model/Design/Config/Storage.php +++ b/app/code/Magento/Theme/Model/Design/Config/Storage.php @@ -77,7 +77,6 @@ class Storage foreach ($fieldsData as &$fieldData) { $value = $this->valueProcessor->process( $this->scopeConfig->getValue($fieldData->getPath(), $scope, $scopeId), - $fieldData->getPath(), $scope, $scopeId, $fieldData->getFieldConfig() diff --git a/app/code/Magento/Theme/Model/Design/Config/ValueChecker.php b/app/code/Magento/Theme/Model/Design/Config/ValueChecker.php index 4c8c790fa42b201adb64720c983a524b31eaed7a..0a1c61f75644f02d64c5b40197735b715f71afb5 100644 --- a/app/code/Magento/Theme/Model/Design/Config/ValueChecker.php +++ b/app/code/Magento/Theme/Model/Design/Config/ValueChecker.php @@ -57,14 +57,12 @@ class ValueChecker return !$this->isEqual( $this->valueProcessor->process( $value, - $fieldConfig['path'], $scope, $scopeId, $fieldConfig ), $this->valueProcessor->process( $this->appConfig->getValue($fieldConfig['path'], $scope, $scopeId), - $fieldConfig['path'], $scope, $scopeId, $fieldConfig diff --git a/app/code/Magento/Theme/Model/Design/Config/ValueProcessor.php b/app/code/Magento/Theme/Model/Design/Config/ValueProcessor.php index 77d027b87ec57e061f9df671cef78c477c07333d..ed3ae3809fdbe1c67e638673ce571ea8c219039e 100644 --- a/app/code/Magento/Theme/Model/Design/Config/ValueProcessor.php +++ b/app/code/Magento/Theme/Model/Design/Config/ValueProcessor.php @@ -27,16 +27,15 @@ class ValueProcessor * Process value * * @param string $value - * @param string $path * @param string $scope * @param string $scopeId * @param array $fieldConfig * @return mixed */ - public function process($value, $path, $scope, $scopeId, array $fieldConfig) + public function process($value, $scope, $scopeId, array $fieldConfig) { $backendModel = $this->backendModelFactory->createByPath( - $path, + $fieldConfig['path'], [ 'value' => $value, 'field_config' => $fieldConfig, diff --git a/app/code/Magento/Theme/Model/ResourceModel/Design/Config/Scope/Collection.php b/app/code/Magento/Theme/Model/ResourceModel/Design/Config/Scope/Collection.php index ce7eda260fd5ffc7be4cc54bbd558acf9ce04d22..7c1b50024ba6ecc85b9ffcccabe9c202cdfa2828 100644 --- a/app/code/Magento/Theme/Model/ResourceModel/Design/Config/Scope/Collection.php +++ b/app/code/Magento/Theme/Model/ResourceModel/Design/Config/Scope/Collection.php @@ -101,7 +101,6 @@ class Collection extends \Magento\Framework\Data\Collection if (isset($itemData['use_in_grid']) && (boolean)$itemData['use_in_grid']) { $result[$itemName] = $this->valueProcessor->process( $this->appConfig->getValue($itemData['path'], $scope, $scopeId), - $itemData['path'], $scope, $scopeId, $itemData diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Config/StorageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Config/StorageTest.php index 075e098462758ed19f5f906dd83680104f429402..58d993cf20cfdc1c2bc71ab51d745a8fb6685e3d 100644 --- a/app/code/Magento/Theme/Test/Unit/Model/Design/Config/StorageTest.php +++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Config/StorageTest.php @@ -177,14 +177,14 @@ class StorageTest extends \PHPUnit_Framework_TestCase ->willReturn('path'); $this->designConfigData->expects($this->atLeastOnce()) ->method('getFieldConfig') - ->willReturn([]); + ->willReturn(['path' => 'path']); $this->scopeConfig->expects($this->once()) ->method('getValue') ->with('path', $scope, $scopeId) ->willReturn('value'); $this->valueProcessor->expects($this->once()) ->method('process') - ->with('value', 'path', 'website', 1, []) + ->with('value', 'website', 1, ['path' => 'path']) ->willReturnArgument(0); $this->designConfigData->expects($this->once()) ->method('setValue') diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Config/ValueProcessorTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Config/ValueProcessorTest.php index 19f3da24aca80a9a34b549a83a03ccc7282dce30..03eaca7853a52163544c8987ab6aa13c14b06df8 100644 --- a/app/code/Magento/Theme/Test/Unit/Model/Design/Config/ValueProcessorTest.php +++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Config/ValueProcessorTest.php @@ -44,7 +44,7 @@ class ValueProcessorTest extends \PHPUnit_Framework_TestCase $path, [ 'value' => $value, - 'field_config' => [], + 'field_config' => ['path' => $path], 'scope' => $scope, 'scope_id' => $scopeId ] @@ -55,6 +55,6 @@ class ValueProcessorTest extends \PHPUnit_Framework_TestCase $this->backendModel->expects($this->once()) ->method('getValue') ->willReturn($value); - $this->assertEquals($value, $this->valueProcessor->process($value, $path, $scope, $scopeId, [])); + $this->assertEquals($value, $this->valueProcessor->process($value, $scope, $scopeId, ['path' => $path])); } } diff --git a/app/code/Magento/Theme/Test/Unit/Model/ResourceModel/Design/Config/Scope/CollectionTest.php b/app/code/Magento/Theme/Test/Unit/Model/ResourceModel/Design/Config/Scope/CollectionTest.php index 45a812039df8b20b1e76118d279ba528f1a1a74e..378016bb7e140104c579a2124a9bd098c292fb8f 100644 --- a/app/code/Magento/Theme/Test/Unit/Model/ResourceModel/Design/Config/Scope/CollectionTest.php +++ b/app/code/Magento/Theme/Test/Unit/Model/ResourceModel/Design/Config/Scope/CollectionTest.php @@ -113,9 +113,9 @@ class CollectionTest extends \PHPUnit_Framework_TestCase $this->valueProcessor->expects($this->atLeastOnce()) ->method('process') ->withConsecutive( - ['DefaultValue', 'second/field/path'], - ['WebsiteValue', 'second/field/path'], - ['WebsiteValue', 'second/field/path'] + ['DefaultValue', 'default', null, ['path' => 'second/field/path', 'use_in_grid' => 1]], + ['WebsiteValue', 'website', 1, ['path' => 'second/field/path', 'use_in_grid' => 1]], + ['WebsiteValue', 'store', 1, ['path' => 'second/field/path', 'use_in_grid' => 1]] ) ->willReturnOnConsecutiveCalls( 'DefaultValue',