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

laravel · Oct 22, 2016 · 6e26cd0 · 6e26cd0
2 parents 6a507d1 + 3481314
commit 6e26cd0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/Illuminate/Foundation/Auth/RegistersUsers.php b/src/Illuminate/Foundation/Auth/RegistersUsers.php
@@ -34,7 +34,8 @@ public function register(Request $request)
 
         $this->guard()->login($user);
 
-        return redirect($this->redirectPath());
+        return $this->registered($request, $user)
+            ?: redirect($this->redirectPath());
     }
 
     /**
@@ -46,4 +47,15 @@ protected function guard()
     {
         return Auth::guard();
     }
+
+    /**
+     * The user has been registered.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  mixed  $user
+     * @return mixed
+     */
+    protected function registered(Request $request, $user)
+    {
+    }
 }
diff --git a/src/Illuminate/Foundation/Console/ListenerMakeCommand.php b/src/Illuminate/Foundation/Console/ListenerMakeCommand.php
@@ -114,9 +114,9 @@ protected function getDefaultNamespace($rootNamespace)
     protected function getOptions()
     {
         return [
-            ['event', null, InputOption::VALUE_REQUIRED, 'The event class being listened for.'],
+            ['event', 'e', InputOption::VALUE_REQUIRED, 'The event class being listened for.'],
 
-            ['queued', null, InputOption::VALUE_NONE, 'Indicates the event listener should be queued.'],
+            ['queued', 'q', InputOption::VALUE_NONE, 'Indicates the event listener should be queued.'],
         ];
     }
 }