MAGETWO-80186: [2.2.x] - Remove zend json from migration #10341

irenelagno · irenelagno · commit af39407d84f0 · 2017-10-02T15:32:58.000+03:00
-fix after CR
diff --git a/lib/internal/Magento/Framework/Module/Setup/Migration.php b/lib/internal/Magento/Framework/Module/Setup/Migration.php
@@ -159,7 +159,7 @@ public function __construct(
         ];
         $this->_compositeModules = $compositeModules;
         $this->setup = $setup;
-        $this->serializer = $serializer?: \Magento\Framework\App\ObjectManager::getInstance()
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
@@ -712,8 +712,7 @@ protected function _jsonDecode($encodedValue, $objectDecodeType = 1)
     }
 
     /**
-     * Decodes the given $encodedValue string which is
-     * encoded in the JSON format
+     * Decodes the given $encodedValue string which is encoded in the JSON format
      *
      * @param string $encodedValue
      * @return string|int|float|bool|array|null

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public function __construct(`
`159`	`159`	`];`
`160`	`160`	`$this->_compositeModules = $compositeModules;`
`161`	`161`	`$this->setup = $setup;`
`162`		`- $this->serializer = $serializer?: \Magento\Framework\App\ObjectManager::getInstance()`
	`162`	`+ $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()`
`163`	`163`	`->get(\Magento\Framework\Serialize\Serializer\Json::class);`
`164`	`164`	`}`
`165`	`165`
`@@ -712,8 +712,7 @@ protected function _jsonDecode($encodedValue, $objectDecodeType = 1)`
`712`	`712`	`}`
`713`	`713`
`714`	`714`	`/**`
`715`		`- * Decodes the given $encodedValue string which is`
`716`		`- * encoded in the JSON format`
	`715`	`+ * Decodes the given $encodedValue string which is encoded in the JSON format`
`717`	`716`	`*`
`718`	`717`	`* @param string $encodedValue`
`719`	`718`	`* @return string\|int\|float\|bool\|array\|null`