Merge remote-tracking branch 'origin/MAGETWO-62363' into MAGETWO-58599

rganin · rganin · commit 0314d5a1a038 · 2017-02-10T11:15:01.000+02:00
diff --git a/app/code/Magento/User/Setup/UpgradeData.php b/app/code/Magento/User/Setup/UpgradeData.php
@@ -82,6 +82,8 @@ private function upgradeHash($setup)
      * Convert serialized data in fields to json format
      *
      * @param ModuleDataSetupInterface $setup
+     *
+     * @return void
      */
     private function upgradeSerializedFields($setup)
     {

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,8 @@ private function upgradeHash($setup)`
`82`	`82`	`* Convert serialized data in fields to json format`
`83`	`83`	`*`
`84`	`84`	`* @param ModuleDataSetupInterface $setup`
	`85`	`+ *`
	`86`	`+ * @return void`
`85`	`87`	`*/`
`86`	`88`	`private function upgradeSerializedFields($setup)`
`87`	`89`	`{`