fixing conflicts.

taylorotwell · taylorotwell · commit 314f25bd28d5 · 2012-05-11T08:49:17.000-05:00
diff --git a/laravel/auth/drivers/driver.php b/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);
 	}
 
 	/**
diff --git a/laravel/cookie.php b/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);
 	}
 
 	/**
diff --git a/laravel/documentation/changes.md b/laravel/documentation/changes.md
@@ -74,6 +74,7 @@
 - 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

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ protected function cookie($name, $value, $minutes)`
`188`	`188`
`189`	`189`	`extract($config);`
`190`	`190`
`191`		`- Cookie::put($name, $minutes, $value, $path, $domain, $secure);`
	`191`	`+ Cookie::put($name, $value, $minutes, $path, $domain, $secure);`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,13 @@`
`2`	`2`
`3`	`3`	`class Cookie {`
`4`	`4`
	`5`	`+ /**`
	`6`	`+ * How long is forever (in minutes).`
	`7`	`+ *`
	`8`	`+ * @var int`
	`9`	`+ */`
	`10`	`+ const forever = 525600;`
	`11`	`+`
`5`	`12`	`/**`
`6`	`13`	`* The cookies that have been set.`
`7`	`14`	`*`
`@@ -27,7 +34,7 @@ public static function has($name)`
`27`	`34`	`* // Get the value of the "favorite" cookie`
`28`	`35`	`* $favorite = Cookie::get('favorite');`
`29`	`36`	`*`
`30`		`- * // Get the value of a cookie or return a default value`
	`37`	`+ * // Get the value of a cookie or return a default value`
`31`	`38`	`* $favorite = Cookie::get('framework', 'Laravel');`
`32`	`39`	`* </code>`
`33`	`40`	`*`
`@@ -96,7 +103,7 @@ public static function put($name, $value, $expiration = 0, $path = '/', $domain`
`96`	`103`	`*/`
`97`	`104`	`public static function forever($name, $value, $path = '/', $domain = null, $secure = false)`
`98`	`105`	`{`
`99`		`- return static::put($name, $value, 525600, $path, $domain, $secure);`
	`106`	`+ return static::put($name, $value, static::forever, $path, $domain, $secure);`
`100`	`107`	`}`
`101`	`108`
`102`	`109`	`/**`