Skip to content

Commit 9427f5c

Browse files
authored
Merge pull request dingo#1287 from lucasmichot/feature/master/remove-useless-fqn
Remove useless FQN
2 parents cc505e0 + 5c4c415 commit 9427f5c

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

tests/Http/Middleware/AuthTest.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
use Dingo\Api\Routing\Router;
1010
use PHPUnit_Framework_TestCase;
1111
use Illuminate\Container\Container;
12-
use Dingo\Api\Http\Middleware\Auth as AuthMiddleware;
1312
use Dingo\Api\Tests\Stubs\RoutingAdapterStub;
13+
use Illuminate\Routing\Route as IlluminateRoute;
14+
use Dingo\Api\Http\Middleware\Auth as AuthMiddleware;
1415
use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
1516

1617
class AuthTest extends PHPUnit_Framework_TestCase
@@ -28,7 +29,7 @@ public function testProtectedRouteFiresAuthenticationAndPasses()
2829
{
2930
$request = Request::create('test', 'GET');
3031

31-
$route = new Route($this->adapter, $this->container, $request, new \Illuminate\Routing\Route('GET', '/test', [
32+
$route = new Route($this->adapter, $this->container, $request, new IlluminateRoute('GET', '/test', [
3233
'providers' => [],
3334
]));
3435

@@ -46,7 +47,7 @@ public function testProtectedRouteAlreadyLoggedIn()
4647
{
4748
$request = Request::create('test', 'GET');
4849

49-
$route = new Route($this->adapter, $this->container, $request, new \Illuminate\Routing\Route('GET', '/test', [
50+
$route = new Route($this->adapter, $this->container, $request, new IlluminateRoute('GET', '/test', [
5051
'providers' => [],
5152
]));
5253

@@ -68,7 +69,7 @@ public function testAuthenticationFailsAndExceptionIsThrown()
6869

6970
$request = Request::create('test', 'GET');
7071

71-
$route = new Route($this->adapter, $this->container, $request, new \Illuminate\Routing\Route('GET', '/test', [
72+
$route = new Route($this->adapter, $this->container, $request, new IlluminateRoute('GET', '/test', [
7273
'providers' => [],
7374
]));
7475

tests/Routing/RouteTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use PHPUnit_Framework_TestCase;
99
use Illuminate\Container\Container;
1010
use Dingo\Api\Tests\Stubs\RoutingAdapterStub;
11+
use Illuminate\Routing\Route as IlluminateRoute;
1112

1213
class RouteTest extends PHPUnit_Framework_TestCase
1314
{
@@ -26,7 +27,7 @@ public function testCreatingNewRoute()
2627
{
2728
$request = Request::create('foo', 'GET');
2829

29-
$route = new Route($this->adapter, $this->container, $request, new \Illuminate\Routing\Route(['GET', 'HEAD'], 'foo', [
30+
$route = new Route($this->adapter, $this->container, $request, new IlluminateRoute(['GET', 'HEAD'], 'foo', [
3031
'scopes' => ['foo', 'bar'],
3132
'providers' => ['foo'],
3233
'limit' => 5,
@@ -50,7 +51,7 @@ public function testControllerOptionsMergeAndOverrideRouteOptions()
5051
{
5152
$request = Request::create('foo', 'GET');
5253

53-
$route = new Route($this->adapter, $this->container, $request, new \Illuminate\Routing\Route(['GET', 'HEAD'], 'foo', [
54+
$route = new Route($this->adapter, $this->container, $request, new IlluminateRoute(['GET', 'HEAD'], 'foo', [
5455
'scopes' => ['foo', 'bar'],
5556
'providers' => ['foo'],
5657
'limit' => 5,
@@ -69,7 +70,7 @@ public function testControllerOptionsMergeAndOverrideRouteOptions()
6970
$this->assertTrue($route->hasThrottle(), 'Route did not setup throttle correctly.');
7071
$this->assertInstanceOf('Dingo\Api\Tests\Stubs\BasicThrottleStub', $route->getThrottle(), 'Route did not setup throttle correctly.');
7172

72-
$route = new Route($this->adapter, $this->container, $request, new \Illuminate\Routing\Route(['GET', 'HEAD'], 'foo/bar', [
73+
$route = new Route($this->adapter, $this->container, $request, new IlluminateRoute(['GET', 'HEAD'], 'foo/bar', [
7374
'scopes' => ['foo', 'bar'],
7475
'providers' => ['foo'],
7576
'limit' => 5,

tests/Stubs/RoutingAdapterStub.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
namespace Dingo\Api\Tests\Stubs;
44

55
use Closure;
6-
use Illuminate\Container\Container;
7-
use Illuminate\Http\JsonResponse;
8-
use Illuminate\Http\Request;
96
use Dingo\Api\Http\Response;
7+
use Illuminate\Http\Request;
8+
use Illuminate\Http\JsonResponse;
9+
use Illuminate\Pipeline\Pipeline;
10+
use Illuminate\Container\Container;
1011
use Dingo\Api\Contract\Routing\Adapter;
12+
use Illuminate\Routing\Route as IlluminateRoute;
1113
use Illuminate\Http\Response as IlluminateResponse;
12-
use Illuminate\Pipeline\Pipeline;
1314

1415
class RoutingAdapterStub implements Adapter
1516
{
@@ -71,7 +72,7 @@ public function addRoute(array $methods, array $versions, $uri, $action)
7172
{
7273
$this->createRouteCollections($versions);
7374

74-
$route = new \Illuminate\Routing\Route($methods, $uri, $action);
75+
$route = new IlluminateRoute($methods, $uri, $action);
7576
$this->addWhereClausesToRoute($route);
7677

7778
foreach ($versions as $version) {

0 commit comments

Comments
 (0)