Merge branch '4.2' of github.com:laravel/framework into 4.2

src/Illuminate/Auth/DatabaseUserProvider.php

@@ -8,7 +8,7 @@ class DatabaseUserProvider implements UserProviderInterface {
 	/**
 	 * The active database connection.
 	 *
-	 * @param  \Illuminate\Database\Connection
+	 * @var \Illuminate\Database\Connection
 	 */
 	protected $conn;
 
@@ -60,7 +60,7 @@ public function retrieveById($identifier)
 	/**
 	 * Retrieve a user by by their unique identifier and "remember me" token.
 	 *
-	 * @param  mixed  $identifier
+	 * @param  mixed   $identifier
 	 * @param  string  $token
 	 * @return \Illuminate\Auth\UserInterface|null
 	 */

src/Illuminate/Auth/Guard.php

@@ -83,6 +83,7 @@ class Guard {
 	 *
 	 * @param  \Illuminate\Auth\UserProviderInterface  $provider
 	 * @param  \Illuminate\Session\Store  $session
+	 * @param  \Symfony\Component\HttpFoundation\Request  $request
 	 * @return void
 	 */
 	public function __construct(UserProviderInterface $provider,

src/Illuminate/Auth/Reminders/PasswordBroker.php

@@ -99,8 +99,8 @@ public function __construct(ReminderRepositoryInterface $reminders,
 	/**
 	 * Send a password reminder to a user.
 	 *
-	 * @param  array    $credentials
-	 * @param  Closure  $callback
+	 * @param  array     $credentials
+	 * @param  \Closure  $callback
 	 * @return string
 	 */
 	public function remind(array $credentials, Closure $callback = null)
@@ -129,8 +129,8 @@ public function remind(array $credentials, Closure $callback = null)
 	 * Send the password reminder e-mail.
 	 *
 	 * @param  \Illuminate\Auth\Reminders\RemindableInterface  $user
-	 * @param  string   $token
-	 * @param  Closure  $callback
+	 * @param  string    $token
+	 * @param  \Closure  $callback
 	 * @return int
 	 */
 	public function sendReminder(RemindableInterface $user, $token, Closure $callback = null)
@@ -151,8 +151,8 @@ public function sendReminder(RemindableInterface $user, $token, Closure $callbac
 	/**
 	 * Reset the password for the given token.
 	 *
-	 * @param  array    $credentials
-	 * @param  Closure  $callback
+	 * @param  array     $credentials
+	 * @param  \Closure  $callback
 	 * @return mixed
 	 */
 	public function reset(array $credentials, Closure $callback)

src/Illuminate/Auth/UserProviderInterface.php

@@ -13,7 +13,7 @@ public function retrieveById($identifier);
 	/**
 	 * Retrieve a user by by their unique identifier and "remember me" token.
 	 *
-	 * @param  mixed  $identifier
+	 * @param  mixed   $identifier
 	 * @param  string  $token
 	 * @return \Illuminate\Auth\UserInterface|null
 	 */

src/Illuminate/Cache/MemcachedConnector.php

@@ -7,7 +7,7 @@ class MemcachedConnector {
 	/**
 	 * Create a new Memcached connection.
 	 *
-	 * @param array  $servers
+	 * @param  array  $servers
 	 * @return \Memcached
 	 *
 	 * @throws \RuntimeException

src/Illuminate/Cache/Repository.php

@@ -115,7 +115,7 @@ public function add($key, $value, $minutes)
 	 *
 	 * @param  string  $key
 	 * @param  \DateTime|int  $minutes
-	 * @param  Closure  $callback
+	 * @param  \Closure  $callback
 	 * @return mixed
 	 */
 	public function remember($key, $minutes, Closure $callback)
@@ -137,7 +137,7 @@ public function remember($key, $minutes, Closure $callback)
 	 * Get an item from the cache, or store the default value forever.
 	 *
 	 * @param  string   $key
-	 * @param  Closure  $callback
+	 * @param  \Closure  $callback
 	 * @return mixed
 	 */
 	public function sear($key, Closure $callback)
@@ -149,7 +149,7 @@ public function sear($key, Closure $callback)
 	 * Get an item from the cache, or store the default value forever.
 	 *
 	 * @param  string   $key
-	 * @param  Closure  $callback
+	 * @param  \Closure  $callback
 	 * @return mixed
 	 */
 	public function rememberForever($key, Closure $callback)

src/Illuminate/Cache/TaggedCache.php

@@ -61,9 +61,9 @@ public function get($key, $default = null)
 	/**
 	 * Store an item in the cache for a given number of minutes.
 	 *
-	 * @param  string        $key
-	 * @param  mixed         $value
-	 * @param  \DateTime|int $minutes
+	 * @param  string  $key
+	 * @param  mixed   $value
+	 * @param  \DateTime|int  $minutes
 	 * @return void
 	 */
 	public function put($key, $value, $minutes)
@@ -151,9 +151,9 @@ public function flush()
 	/**
 	 * Get an item from the cache, or store the default value.
 	 *
-	 * @param  string        $key
-	 * @param  \DateTime|int $minutes
-	 * @param  Closure       $callback
+	 * @param  string  $key
+	 * @param  \DateTime|int  $minutes
+	 * @param  \Closure  $callback
 	 * @return mixed
 	 */
 	public function remember($key, $minutes, Closure $callback)
@@ -171,8 +171,8 @@ public function remember($key, $minutes, Closure $callback)
 	/**
 	 * Get an item from the cache, or store the default value forever.
 	 *
-	 * @param  string   $key
-	 * @param  Closure  $callback
+	 * @param  string    $key
+	 * @param  \Closure  $callback
 	 * @return mixed
 	 */
 	public function sear($key, Closure $callback)
@@ -183,8 +183,8 @@ public function sear($key, Closure $callback)
 	/**
 	 * Get an item from the cache, or store the default value forever.
 	 *
-	 * @param  string   $key
-	 * @param  Closure  $callback
+	 * @param  string    $key
+	 * @param  \Closure  $callback
 	 * @return mixed
 	 */
 	public function rememberForever($key, Closure $callback)

src/Illuminate/Config/Repository.php

@@ -329,7 +329,7 @@ public function getLoader()
 	/**
 	 * Set the loader implementation.
 	 *
-	 * @param \Illuminate\Config\LoaderInterface  $loader
+	 * @param  \Illuminate\Config\LoaderInterface  $loader
 	 * @return void
 	 */
 	public function setLoader(LoaderInterface $loader)

src/Illuminate/Console/Command.php

@@ -205,9 +205,9 @@ public function ask($question, $default = null)
 	/**
 	 * Prompt the user for input with auto completion.
 	 *
-	 * @param  string $question
-	 * @param  array  $choices
-	 * @param  string $default
+	 * @param  string  $question
+	 * @param  array   $choices
+	 * @param  string  $default
 	 * @return string
 	 */
 	public function askWithCompletion($question, array $choices, $default = null)
@@ -243,11 +243,11 @@ public function secret($question, $fallback = true)
 	/**
 	 * Give the user a single choice from an array of answers.
 	 *
-	 * @param  string $question
-	 * @param  array  $choices
-	 * @param  string $default
-	 * @param  mixed  $attempts
-	 * @param  bool   $multiple
+	 * @param  string  $question
+	 * @param  array   $choices
+	 * @param  string  $default
+	 * @param  mixed   $attempts
+	 * @param  bool    $multiple
 	 * @return bool
 	 */
 	public function choice($question, array $choices, $default = null, $attempts = null, $multiple = null)
@@ -264,9 +264,9 @@ public function choice($question, array $choices, $default = null, $attempts = n
     /**
      * Format input to textual table
      *
-     * @param  array $headers
-     * @param  array $rows
-     * @param string $style
+     * @param  array   $headers
+     * @param  array   $rows
+     * @param  string  $style
      * @return void
      */
 	public function table(array $headers, array $rows, $style = 'default')

src/Illuminate/Container/Container.php

@@ -94,9 +94,9 @@ public function isAlias($name)
 	/**
 	 * Register a binding with the container.
 	 *
-	 * @param  string               $abstract
-	 * @param  Closure|string|null  $concrete
-	 * @param  bool                 $shared
+	 * @param  string  $abstract
+	 * @param  \Closure|string|null  $concrete
+	 * @param  bool  $shared
 	 * @return void
 	 */
 	public function bind($abstract, $concrete = null, $shared = false)
@@ -162,9 +162,9 @@ protected function getClosure($abstract, $concrete)
 	/**
 	 * Register a binding if it hasn't already been registered.
 	 *
-	 * @param  string               $abstract
-	 * @param  Closure|string|null  $concrete
-	 * @param  bool                 $shared
+	 * @param  string  $abstract
+	 * @param  \Closure|string|null  $concrete
+	 * @param  bool  $shared
 	 * @return void
 	 */
 	public function bindIf($abstract, $concrete = null, $shared = false)
@@ -178,8 +178,8 @@ public function bindIf($abstract, $concrete = null, $shared = false)
 	/**
 	 * Register a shared binding in the container.
 	 *
-	 * @param  string               $abstract
-	 * @param  Closure|string|null  $concrete
+	 * @param  string  $abstract
+	 * @param  \Closure|string|null  $concrete
 	 * @return void
 	 */
 	public function singleton($abstract, $concrete = null)
@@ -190,7 +190,7 @@ public function singleton($abstract, $concrete = null)
 	/**
 	 * Wrap a Closure such that it is shared.
 	 *
-	 * @param  Closure  $closure
+	 * @param  \Closure  $closure
 	 * @return Closure
 	 */
 	public function share(Closure $closure)
@@ -214,7 +214,7 @@ public function share(Closure $closure)
 	/**
 	 * Bind a shared Closure into the container.
 	 *
-	 * @param  string  $abstract
+	 * @param  string    $abstract
 	 * @param  \Closure  $closure
 	 * @return void
 	 */
@@ -226,8 +226,8 @@ public function bindShared($abstract, Closure $closure)
 	/**
 	 * "Extend" an abstract type in the container.
 	 *
-	 * @param  string   $abstract
-	 * @param  Closure  $closure
+	 * @param  string    $abstract
+	 * @param  \Closure  $closure
 	 * @return void
 	 *
 	 * @throws \InvalidArgumentException
@@ -256,7 +256,7 @@ public function extend($abstract, Closure $closure)
 	/**
 	 * Get an extender Closure for resolving a type.
 	 *
-	 * @param  string  $abstract
+	 * @param  string    $abstract
 	 * @param  \Closure  $closure
 	 * @return \Closure
 	 */
@@ -333,7 +333,7 @@ protected function extractAlias(array $definition)
 	/**
 	 * Bind a new callback to an abstract's rebind event.
 	 *
-	 * @param  string  $abstract
+	 * @param  string    $abstract
 	 * @param  \Closure  $callback
 	 * @return mixed
 	 */
@@ -348,7 +348,7 @@ public function rebinding($abstract, Closure $callback)
 	 * Refresh an instance on the given target and method.
 	 *
 	 * @param  string  $abstract
-	 * @param  mixed  $target
+	 * @param  mixed   $target
 	 * @param  string  $method
 	 * @return mixed
 	 */
@@ -649,7 +649,7 @@ protected function keyParametersByArgument(array $dependencies, array $parameter
 	/**
 	 * Register a new resolving callback.
 	 *
-	 * @param  string  $abstract
+	 * @param  string    $abstract
 	 * @param  \Closure  $callback
 	 * @return void
 	 */

src/Illuminate/Cookie/CookieJar.php

@@ -121,7 +121,7 @@ public function queue()
 	/**
 	 * Remove a cookie from the queue.
 	 *
-	 * @param string $name
+	 * @param  string  $name
 	 */
 	public function unqueue($name)
 	{

src/Illuminate/Database/Connection.php

@@ -409,7 +409,7 @@ public function prepareBindings(array $bindings)
 	/**
 	 * Execute a Closure within a transaction.
 	 *
-	 * @param  Closure  $callback
+	 * @param  \Closure  $callback
 	 * @return mixed
 	 *
 	 * @throws \Exception
@@ -506,7 +506,7 @@ public function transactionLevel()
 	/**
 	 * Execute the given callback in "dry run" mode.
 	 *
-	 * @param  Closure  $callback
+	 * @param  \Closure  $callback
 	 * @return array
 	 */
 	public function pretend(Closure $callback)
@@ -528,9 +528,9 @@ public function pretend(Closure $callback)
 	/**
 	 * Run a SQL statement and log its execution context.
 	 *
-	 * @param  string   $query
-	 * @param  array    $bindings
-	 * @param  Closure  $callback
+	 * @param  string    $query
+	 * @param  array     $bindings
+	 * @param  \Closure  $callback
 	 * @return mixed
 	 *
 	 * @throws QueryException
@@ -588,7 +588,7 @@ public function logQuery($query, $bindings, $time = null)
 	/**
 	 * Register a database query listener with the connection.
 	 *
-	 * @param  Closure  $callback
+	 * @param  \Closure  $callback
 	 * @return void
 	 */
 	public function listen(Closure $callback)

src/Illuminate/Database/ConnectionInterface.php

@@ -102,7 +102,7 @@ public function prepareBindings(array $bindings);
 	/**
 	 * Execute a Closure within a transaction.
 	 *
-	 * @param  Closure  $callback
+	 * @param  \Closure  $callback
 	 * @return mixed
 	 *
 	 * @throws \Exception
@@ -140,7 +140,7 @@ public function transactionLevel();
 	/**
 	 * Execute the given callback in "dry run" mode.
 	 *
-	 * @param  Closure  $callback
+	 * @param  \Closure  $callback
 	 * @return array
 	 */
 	public function pretend(Closure $callback);

src/Illuminate/Database/Eloquent/Model.php

@@ -563,8 +563,8 @@ public static function firstOrNew(array $attributes)
 	/**
 	 * Create or update a record matching the attributes, and fill it with values.
 	 *
-	 * @param array $attributes
-	 * @param array $values
+	 * @param  array  $attributes
+	 * @param  array  $values
 	 * @return \Illuminate\Database\Eloquent\Model
 	 */
 	public static function updateOrCreate(array $attributes, array $values = array())

src/Illuminate/Database/Migrations/MigrationCreator.php

@@ -118,7 +118,7 @@ protected function firePostCreateHooks()
 	/**
 	 * Register a post migration create hook.
 	 *
-	 * @param  Closure  $callback
+	 * @param  \Closure  $callback
 	 * @return void
 	 */
 	public function afterCreate(Closure $callback)