[5.4] All tests have been namespaced

composer.json

@@ -91,8 +91,11 @@
     },
     "autoload-dev": {
         "files": [
-            "tests/Redis/InteractsWithRedis.php"
-        ]
+            "tests/Database/stubs/MigrationCreatorFakeMigration.php"
+        ],
+        "psr-4": {
+            "Illuminate\\Tests\\": "tests/"
+        }
     },
     "extra": {
         "branch-alias": {

tests/Auth/AuthAccessGateTest.php

@@ -1,15 +1,19 @@
 <?php
 
+namespace Illuminate\Tests\Auth;
+
+use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use Illuminate\Auth\Access\Gate;
 use Illuminate\Container\Container;
 use Illuminate\Auth\Access\Response;
 use Illuminate\Auth\Access\HandlesAuthorization;
+use StdClass;
 
 class GateTest extends TestCase
 {
     /**
-     * @expectedException \InvalidArgumentException
+     * @expectedException InvalidArgumentException
      */
     public function test_gate_throws_exception_on_invalid_callback_type()
     {
@@ -133,7 +137,7 @@ public function test_classes_can_be_defined_as_callbacks_using_at_notation()
     {
         $gate = $this->getBasicGate();
 
-        $gate->define('foo', 'AccessGateTestClass@foo');
+        $gate->define('foo', '\Illuminate\Tests\Auth\AccessGateTestClass@foo');
 
         $this->assertTrue($gate->check('foo'));
     }

tests/Auth/AuthDatabaseTokenRepositoryTest.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace Illuminate\Tests\Auth;
+
+use Illuminate\Auth\Passwords\DatabaseTokenRepository;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
 
@@ -103,7 +106,7 @@ public function testDeleteExpiredMethodDeletesExpiredTokens()
 
     protected function getRepo()
     {
-        return new Illuminate\Auth\Passwords\DatabaseTokenRepository(
+        return new DatabaseTokenRepository(
             m::mock('Illuminate\Database\Connection'),
             m::mock('Illuminate\Contracts\Hashing\Hasher'),
             'table', 'key');

tests/Auth/AuthDatabaseUserProviderTest.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace Illuminate\Tests\Auth;
+
+use Illuminate\Auth\DatabaseUserProvider;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
 
@@ -16,7 +19,7 @@ public function testRetrieveByIDReturnsUserWhenUserIsFound()
         $conn->shouldReceive('table')->once()->with('foo')->andReturn($conn);
         $conn->shouldReceive('find')->once()->with(1)->andReturn(['id' => 1, 'name' => 'Dayle']);
         $hasher = m::mock('Illuminate\Contracts\Hashing\Hasher');
-        $provider = new Illuminate\Auth\DatabaseUserProvider($conn, $hasher, 'foo');
+        $provider = new DatabaseUserProvider($conn, $hasher, 'foo');
         $user = $provider->retrieveById(1);
 
         $this->assertInstanceOf('Illuminate\Auth\GenericUser', $user);
@@ -30,7 +33,7 @@ public function testRetrieveByIDReturnsNullWhenUserIsNotFound()
         $conn->shouldReceive('table')->once()->with('foo')->andReturn($conn);
         $conn->shouldReceive('find')->once()->with(1)->andReturn(null);
         $hasher = m::mock('Illuminate\Contracts\Hashing\Hasher');
-        $provider = new Illuminate\Auth\DatabaseUserProvider($conn, $hasher, 'foo');
+        $provider = new DatabaseUserProvider($conn, $hasher, 'foo');
         $user = $provider->retrieveById(1);
 
         $this->assertNull($user);
@@ -43,7 +46,7 @@ public function testRetrieveByCredentialsReturnsUserWhenUserIsFound()
         $conn->shouldReceive('where')->once()->with('username', 'dayle');
         $conn->shouldReceive('first')->once()->andReturn(['id' => 1, 'name' => 'taylor']);
         $hasher = m::mock('Illuminate\Contracts\Hashing\Hasher');
-        $provider = new Illuminate\Auth\DatabaseUserProvider($conn, $hasher, 'foo');
+        $provider = new DatabaseUserProvider($conn, $hasher, 'foo');
         $user = $provider->retrieveByCredentials(['username' => 'dayle', 'password' => 'foo']);
 
         $this->assertInstanceOf('Illuminate\Auth\GenericUser', $user);
@@ -58,7 +61,7 @@ public function testRetrieveByCredentialsReturnsNullWhenUserIsFound()
         $conn->shouldReceive('where')->once()->with('username', 'dayle');
         $conn->shouldReceive('first')->once()->andReturn(null);
         $hasher = m::mock('Illuminate\Contracts\Hashing\Hasher');
-        $provider = new Illuminate\Auth\DatabaseUserProvider($conn, $hasher, 'foo');
+        $provider = new DatabaseUserProvider($conn, $hasher, 'foo');
         $user = $provider->retrieveByCredentials(['username' => 'dayle']);
 
         $this->assertNull($user);
@@ -69,7 +72,7 @@ public function testCredentialValidation()
         $conn = m::mock('Illuminate\Database\Connection');
         $hasher = m::mock('Illuminate\Contracts\Hashing\Hasher');
         $hasher->shouldReceive('check')->once()->with('plain', 'hash')->andReturn(true);
-        $provider = new Illuminate\Auth\DatabaseUserProvider($conn, $hasher, 'foo');
+        $provider = new DatabaseUserProvider($conn, $hasher, 'foo');
         $user = m::mock('Illuminate\Contracts\Auth\Authenticatable');
         $user->shouldReceive('getAuthPassword')->once()->andReturn('hash');
         $result = $provider->validateCredentials($user, ['password' => 'plain']);

tests/Auth/AuthEloquentUserProviderTest.php

@@ -1,7 +1,10 @@
 <?php
 
+namespace Illuminate\Tests\Auth;
+
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
+use Illuminate\Auth\EloquentUserProvider;
 
 class AuthEloquentUserProviderTest extends TestCase
 {
@@ -40,7 +43,7 @@ public function testCredentialValidation()
         $conn = m::mock('Illuminate\Database\Connection');
         $hasher = m::mock('Illuminate\Contracts\Hashing\Hasher');
         $hasher->shouldReceive('check')->once()->with('plain', 'hash')->andReturn(true);
-        $provider = new Illuminate\Auth\EloquentUserProvider($hasher, 'foo');
+        $provider = new EloquentUserProvider($hasher, 'foo');
         $user = m::mock('Illuminate\Contracts\Auth\Authenticatable');
         $user->shouldReceive('getAuthPassword')->once()->andReturn('hash');
         $result = $provider->validateCredentials($user, ['password' => 'plain']);
@@ -51,10 +54,10 @@ public function testCredentialValidation()
     public function testModelsCanBeCreated()
     {
         $hasher = m::mock('Illuminate\Contracts\Hashing\Hasher');
-        $provider = new Illuminate\Auth\EloquentUserProvider($hasher, 'EloquentProviderUserStub');
+        $provider = new EloquentUserProvider($hasher, 'Illuminate\Tests\Auth\EloquentProviderUserStub');
         $model = $provider->createModel();
 
-        $this->assertInstanceOf('EloquentProviderUserStub', $model);
+        $this->assertInstanceOf('Illuminate\Tests\Auth\EloquentProviderUserStub', $model);
     }
 
     protected function getProviderMock()

tests/Auth/AuthGuardTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Illuminate\Tests\Auth;
+
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
 use Illuminate\Auth\Events\Failed;
@@ -20,7 +22,7 @@ public function testBasicReturnsNullOnValidAttempt()
         $guard = m::mock('Illuminate\Auth\SessionGuard[check,attempt]', ['default', $provider, $session]);
         $guard->shouldReceive('check')->once()->andReturn(false);
         $guard->shouldReceive('attempt')->once()->with(['email' => 'foo@bar.com', 'password' => 'secret'])->andReturn(true);
-        $request = Symfony\Component\HttpFoundation\Request::create('/', 'GET', [], [], [], ['PHP_AUTH_USER' => 'foo@bar.com', 'PHP_AUTH_PW' => 'secret']);
+        $request = Request::create('/', 'GET', [], [], [], ['PHP_AUTH_USER' => 'foo@bar.com', 'PHP_AUTH_PW' => 'secret']);
         $guard->setRequest($request);
 
         $guard->basic('email');
@@ -32,7 +34,7 @@ public function testBasicReturnsNullWhenAlreadyLoggedIn()
         $guard = m::mock('Illuminate\Auth\SessionGuard[check]', ['default', $provider, $session]);
         $guard->shouldReceive('check')->once()->andReturn(true);
         $guard->shouldReceive('attempt')->never();
-        $request = Symfony\Component\HttpFoundation\Request::create('/', 'GET', [], [], [], ['PHP_AUTH_USER' => 'foo@bar.com', 'PHP_AUTH_PW' => 'secret']);
+        $request = Request::create('/', 'GET', [], [], [], ['PHP_AUTH_USER' => 'foo@bar.com', 'PHP_AUTH_PW' => 'secret']);
         $guard->setRequest($request);
 
         $guard->basic('email');
@@ -44,7 +46,7 @@ public function testBasicReturnsResponseOnFailure()
         $guard = m::mock('Illuminate\Auth\SessionGuard[check,attempt]', ['default', $provider, $session]);
         $guard->shouldReceive('check')->once()->andReturn(false);
         $guard->shouldReceive('attempt')->once()->with(['email' => 'foo@bar.com', 'password' => 'secret'])->andReturn(false);
-        $request = Symfony\Component\HttpFoundation\Request::create('/', 'GET', [], [], [], ['PHP_AUTH_USER' => 'foo@bar.com', 'PHP_AUTH_PW' => 'secret']);
+        $request = \Symfony\Component\HttpFoundation\Request::create('/', 'GET', [], [], [], ['PHP_AUTH_USER' => 'foo@bar.com', 'PHP_AUTH_PW' => 'secret']);
         $guard->setRequest($request);
         $response = $guard->basic('email');
 
@@ -58,7 +60,7 @@ public function testBasicWithExtraConditions()
         $guard = m::mock('Illuminate\Auth\SessionGuard[check,attempt]', ['default', $provider, $session]);
         $guard->shouldReceive('check')->once()->andReturn(false);
         $guard->shouldReceive('attempt')->once()->with(['email' => 'foo@bar.com', 'password' => 'secret', 'active' => 1])->andReturn(true);
-        $request = Symfony\Component\HttpFoundation\Request::create('/', 'GET', [], [], [], ['PHP_AUTH_USER' => 'foo@bar.com', 'PHP_AUTH_PW' => 'secret']);
+        $request = \Symfony\Component\HttpFoundation\Request::create('/', 'GET', [], [], [], ['PHP_AUTH_USER' => 'foo@bar.com', 'PHP_AUTH_PW' => 'secret']);
         $guard->setRequest($request);
 
         $guard->basic('email', ['active' => 1]);
@@ -261,9 +263,9 @@ public function testLogoutFiresLogoutEvent()
     public function testLoginMethodQueuesCookieWhenRemembering()
     {
         list($session, $provider, $request, $cookie) = $this->getMocks();
-        $guard = new Illuminate\Auth\SessionGuard('default', $provider, $session, $request);
+        $guard = new \Illuminate\Auth\SessionGuard('default', $provider, $session, $request);
         $guard->setCookieJar($cookie);
-        $foreverCookie = new Symfony\Component\HttpFoundation\Cookie($guard->getRecallerName(), 'foo');
+        $foreverCookie = new \Symfony\Component\HttpFoundation\Cookie($guard->getRecallerName(), 'foo');
         $cookie->shouldReceive('forever')->once()->with($guard->getRecallerName(), 'foo|recaller')->andReturn($foreverCookie);
         $cookie->shouldReceive('queue')->once()->with($foreverCookie);
         $guard->getSession()->shouldReceive('put')->once()->with($guard->getName(), 'foo');
@@ -279,9 +281,9 @@ public function testLoginMethodQueuesCookieWhenRemembering()
     public function testLoginMethodCreatesRememberTokenIfOneDoesntExist()
     {
         list($session, $provider, $request, $cookie) = $this->getMocks();
-        $guard = new Illuminate\Auth\SessionGuard('default', $provider, $session, $request);
+        $guard = new \Illuminate\Auth\SessionGuard('default', $provider, $session, $request);
         $guard->setCookieJar($cookie);
-        $foreverCookie = new Symfony\Component\HttpFoundation\Cookie($guard->getRecallerName(), 'foo');
+        $foreverCookie = new \Symfony\Component\HttpFoundation\Cookie($guard->getRecallerName(), 'foo');
         $cookie->shouldReceive('forever')->once()->andReturn($foreverCookie);
         $cookie->shouldReceive('queue')->once()->with($foreverCookie);
         $guard->getSession()->shouldReceive('put')->once()->with($guard->getName(), 'foo');
@@ -345,8 +347,8 @@ public function testUserUsesRememberCookieIfItExists()
     {
         $guard = $this->getGuard();
         list($session, $provider, $request, $cookie) = $this->getMocks();
-        $request = Symfony\Component\HttpFoundation\Request::create('/', 'GET', [], [$guard->getRecallerName() => 'id|recaller']);
-        $guard = new Illuminate\Auth\SessionGuard('default', $provider, $session, $request);
+        $request = \Symfony\Component\HttpFoundation\Request::create('/', 'GET', [], [$guard->getRecallerName() => 'id|recaller']);
+        $guard = new \Illuminate\Auth\SessionGuard('default', $provider, $session, $request);
         $guard->getSession()->shouldReceive('get')->once()->with($guard->getName())->andReturn(null);
         $user = m::mock('Illuminate\Contracts\Auth\Authenticatable');
         $guard->getProvider()->shouldReceive('retrieveByToken')->once()->with('id', 'recaller')->andReturn($user);
@@ -361,21 +363,21 @@ protected function getGuard()
     {
         list($session, $provider, $request, $cookie) = $this->getMocks();
 
-        return new Illuminate\Auth\SessionGuard('default', $provider, $session, $request);
+        return new \Illuminate\Auth\SessionGuard('default', $provider, $session, $request);
     }
 
     protected function getMocks()
     {
         return [
             m::mock('Illuminate\Contracts\Session\Session'),
             m::mock('Illuminate\Contracts\Auth\UserProvider'),
-            Symfony\Component\HttpFoundation\Request::create('/', 'GET'),
+            \Symfony\Component\HttpFoundation\Request::create('/', 'GET'),
             m::mock('Illuminate\Cookie\CookieJar'),
         ];
     }
 
     protected function getCookieJar()
     {
-        return new Illuminate\Cookie\CookieJar(Request::create('/foo', 'GET'), m::mock('Illuminate\Contracts\Encryption\Encrypter'), ['domain' => 'foo.com', 'path' => '/', 'secure' => false, 'httpOnly' => false]);
+        return new \Illuminate\Cookie\CookieJar(Request::create('/foo', 'GET'), m::mock('Illuminate\Contracts\Encryption\Encrypter'), ['domain' => 'foo.com', 'path' => '/', 'secure' => false, 'httpOnly' => false]);
     }
 }

tests/Auth/AuthPasswordBrokerTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Illuminate\Tests\Auth;
+
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
 use Illuminate\Contracts\Auth\PasswordBroker;
@@ -134,7 +136,7 @@ public function testResetRemovesRecordOnReminderTableAndCallsCallback()
 
     protected function getBroker($mocks)
     {
-        return new Illuminate\Auth\Passwords\PasswordBroker($mocks['tokens'], $mocks['users'], $mocks['mailer'], $mocks['view']);
+        return new \Illuminate\Auth\Passwords\PasswordBroker($mocks['tokens'], $mocks['users'], $mocks['mailer'], $mocks['view']);
     }
 
     protected function getMocks()

tests/Auth/AuthTokenGuardTest.php

@@ -1,7 +1,10 @@
 <?php
 
+namespace Illuminate\Tests\Auth;
+
 use Illuminate\Http\Request;
 use Illuminate\Auth\TokenGuard;
+use Mockery;
 use PHPUnit\Framework\TestCase;
 use Illuminate\Contracts\Auth\UserProvider;
 

tests/Auth/AuthenticateMiddlewareTest.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace Illuminate\Tests\Auth;
+
+use stdClass;
 use Mockery as m;
 use Illuminate\Http\Request;
 use PHPUnit\Framework\TestCase;
@@ -31,7 +34,7 @@ public function setUp()
     }
 
     /**
-     * @expectedException Illuminate\Auth\AuthenticationException
+     * @expectedException \Illuminate\Auth\AuthenticationException
      */
     public function testDefaultUnauthenticatedThrows()
     {
@@ -76,7 +79,7 @@ public function testSecondaryAuthenticatedUpdatesDefaultDriver()
     }
 
     /**
-     * @expectedException Illuminate\Auth\AuthenticationException
+     * @expectedException \Illuminate\Auth\AuthenticationException
      */
     public function testMultipleDriversUnauthenticatedThrows()
     {
@@ -172,7 +175,7 @@ protected function createAuthDriver($authenticated)
      * @param  string  ...$guards
      * @return void
      *
-     * @throws \Illuminate\Auth\AuthenticationException
+     * @throws AuthenticationException
      */
     protected function authenticate(...$guards)
     {

tests/Auth/AuthorizeMiddlewareTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Illuminate\Tests\Auth;
+
 use Mockery as m;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Router;
@@ -12,6 +14,7 @@
 use Illuminate\Contracts\Auth\Factory as Auth;
 use Illuminate\Routing\Middleware\SubstituteBindings;
 use Illuminate\Contracts\Auth\Access\Gate as GateContract;
+use stdClass;
 
 class AuthorizeMiddlewareTest extends TestCase
 {
@@ -52,7 +55,7 @@ public function setUp()
     }
 
     /**
-     * @expectedException Illuminate\Auth\Access\AuthorizationException
+     * @expectedException \Illuminate\Auth\Access\AuthorizationException
      */
     public function testSimpleAbilityUnauthorized()
     {
@@ -91,7 +94,7 @@ public function testSimpleAbilityAuthorized()
     }
 
     /**
-     * @expectedException Illuminate\Auth\Access\AuthorizationException
+     * @expectedException \Illuminate\Auth\Access\AuthorizationException
      */
     public function testModelTypeUnauthorized()
     {
@@ -132,7 +135,7 @@ public function testModelTypeAuthorized()
     }
 
     /**
-     * @expectedException Illuminate\Auth\Access\AuthorizationException
+     * @expectedException \Illuminate\Auth\Access\AuthorizationException
      */
     public function testModelUnauthorized()
     {

tests/Auth/AuthorizesResourcesTest.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace Illuminate\Tests\Auth;
+
+use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Router;
 use PHPUnit\Framework\TestCase;
@@ -60,10 +63,10 @@ public function testDestroyMethod()
      */
     protected function assertHasMiddleware($controller, $method, $middleware)
     {
-        $router = new Router(new Illuminate\Events\Dispatcher);
+        $router = new Router(new \Illuminate\Events\Dispatcher);
 
-        $router->aliasMiddleware('can', 'AuthorizesResourcesMiddleware');
-        $router->get($method)->uses('AuthorizesResourcesController@'.$method);
+        $router->aliasMiddleware('can', '\Illuminate\Tests\Auth\AuthorizesResourcesMiddleware');
+        $router->get($method)->uses('\Illuminate\Tests\Auth\AuthorizesResourcesController@'.$method);
 
         $this->assertEquals(
             'caught '.$middleware,