Skip to content

make() quick access #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 15, 2013
Merged

make() quick access #61

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd17ab6
Make make() accessible via app()
zimt28 Jan 15, 2013
d89c99b
@return Laravel style
zimt28 Jan 15, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/Illuminate/Support/helpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,22 @@
*/
function action($name, $parameters = array(), $absolute = true)
{
$app = app();

return $app['url']->action($name, $parameters, $absolute);
return app('url')->action($name, $parameters, $absolute);
}

/**
* Get the root Facade application instance.
*
* @return Illuminate\Foundation\Application
* @param string $make
* @return mixed
*/
function app()
function app($make = null)
{
if ($make !== null)
{
return app()->make($make);
}

return Illuminate\Support\Facades\Facade::getFacadeApplication();
}

Expand All @@ -38,7 +42,7 @@ function app()
*/
function app_path()
{
return app()->make('path');
return app('path');
}

/**
Expand Down