Merge remote-tracking branch 'origin/5.3' into 5.3

laravel · Sep 27, 2016 · decc107 · decc107
2 parents 6b76faa + 7a7ab8f
commit decc107
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/Illuminate/Console/Parser.php b/src/Illuminate/Console/Parser.php
@@ -73,14 +73,12 @@ protected static function parameters(array $tokens)
      */
     protected static function parseArgument($token)
     {
-        $description = null;
-
         if (Str::contains($token, ' : ')) {
             list($token, $description) = explode(' : ', $token, 2);
-
             $token = trim($token);
-
             $description = trim($description);
+        } else {
+            $description = null;
         }
 
         switch (true) {
@@ -105,21 +103,21 @@ protected static function parseArgument($token)
      */
     protected static function parseOption($token)
     {
-        $description = null;
-
         if (Str::contains($token, ' : ')) {
             list($token, $description) = explode(' : ', $token);
             $token = trim($token);
             $description = trim($description);
+        } else {
+            $description = null;
         }
 
-        $shortcut = null;
-
         $matches = preg_split('/\s*\|\s*/', $token, 2);
 
         if (isset($matches[1])) {
             $shortcut = $matches[0];
             $token = $matches[1];
+        } else {
+            $shortcut = null;
         }
 
         switch (true) {