From 66e5a0b32f61b1ec0e14aa4bc4219d15c2a247c7 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 18 Oct 2013 22:40:59 -0500 Subject: [PATCH] Allow environment to be checked via App::environment method. --- src/Illuminate/Foundation/Application.php | 12 ++++++++++-- src/Illuminate/Foundation/changes.json | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php index 0835c53fc8f7..90a493b89dc7 100755 --- a/src/Illuminate/Foundation/Application.php +++ b/src/Illuminate/Foundation/Application.php @@ -196,13 +196,21 @@ public function startExceptionHandling() } /** - * Get the current application environment. + * Get or check the current application environment. * + * @param dynamic * @return string */ public function environment() { - return $this['env']; + if (count(func_get_args()) > 0) + { + return in_array($this['env'], func_get_args()); + } + else + { + return $this['env']; + } } /** diff --git a/src/Illuminate/Foundation/changes.json b/src/Illuminate/Foundation/changes.json index d6faa2662d88..e57e4952ba44 100755 --- a/src/Illuminate/Foundation/changes.json +++ b/src/Illuminate/Foundation/changes.json @@ -59,6 +59,7 @@ {"message": "Allow Blade processing on echos to be escaped using the @ sign.", "backport": null}, {"message": "Allow custom messages to be registered when using Validator::extend.", "backport": null}, {"message": "Added new auth:clear-reminders command for clearing expired password reminders.", "backport": null}, - {"message": "Added Cookie::queue method for creating cookies that are automatically attached to the final response.", "backport": null} + {"message": "Added Cookie::queue method for creating cookies that are automatically attached to the final response.", "backport": null}, + {"message": "Allow environment to be checked via App::environment method.", "backport": null} ] }