From 3cd624eac8bc5f50473087dabd5a917e95a15fbe Mon Sep 17 00:00:00 2001 From: jan Date: Fri, 5 Apr 2013 09:18:51 +0200 Subject: [PATCH 1/2] Changed Laravel\ namespace prefix in some classes calls in helpers to global, to allow aliases to work, and allow class extending. --- laravel/helpers.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/laravel/helpers.php b/laravel/helpers.php index 513e3baa..22f57a7f 100644 --- a/laravel/helpers.php +++ b/laravel/helpers.php @@ -328,7 +328,7 @@ function head($array) */ function url($url = '', $https = null) { - return Laravel\URL::to($url, $https); + return URL::to($url, $https); } /** @@ -340,7 +340,7 @@ function url($url = '', $https = null) */ function asset($url, $https = null) { - return Laravel\URL::to_asset($url, $https); + return URL::to_asset($url, $https); } /** @@ -360,7 +360,7 @@ function asset($url, $https = null) */ function action($action, $parameters = array()) { - return Laravel\URL::to_action($action, $parameters); + return URL::to_action($action, $parameters); } /** @@ -380,7 +380,7 @@ function action($action, $parameters = array()) */ function route($name, $parameters = array()) { - return Laravel\URL::to_route($name, $parameters); + return URL::to_route($name, $parameters); } /** @@ -523,7 +523,7 @@ function view($view, $data = array()) { if (is_null($view)) return ''; - return Laravel\View::make($view, $data); + return View::make($view, $data); } /** @@ -537,7 +537,7 @@ function render($view, $data = array()) { if (is_null($view)) return ''; - return Laravel\View::make($view, $data)->render(); + return View::make($view, $data)->render(); } /** @@ -551,7 +551,7 @@ function render($view, $data = array()) */ function render_each($partial, array $data, $iterator, $empty = 'raw|') { - return Laravel\View::render_each($partial, $data, $iterator, $empty); + return View::render_each($partial, $data, $iterator, $empty); } /** @@ -562,7 +562,7 @@ function render_each($partial, array $data, $iterator, $empty = 'raw|') */ function yield($section) { - return Laravel\Section::yield($section); + return Section::yield($section); } /** @@ -574,7 +574,7 @@ function yield($section) */ function get_cli_option($option, $default = null) { - foreach (Laravel\Request::foundation()->server->get('argv') as $argument) + foreach (Request::foundation()->server->get('argv') as $argument) { if (starts_with($argument, "--{$option}=")) { From e4080c02f56881a8682d913db4904ef486669b16 Mon Sep 17 00:00:00 2001 From: jan Date: Fri, 5 Apr 2013 09:48:49 +0200 Subject: [PATCH 2/2] get_cli_option() is called outside Laravel app, so namespace prefix must be left there --- laravel/helpers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/helpers.php b/laravel/helpers.php index 22f57a7f..4d4f3003 100644 --- a/laravel/helpers.php +++ b/laravel/helpers.php @@ -574,7 +574,7 @@ function yield($section) */ function get_cli_option($option, $default = null) { - foreach (Request::foundation()->server->get('argv') as $argument) + foreach (Laravel\Request::foundation()->server->get('argv') as $argument) { if (starts_with($argument, "--{$option}=")) {