From a1cca24e8a4ce7e1c6501ed6ad07ae066ca4cbdf Mon Sep 17 00:00:00 2001 From: Colin Viebrock Date: Thu, 10 May 2012 11:41:29 -0500 Subject: [PATCH 1/3] Doc change for issue #648 --- laravel/documentation/changes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/laravel/documentation/changes.md b/laravel/documentation/changes.md index 9b3c9d96..470422ad 100644 --- a/laravel/documentation/changes.md +++ b/laravel/documentation/changes.md @@ -73,6 +73,7 @@ ## Laravel 3.2 - Fixed bug when using many-to-many relationships on non-default database connection. - Added true reflection based IoC to container. - Added `Request::route()->controller` and `Request::route()->controller_action`. +- Added `array_except` and `array_only` helpers, similar to `Input::except` and `Input::only` but for arbitrary arrays. ## Upgrading From 3.1 From 5637a29fa33945ae6873db4d7bf32a9994217191 Mon Sep 17 00:00:00 2001 From: Colin Viebrock Date: Thu, 10 May 2012 16:32:07 -0500 Subject: [PATCH 2/3] Add Cookie::forever constant, fixes #660 Signed-off-by: Colin Viebrock --- laravel/cookie.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/laravel/cookie.php b/laravel/cookie.php index 870eb891..78c13a6d 100644 --- 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'); * * @@ -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); } /** From 97de6ef1d7be01734376e95104b5e464b78feaa5 Mon Sep 17 00:00:00 2001 From: Colin Viebrock Date: Thu, 10 May 2012 22:04:56 -0500 Subject: [PATCH 3/3] Order of elements for Cookie::put() was wrong Signed-off-by: Colin Viebrock --- laravel/auth/drivers/driver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/auth/drivers/driver.php b/laravel/auth/drivers/driver.php index 872b0275..d2927cd9 100644 --- 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); } /**