MAGETWO-51544: [Github] Cannot upgrade to Magento 2.0.4 #4013

ark99 · ark99 · commit de7cef0859cd · 2016-04-14T09:59:30.000-05:00
- Minor update to address code review comment.
- Moved variable assignment towards end of the block
diff --git a/setup/src/Magento/Setup/Model/Cron/ReadinessCheck.php b/setup/src/Magento/Setup/Model/Cron/ReadinessCheck.php
@@ -131,8 +131,8 @@ public function runReadinessCheck()
             $resultJsonRawData[self::KEY_FILE_PATHS][self::KEY_LIST] = $filePaths;
         } catch (\Exception $e) {
             $errorMsg = $e->getMessage();
-            $returnValue = false;
             $resultJsonRawData[self::KEY_FILE_PATHS][self::KEY_LIST] = [];
+            $returnValue = false;
         }
         $resultJsonRawData[self::KEY_FILE_PATHS][self::KEY_ERROR] = $errorMsg;
 

Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,8 @@ public function runReadinessCheck()`
`131`	`131`	`$resultJsonRawData[self::KEY_FILE_PATHS][self::KEY_LIST] = $filePaths;`
`132`	`132`	`} catch (\Exception $e) {`
`133`	`133`	`$errorMsg = $e->getMessage();`
`134`		`- $returnValue = false;`
`135`	`134`	`$resultJsonRawData[self::KEY_FILE_PATHS][self::KEY_LIST] = [];`
	`135`	`+ $returnValue = false;`
`136`	`136`	`}`
`137`	`137`	`$resultJsonRawData[self::KEY_FILE_PATHS][self::KEY_ERROR] = $errorMsg;`
`138`	`138`