Merge branch '4.0'

taylorotwell · taylorotwell · commit bf00affa607e · 2013-07-04T21:48:37.000-05:00
diff --git a/src/Illuminate/Auth/Guard.php b/src/Illuminate/Auth/Guard.php
@@ -390,7 +390,7 @@ public function logout()
 
 		if (isset($this->events))
 		{
-			$this->events->fire('auth.logout', array($this->user));
+			$this->events->fire('auth.logout', array($this->user()));
 		}
 
 		$this->user = null;
diff --git a/src/Illuminate/Foundation/changes.json b/src/Illuminate/Foundation/changes.json
@@ -10,5 +10,6 @@
 		{"message": "Query elapsed time is now reported as float instead of string.", "backport": null},
 		{"message": "Added Model::query method for generating an empty query builder.", "backport": null},
 		{"message": "The @yield Blade directive now accepts a default value as the second argument.", "backport": null}
+		{"message": "Fixed bug causing null to be passed to auth.logout event.", "backport": null}
 	]
 }
diff --git a/src/Illuminate/Support/ServiceProvider.php b/src/Illuminate/Support/ServiceProvider.php
@@ -160,12 +160,12 @@ protected function getPackageNamespace($package, $namespace)
 	/**
 	 * Register the package's custom Artisan commands.
 	 *
-	 * @param  dynamic  string
+	 * @param  array  $commands
 	 * @return void
 	 */
-	public function commands()
+	public function commands($commands)
 	{
-		$commands = func_get_args();
+		$commands = is_array($commands) ? $commands : func_get_args();
 
 		// To register the commands with Artisan, we will grab each of the arguments
 		// passed into the method and listen for Artisan "start" event which will
@@ -210,4 +210,4 @@ public function isDeferred()
 		return $this->defer;
 	}
 
-}
+}
diff --git a/src/Illuminate/Workbench/stubs/.travis.yml b/src/Illuminate/Workbench/stubs/.travis.yml
@@ -3,6 +3,7 @@ language: php
 php: 
   - 5.3
   - 5.4
+  - 5.5
 
 before_script:
   - curl -s http://getcomposer.org/installer | php

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ public function logout()`
`390`	`390`
`391`	`391`	`if (isset($this->events))`
`392`	`392`	`{`
`393`		`- $this->events->fire('auth.logout', array($this->user));`
	`393`	`+ $this->events->fire('auth.logout', array($this->user()));`
`394`	`394`	`}`
`395`	`395`
`396`	`396`	`$this->user = null;`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,6 @@`
`10`	`10`	`{"message": "Query elapsed time is now reported as float instead of string.", "backport": null},`
`11`	`11`	`{"message": "Added Model::query method for generating an empty query builder.", "backport": null},`
`12`	`12`	`{"message": "The @yield Blade directive now accepts a default value as the second argument.", "backport": null}`
	`13`	`+ {"message": "Fixed bug causing null to be passed to auth.logout event.", "backport": null}`
`13`	`14`	`]`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,12 +160,12 @@ protected function getPackageNamespace($package, $namespace)`
`160`	`160`	`/**`
`161`	`161`	`* Register the package's custom Artisan commands.`
`162`	`162`	`*`
`163`		`- * @param dynamic string`
	`163`	`+ * @param array $commands`
`164`	`164`	`* @return void`
`165`	`165`	`*/`
`166`		`- public function commands()`
	`166`	`+ public function commands($commands)`
`167`	`167`	`{`
`168`		`- $commands = func_get_args();`
	`168`	`+ $commands = is_array($commands) ? $commands : func_get_args();`
`169`	`169`
`170`	`170`	`// To register the commands with Artisan, we will grab each of the arguments`
`171`	`171`	`// passed into the method and listen for Artisan "start" event which will`
`@@ -210,4 +210,4 @@ public function isDeferred()`
`210`	`210`	`return $this->defer;`
`211`	`211`	`}`
`212`	`212`
`213`		`-}`
	`213`	`+}`