iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed RoutingServiceProvider to Http\UrlGeneratorServiceProvider

This commit is contained in:
Igor Scheller 2018-08-22 03:10:08 +02:00
parent b0e7bc0df2
commit 73c9d923e7
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/app.php
View File

@ -8,7 +8,7 @@ return [
\Engelsystem\Logger\LoggerServiceProvider::class, \Engelsystem\Logger\LoggerServiceProvider::class,
\Engelsystem\Exceptions\ExceptionsServiceProvider::class, \Engelsystem\Exceptions\ExceptionsServiceProvider::class,
\Engelsystem\Config\ConfigServiceProvider::class, \Engelsystem\Config\ConfigServiceProvider::class,
\Engelsystem\Routing\RoutingServiceProvider::class, \Engelsystem\Http\UrlGeneratorServiceProvider::class,
\Engelsystem\Renderer\RendererServiceProvider::class, \Engelsystem\Renderer\RendererServiceProvider::class,
\Engelsystem\Database\DatabaseServiceProvider::class, \Engelsystem\Database\DatabaseServiceProvider::class,
\Engelsystem\Http\RequestServiceProvider::class, \Engelsystem\Http\RequestServiceProvider::class,

2
src/Routing/UrlGenerator.php → src/Http/UrlGenerator.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Engelsystem\Routing; namespace Engelsystem\Http;
class UrlGenerator class UrlGenerator
{ {

6
src/Routing/RoutingServiceProvider.php → src/Http/UrlGeneratorServiceProvider.php
View File

@ -1,14 +1,14 @@
<?php <?php
namespace Engelsystem\Routing; namespace Engelsystem\Http;
use Engelsystem\Container\ServiceProvider; use Engelsystem\Container\ServiceProvider;
class RoutingServiceProvider extends ServiceProvider class UrlGeneratorServiceProvider extends ServiceProvider
{ {
public function register() public function register()
{ {
$urlGenerator = $this->app->make(UrlGenerator::class); $urlGenerator = $this->app->make(UrlGenerator::class);
$this->app->instance('routing.urlGenerator', $urlGenerator); $this->app->instance('http.urlGenerator', $urlGenerator);
} }
} }

4
src/helpers.php
View File

@ -6,7 +6,7 @@ use Engelsystem\Config\Config;
use Engelsystem\Http\Request; use Engelsystem\Http\Request;
use Engelsystem\Http\Response; use Engelsystem\Http\Response;
use Engelsystem\Renderer\Renderer; use Engelsystem\Renderer\Renderer;
use Engelsystem\Routing\UrlGenerator; use Engelsystem\Http\UrlGenerator;
use Symfony\Component\HttpFoundation\Session\SessionInterface; use Symfony\Component\HttpFoundation\Session\SessionInterface;
/** /**
@ -125,7 +125,7 @@ function session($key = null, $default = null)
*/ */
function url($path = null, $parameters = []) function url($path = null, $parameters = [])
{ {
$urlGenerator = app('routing.urlGenerator'); $urlGenerator = app('http.urlGenerator');
if (is_null($path)) { if (is_null($path)) {
return $urlGenerator; return $urlGenerator;

4
tests/Unit/HelpersTest.php
View File

@ -8,7 +8,7 @@ use Engelsystem\Container\Container;
use Engelsystem\Http\Request; use Engelsystem\Http\Request;
use Engelsystem\Http\Response; use Engelsystem\Http\Response;
use Engelsystem\Renderer\Renderer; use Engelsystem\Renderer\Renderer;
use Engelsystem\Routing\UrlGenerator; use Engelsystem\Http\UrlGenerator;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use PHPUnit_Framework_MockObject_MockObject as MockObject; use PHPUnit_Framework_MockObject_MockObject as MockObject;
use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpFoundation\Session\Session;
@ -202,7 +202,7 @@ class HelpersTest extends TestCase
$urlGeneratorMock = $this->getMockBuilder(UrlGenerator::class) $urlGeneratorMock = $this->getMockBuilder(UrlGenerator::class)
->getMock(); ->getMock();
$this->getAppMock('routing.urlGenerator', $urlGeneratorMock); $this->getAppMock('http.urlGenerator', $urlGeneratorMock);
$this->assertEquals($urlGeneratorMock, url()); $this->assertEquals($urlGeneratorMock, url());
$urlGeneratorMock->expects($this->once()) $urlGeneratorMock->expects($this->once())

12
tests/Unit/Routing/RoutingServiceProviderTest.php → tests/Unit/Http/UrlGeneratorServiceProviderTest.php
View File

@ -2,15 +2,15 @@
namespace Engelsystem\Test\Unit\Routing; namespace Engelsystem\Test\Unit\Routing;
use Engelsystem\Routing\RoutingServiceProvider; use Engelsystem\Http\UrlGenerator;
use Engelsystem\Routing\UrlGenerator; use Engelsystem\Http\UrlGeneratorServiceProvider;
use Engelsystem\Test\Unit\ServiceProviderTest; use Engelsystem\Test\Unit\ServiceProviderTest;
use PHPUnit_Framework_MockObject_MockObject; use PHPUnit_Framework_MockObject_MockObject;
class RoutingServiceProviderTest extends ServiceProviderTest class UrlGeneratorServiceProviderTest extends ServiceProviderTest
{ {
/** /**
* @covers \Engelsystem\Routing\RoutingServiceProvider::register() * @covers \Engelsystem\Http\UrlGeneratorServiceProvider::register()
*/ */
public function testRegister() public function testRegister()
{ {
@ -21,9 +21,9 @@ class RoutingServiceProviderTest extends ServiceProviderTest
$app = $this->getApp(); $app = $this->getApp();
$this->setExpects($app, 'make', [UrlGenerator::class], $urlGenerator); $this->setExpects($app, 'make', [UrlGenerator::class], $urlGenerator);
$this->setExpects($app, 'instance', ['routing.urlGenerator', $urlGenerator]); $this->setExpects($app, 'instance', ['http.urlGenerator', $urlGenerator]);
$serviceProvider = new RoutingServiceProvider($app); $serviceProvider = new UrlGeneratorServiceProvider($app);
$serviceProvider->register(); $serviceProvider->register();
} }
} }

4
tests/Unit/Routing/UrlGeneratorTest.php → tests/Unit/Http/UrlGeneratorTest.php
View File

@ -5,7 +5,7 @@ namespace Engelsystem\Test\Unit\Routing;
use Engelsystem\Application; use Engelsystem\Application;
use Engelsystem\Container\Container; use Engelsystem\Container\Container;
use Engelsystem\Http\Request; use Engelsystem\Http\Request;
use Engelsystem\Routing\UrlGenerator; use Engelsystem\Http\UrlGenerator;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
class UrlGeneratorTest extends TestCase class UrlGeneratorTest extends TestCase
@ -21,7 +21,7 @@ class UrlGeneratorTest extends TestCase
/** /**
* @dataProvider provideLinksTo * @dataProvider provideLinksTo
* @covers \Engelsystem\Routing\UrlGenerator::to * @covers \Engelsystem\Http\UrlGenerator::to
* *
* @param string $path * @param string $path
* @param string $willReturn * @param string $willReturn