From 73c9d923e7cc77847cfcbff4b90ad4815699a4fa Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Wed, 22 Aug 2018 03:10:08 +0200 Subject: Renamed RoutingServiceProvider to Http\UrlGeneratorServiceProvider --- src/Http/UrlGenerator.php | 25 +++++++++++++++++++++++++ src/Http/UrlGeneratorServiceProvider.php | 14 ++++++++++++++ src/Routing/RoutingServiceProvider.php | 14 -------------- src/Routing/UrlGenerator.php | 25 ------------------------- src/helpers.php | 4 ++-- 5 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 src/Http/UrlGenerator.php create mode 100644 src/Http/UrlGeneratorServiceProvider.php delete mode 100644 src/Routing/RoutingServiceProvider.php delete mode 100644 src/Routing/UrlGenerator.php (limited to 'src') diff --git a/src/Http/UrlGenerator.php b/src/Http/UrlGenerator.php new file mode 100644 index 00000000..132fefc7 --- /dev/null +++ b/src/Http/UrlGenerator.php @@ -0,0 +1,25 @@ +getUriForPath($path); + + if (!empty($parameters) && is_array($parameters)) { + $parameters = http_build_query($parameters); + $uri .= '?' . $parameters; + } + + return $uri; + } +} diff --git a/src/Http/UrlGeneratorServiceProvider.php b/src/Http/UrlGeneratorServiceProvider.php new file mode 100644 index 00000000..37304076 --- /dev/null +++ b/src/Http/UrlGeneratorServiceProvider.php @@ -0,0 +1,14 @@ +app->make(UrlGenerator::class); + $this->app->instance('http.urlGenerator', $urlGenerator); + } +} diff --git a/src/Routing/RoutingServiceProvider.php b/src/Routing/RoutingServiceProvider.php deleted file mode 100644 index b7db1383..00000000 --- a/src/Routing/RoutingServiceProvider.php +++ /dev/null @@ -1,14 +0,0 @@ -app->make(UrlGenerator::class); - $this->app->instance('routing.urlGenerator', $urlGenerator); - } -} diff --git a/src/Routing/UrlGenerator.php b/src/Routing/UrlGenerator.php deleted file mode 100644 index 6df52425..00000000 --- a/src/Routing/UrlGenerator.php +++ /dev/null @@ -1,25 +0,0 @@ -getUriForPath($path); - - if (!empty($parameters) && is_array($parameters)) { - $parameters = http_build_query($parameters); - $uri .= '?' . $parameters; - } - - return $uri; - } -} diff --git a/src/helpers.php b/src/helpers.php index 01fb10bd..a90b2462 100644 --- a/src/helpers.php +++ b/src/helpers.php @@ -6,7 +6,7 @@ use Engelsystem\Config\Config; use Engelsystem\Http\Request; use Engelsystem\Http\Response; use Engelsystem\Renderer\Renderer; -use Engelsystem\Routing\UrlGenerator; +use Engelsystem\Http\UrlGenerator; use Symfony\Component\HttpFoundation\Session\SessionInterface; /** @@ -125,7 +125,7 @@ function session($key = null, $default = null) */ function url($path = null, $parameters = []) { - $urlGenerator = app('routing.urlGenerator'); + $urlGenerator = app('http.urlGenerator'); if (is_null($path)) { return $urlGenerator; -- cgit v1.2.3-54-g00ecf