MAGETWO-32074: Move Specifc Helper Components From the Magento_Core Module to Magento_Framework

Maksym Savich · Maksym Savich · commit 6c53dc30b279 · 2015-03-03T11:15:00.000-06:00
- Merge conflicts resolved
diff --git a/app/code/Magento/ImportExport/Model/Resource/Import/Data.php b/app/code/Magento/ImportExport/Model/Resource/Import/Data.php
@@ -39,7 +39,7 @@ public function __construct(
         array $arguments = []
     ) {
         parent::__construct($context, $resourcePrefix);
-        $this->_jsonHelper = $jsonHelper;
+        $this->jsonHelper = $jsonHelper;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function __construct(`
`39`	`39`	`array $arguments = []`
`40`	`40`	`) {`
`41`	`41`	`parent::__construct($context, $resourcePrefix);`
`42`		`- $this->_jsonHelper = $jsonHelper;`
	`42`	`+ $this->jsonHelper = $jsonHelper;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`