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 --- config/app.php | 2 +- src/Http/UrlGenerator.php | 25 +++++++++++ src/Http/UrlGeneratorServiceProvider.php | 14 ++++++ src/Routing/RoutingServiceProvider.php | 14 ------ src/Routing/UrlGenerator.php | 25 ----------- src/helpers.php | 4 +- tests/Unit/HelpersTest.php | 4 +- .../Unit/Http/UrlGeneratorServiceProviderTest.php | 29 ++++++++++++ tests/Unit/Http/UrlGeneratorTest.php | 51 ++++++++++++++++++++++ tests/Unit/Routing/RoutingServiceProviderTest.php | 29 ------------ tests/Unit/Routing/UrlGeneratorTest.php | 51 ---------------------- 11 files changed, 124 insertions(+), 124 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 create mode 100644 tests/Unit/Http/UrlGeneratorServiceProviderTest.php create mode 100644 tests/Unit/Http/UrlGeneratorTest.php delete mode 100644 tests/Unit/Routing/RoutingServiceProviderTest.php delete mode 100644 tests/Unit/Routing/UrlGeneratorTest.php diff --git a/config/app.php b/config/app.php index bb405fde..6278f193 100644 --- a/config/app.php +++ b/config/app.php @@ -8,7 +8,7 @@ return [ \Engelsystem\Logger\LoggerServiceProvider::class, \Engelsystem\Exceptions\ExceptionsServiceProvider::class, \Engelsystem\Config\ConfigServiceProvider::class, - \Engelsystem\Routing\RoutingServiceProvider::class, + \Engelsystem\Http\UrlGeneratorServiceProvider::class, \Engelsystem\Renderer\RendererServiceProvider::class, \Engelsystem\Database\DatabaseServiceProvider::class, \Engelsystem\Http\RequestServiceProvider::class, 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; diff --git a/tests/Unit/HelpersTest.php b/tests/Unit/HelpersTest.php index 82030169..b59b11ee 100644 --- a/tests/Unit/HelpersTest.php +++ b/tests/Unit/HelpersTest.php @@ -8,7 +8,7 @@ use Engelsystem\Container\Container; use Engelsystem\Http\Request; use Engelsystem\Http\Response; use Engelsystem\Renderer\Renderer; -use Engelsystem\Routing\UrlGenerator; +use Engelsystem\Http\UrlGenerator; use PHPUnit\Framework\TestCase; use PHPUnit_Framework_MockObject_MockObject as MockObject; use Symfony\Component\HttpFoundation\Session\Session; @@ -202,7 +202,7 @@ class HelpersTest extends TestCase $urlGeneratorMock = $this->getMockBuilder(UrlGenerator::class) ->getMock(); - $this->getAppMock('routing.urlGenerator', $urlGeneratorMock); + $this->getAppMock('http.urlGenerator', $urlGeneratorMock); $this->assertEquals($urlGeneratorMock, url()); $urlGeneratorMock->expects($this->once()) diff --git a/tests/Unit/Http/UrlGeneratorServiceProviderTest.php b/tests/Unit/Http/UrlGeneratorServiceProviderTest.php new file mode 100644 index 00000000..f3d5e018 --- /dev/null +++ b/tests/Unit/Http/UrlGeneratorServiceProviderTest.php @@ -0,0 +1,29 @@ +getMockBuilder(UrlGenerator::class) + ->getMock(); + + $app = $this->getApp(); + + $this->setExpects($app, 'make', [UrlGenerator::class], $urlGenerator); + $this->setExpects($app, 'instance', ['http.urlGenerator', $urlGenerator]); + + $serviceProvider = new UrlGeneratorServiceProvider($app); + $serviceProvider->register(); + } +} diff --git a/tests/Unit/Http/UrlGeneratorTest.php b/tests/Unit/Http/UrlGeneratorTest.php new file mode 100644 index 00000000..89ffa7dd --- /dev/null +++ b/tests/Unit/Http/UrlGeneratorTest.php @@ -0,0 +1,51 @@ + 'abc', 'bla' => 'foo'], 'http://f.b/foo?test=abc&bla=foo'], + ]; + } + + /** + * @dataProvider provideLinksTo + * @covers \Engelsystem\Http\UrlGenerator::to + * + * @param string $path + * @param string $willReturn + * @param string $urlToPath + * @param string[] $arguments + * @param string $expectedUrl + */ + public function testTo($urlToPath, $path, $willReturn, $arguments, $expectedUrl) + { + $app = new Container(); + $urlGenerator = new UrlGenerator(); + Application::setInstance($app); + + $request = $this->getMockBuilder(Request::class) + ->getMock(); + + $request->expects($this->once()) + ->method('getUriForPath') + ->with($path) + ->willReturn($willReturn); + + $app->instance('request', $request); + + $url = $urlGenerator->to($urlToPath, $arguments); + $this->assertEquals($expectedUrl, $url); + } +} diff --git a/tests/Unit/Routing/RoutingServiceProviderTest.php b/tests/Unit/Routing/RoutingServiceProviderTest.php deleted file mode 100644 index dd9441eb..00000000 --- a/tests/Unit/Routing/RoutingServiceProviderTest.php +++ /dev/null @@ -1,29 +0,0 @@ -getMockBuilder(UrlGenerator::class) - ->getMock(); - - $app = $this->getApp(); - - $this->setExpects($app, 'make', [UrlGenerator::class], $urlGenerator); - $this->setExpects($app, 'instance', ['routing.urlGenerator', $urlGenerator]); - - $serviceProvider = new RoutingServiceProvider($app); - $serviceProvider->register(); - } -} diff --git a/tests/Unit/Routing/UrlGeneratorTest.php b/tests/Unit/Routing/UrlGeneratorTest.php deleted file mode 100644 index 6da59a4f..00000000 --- a/tests/Unit/Routing/UrlGeneratorTest.php +++ /dev/null @@ -1,51 +0,0 @@ - 'abc', 'bla' => 'foo'], 'http://f.b/foo?test=abc&bla=foo'], - ]; - } - - /** - * @dataProvider provideLinksTo - * @covers \Engelsystem\Routing\UrlGenerator::to - * - * @param string $path - * @param string $willReturn - * @param string $urlToPath - * @param string[] $arguments - * @param string $expectedUrl - */ - public function testTo($urlToPath, $path, $willReturn, $arguments, $expectedUrl) - { - $app = new Container(); - $urlGenerator = new UrlGenerator(); - Application::setInstance($app); - - $request = $this->getMockBuilder(Request::class) - ->getMock(); - - $request->expects($this->once()) - ->method('getUriForPath') - ->with($path) - ->willReturn($willReturn); - - $app->instance('request', $request); - - $url = $urlGenerator->to($urlToPath, $arguments); - $this->assertEquals($expectedUrl, $url); - } -} -- cgit v1.2.3-54-g00ecf