fixing conflicts.

laravel/auth/drivers/driver.php

@@ -188,7 +188,7 @@ protected function cookie($name, $value, $minutes)
 
 		extract($config);
 
-		Cookie::put($name, $minutes, $value, $path, $domain, $secure);
+		Cookie::put($name, $value, $minutes, $path, $domain, $secure);
 	}
 
 	/**

laravel/cookie.php

@@ -2,6 +2,13 @@
 
 class Cookie {
 
+	/**
+	 * How long is forever (in minutes).
+	 *
+	 * @var int
+	 */
+	const forever = 525600;
+
 	/**
 	 * The cookies that have been set.
 	 *
@@ -27,7 +34,7 @@ public static function has($name)
 	 *		// Get the value of the "favorite" cookie
 	 *		$favorite = Cookie::get('favorite');
 	 *
-	 *		// Get the value of a cookie or return a default value 
+	 *		// Get the value of a cookie or return a default value
 	 *		$favorite = Cookie::get('framework', 'Laravel');
 	 * </code>
 	 *
@@ -96,7 +103,7 @@ public static function put($name, $value, $expiration = 0, $path = '/', $domain
 	 */
 	public static function forever($name, $value, $path = '/', $domain = null, $secure = false)
 	{
-		return static::put($name, $value, 525600, $path, $domain, $secure);
+		return static::put($name, $value, static::forever, $path, $domain, $secure);
 	}
 
 	/**

laravel/documentation/changes.md

@@ -74,6 +74,7 @@ ## Laravel 3.2
 - Added true reflection based IoC to container.
 - Added `Request::route()->controller` and `Request::route()->controller_action`.
 - Added `Event::queue`, `Event::flusher`, and `Event::flush` methods to Event class.
+- Added `array_except` and `array_only` helpers, similar to `Input::except` and `Input::only` but for arbitrary arrays.
 
 <a name="upgrade-3.2"></a>
 ## Upgrading From 3.1