diff options
author | msquare <msquare@notrademark.de> | 2017-09-30 11:25:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-30 11:25:58 +0200 |
commit | 801c17aa6cef91be988a25a90442be8d2078a70d (patch) | |
tree | 7f03157616509fe583b1b0aea6e2d06c53bd9c89 /src/helpers.php | |
parent | e1d44e60e35d126dbd05aefa5f897fad16fbfceb (diff) | |
parent | 945fcb079a219fa29e8f6ee1afc3f1c0c5c822cb (diff) |
Merge pull request #347 from MyIgel/master
Implemented Container, closes #342
Diffstat (limited to 'src/helpers.php')
-rw-r--r-- | src/helpers.php | 43 |
1 files changed, 34 insertions, 9 deletions
diff --git a/src/helpers.php b/src/helpers.php index 24f93f2c..de303963 100644 --- a/src/helpers.php +++ b/src/helpers.php @@ -1,6 +1,7 @@ <?php // Some useful functions +use Engelsystem\Application; use Engelsystem\Config\Config; use Engelsystem\Http\Request; use Engelsystem\Renderer\Renderer; @@ -8,6 +9,21 @@ use Engelsystem\Routing\UrlGenerator; use Symfony\Component\HttpFoundation\Session\SessionInterface; /** + * Get the global app instance + * + * @param string $id + * @return mixed + */ +function app($id = null) +{ + if (is_null($id)) { + return Application::getInstance(); + } + + return Application::getInstance()->get($id); +} + +/** * Get or set config values * * @param string|array $key @@ -16,15 +32,18 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface; */ function config($key = null, $default = null) { + $config = app('config'); + if (empty($key)) { - return Config::getInstance(); + return $config; } if (is_array($key)) { - Config::getInstance()->set($key); + $config->set($key); + return true; } - return Config::getInstance()->get($key, $default); + return $config->get($key, $default); } /** @@ -34,7 +53,7 @@ function config($key = null, $default = null) */ function request($key = null, $default = null) { - $request = Request::getInstance(); + $request = app('request'); if (is_null($key)) { return $request; @@ -50,7 +69,7 @@ function request($key = null, $default = null) */ function session($key = null, $default = null) { - $session = request()->getSession(); + $session = app('session'); if (is_null($key)) { return $session; @@ -66,7 +85,7 @@ function session($key = null, $default = null) */ function view($template = null, $data = null) { - $renderer = Renderer::getInstance(); + $renderer = app('renderer'); if (is_null($template)) { return $renderer; @@ -78,9 +97,15 @@ function view($template = null, $data = null) /** * @param string $path * @param array $parameters - * @return string + * @return UrlGenerator|string */ -function url($path, $parameters = []) +function url($path = null, $parameters = []) { - return UrlGenerator::to($path, $parameters); + $urlGenerator = app('routing.urlGenerator'); + + if (is_null($path)) { + return $urlGenerator; + } + + return $urlGenerator->to($path, $parameters); } |