From 009b45a866abe32de1343485e2adf2f5562a3e9a Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Thu, 2 Nov 2017 15:57:38 -0200
Subject: [PATCH 1/2] Updated to PHPUnit 6

---
 composer.json                                 | 2 +-
 tests/AccessTokenControllerTest.php           | 3 ++-
 tests/ApiTokenCookieFactoryTest.php           | 3 ++-
 tests/ApproveAuthorizationControllerTest.php  | 3 ++-
 tests/AuthorizationControllerTest.php         | 3 ++-
 tests/AuthorizedAccessTokenControllerTest.php | 3 ++-
 tests/BridgeAccessTokenRepositoryTest.php     | 3 ++-
 tests/BridgeClientRepositoryTest.php          | 3 ++-
 tests/BridgeScopeRepositoryTest.php           | 3 ++-
 tests/CheckClientCredentialsTest.php          | 3 ++-
 tests/CheckForAnyScopeTest.php                | 3 ++-
 tests/CheckScopesTest.php                     | 3 ++-
 tests/ClientControllerTest.php                | 3 ++-
 tests/DenyAuthorizationControllerTest.php     | 3 ++-
 tests/HasApiTokensTest.php                    | 3 ++-
 tests/KeysCommandTest.php                     | 4 +++-
 tests/PassportTest.php                        | 3 ++-
 tests/PersonalAccessTokenControllerTest.php   | 3 ++-
 tests/PersonalAccessTokenFactoryTest.php      | 4 +++-
 tests/ScopeTest.php                           | 4 +++-
 tests/TokenGuardTest.php                      | 3 ++-
 tests/TokenTest.php                           | 4 +++-
 tests/TransientTokenControllerTest.php        | 3 ++-
 tests/TransientTokenTest.php                  | 4 +++-
 24 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/composer.json b/composer.json
index 91bacc6f0..5e86dca5f 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
     },
     "require-dev": {
         "mockery/mockery": "~0.9",
-        "phpunit/phpunit": "~5.0"
+        "phpunit/phpunit": "~6.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/tests/AccessTokenControllerTest.php b/tests/AccessTokenControllerTest.php
index 62fae95c1..1a0168443 100644
--- a/tests/AccessTokenControllerTest.php
+++ b/tests/AccessTokenControllerTest.php
@@ -1,9 +1,10 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 
-class AccessTokenControllerTest extends PHPUnit_Framework_TestCase
+class AccessTokenControllerTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/ApiTokenCookieFactoryTest.php b/tests/ApiTokenCookieFactoryTest.php
index bbc2c2d73..d2a3e6c1a 100644
--- a/tests/ApiTokenCookieFactoryTest.php
+++ b/tests/ApiTokenCookieFactoryTest.php
@@ -1,9 +1,10 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use Illuminate\Encryption\Encrypter;
 use Laravel\Passport\ApiTokenCookieFactory;
 
-class ApiTokenCookieFactoryTest extends PHPUnit_Framework_TestCase
+class ApiTokenCookieFactoryTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/ApproveAuthorizationControllerTest.php b/tests/ApproveAuthorizationControllerTest.php
index c9b07300d..6af519950 100644
--- a/tests/ApproveAuthorizationControllerTest.php
+++ b/tests/ApproveAuthorizationControllerTest.php
@@ -1,8 +1,9 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use League\OAuth2\Server\AuthorizationServer;
 
-class ApproveAuthorizationControllerTest extends PHPUnit_Framework_TestCase
+class ApproveAuthorizationControllerTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/AuthorizationControllerTest.php b/tests/AuthorizationControllerTest.php
index a3cb92f0d..d8e9fd678 100644
--- a/tests/AuthorizationControllerTest.php
+++ b/tests/AuthorizationControllerTest.php
@@ -1,11 +1,12 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use Illuminate\Container\Container;
 use League\OAuth2\Server\AuthorizationServer;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Contracts\Routing\ResponseFactory;
 
-class AuthorizationControllerTest extends PHPUnit_Framework_TestCase
+class AuthorizationControllerTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/AuthorizedAccessTokenControllerTest.php b/tests/AuthorizedAccessTokenControllerTest.php
index a5e45a443..e61d04fd2 100644
--- a/tests/AuthorizedAccessTokenControllerTest.php
+++ b/tests/AuthorizedAccessTokenControllerTest.php
@@ -3,10 +3,11 @@
 use Mockery\Mock;
 use Illuminate\Http\Request;
 use Laravel\Passport\Client;
+use PHPUnit\Framework\TestCase;
 use Laravel\Passport\TokenRepository;
 use Laravel\Passport\Http\Controllers\AuthorizedAccessTokenController;
 
-class AuthorizedAccessTokenControllerTest extends PHPUnit_Framework_TestCase
+class AuthorizedAccessTokenControllerTest extends TestCase
 {
     /**
      * @var Mock|TokenRepository
diff --git a/tests/BridgeAccessTokenRepositoryTest.php b/tests/BridgeAccessTokenRepositoryTest.php
index 8ae071eeb..8f1aa8c92 100644
--- a/tests/BridgeAccessTokenRepositoryTest.php
+++ b/tests/BridgeAccessTokenRepositoryTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use Carbon\Carbon;
+use PHPUnit\Framework\TestCase;
 
-class BridgeAccessTokenRepositoryTest extends PHPUnit_Framework_TestCase
+class BridgeAccessTokenRepositoryTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/BridgeClientRepositoryTest.php b/tests/BridgeClientRepositoryTest.php
index 47cb6a006..59853f79b 100644
--- a/tests/BridgeClientRepositoryTest.php
+++ b/tests/BridgeClientRepositoryTest.php
@@ -1,8 +1,9 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use Laravel\Passport\Bridge\ClientRepository;
 
-class BridgeClientRepositoryTest extends PHPUnit_Framework_TestCase
+class BridgeClientRepositoryTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/BridgeScopeRepositoryTest.php b/tests/BridgeScopeRepositoryTest.php
index 5d2196d72..d314f1884 100644
--- a/tests/BridgeScopeRepositoryTest.php
+++ b/tests/BridgeScopeRepositoryTest.php
@@ -1,11 +1,12 @@
 <?php
 
 use Laravel\Passport\Passport;
+use PHPUnit\Framework\TestCase;
 use Laravel\Passport\Bridge\Scope;
 use Laravel\Passport\Bridge\Client;
 use Laravel\Passport\Bridge\ScopeRepository;
 
-class BridgeScopeRepositoryTest extends PHPUnit_Framework_TestCase
+class BridgeScopeRepositoryTest extends TestCase
 {
     public function test_invalid_scopes_are_removed()
     {
diff --git a/tests/CheckClientCredentialsTest.php b/tests/CheckClientCredentialsTest.php
index 7ad974a00..f0b1fb029 100644
--- a/tests/CheckClientCredentialsTest.php
+++ b/tests/CheckClientCredentialsTest.php
@@ -1,9 +1,10 @@
 <?php
 
 use Illuminate\Http\Request;
+use PHPUnit\Framework\TestCase;
 use Laravel\Passport\Http\Middleware\CheckClientCredentials;
 
-class CheckClientCredentialsTest extends PHPUnit_Framework_TestCase
+class CheckClientCredentialsTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/CheckForAnyScopeTest.php b/tests/CheckForAnyScopeTest.php
index ad5541d3b..6929cb156 100644
--- a/tests/CheckForAnyScopeTest.php
+++ b/tests/CheckForAnyScopeTest.php
@@ -1,8 +1,9 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use Laravel\Passport\Http\Middleware\CheckForAnyScope as CheckScopes;
 
-class CheckForAnyScopesTest extends PHPUnit_Framework_TestCase
+class CheckForAnyScopesTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/CheckScopesTest.php b/tests/CheckScopesTest.php
index a310a6c71..7fe02635d 100644
--- a/tests/CheckScopesTest.php
+++ b/tests/CheckScopesTest.php
@@ -1,8 +1,9 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use Laravel\Passport\Http\Middleware\CheckScopes;
 
-class CheckScopesTest extends PHPUnit_Framework_TestCase
+class CheckScopesTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/ClientControllerTest.php b/tests/ClientControllerTest.php
index 0881f5bfd..35aa649ff 100644
--- a/tests/ClientControllerTest.php
+++ b/tests/ClientControllerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use Illuminate\Http\Request;
+use PHPUnit\Framework\TestCase;
 
-class ClientControllerTest extends PHPUnit_Framework_TestCase
+class ClientControllerTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/DenyAuthorizationControllerTest.php b/tests/DenyAuthorizationControllerTest.php
index 566459264..3617a3307 100644
--- a/tests/DenyAuthorizationControllerTest.php
+++ b/tests/DenyAuthorizationControllerTest.php
@@ -1,8 +1,9 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use Illuminate\Contracts\Routing\ResponseFactory;
 
-class DenyAuthorizationControllerTest extends PHPUnit_Framework_TestCase
+class DenyAuthorizationControllerTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/HasApiTokensTest.php b/tests/HasApiTokensTest.php
index f37908e11..fa0911607 100644
--- a/tests/HasApiTokensTest.php
+++ b/tests/HasApiTokensTest.php
@@ -1,8 +1,9 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use Illuminate\Container\Container;
 
-class HasApiTokensTest extends PHPUnit_Framework_TestCase
+class HasApiTokensTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/KeysCommandTest.php b/tests/KeysCommandTest.php
index 39a65b533..ba9724b38 100644
--- a/tests/KeysCommandTest.php
+++ b/tests/KeysCommandTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
+
 function storage_path($file = null)
 {
     return __DIR__.DIRECTORY_SEPARATOR.$file;
@@ -10,7 +12,7 @@ function custom_path($file = null)
     return __DIR__.DIRECTORY_SEPARATOR.'files'.DIRECTORY_SEPARATOR.$file;
 }
 
-class KeysCommandTest extends PHPUnit_Framework_TestCase
+class KeysCommandTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/PassportTest.php b/tests/PassportTest.php
index 46a08a559..a73ccf640 100644
--- a/tests/PassportTest.php
+++ b/tests/PassportTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use Laravel\Passport\Passport;
+use PHPUnit\Framework\TestCase;
 
-class PassportTest extends PHPUnit_Framework_TestCase
+class PassportTest extends TestCase
 {
     public function test_scopes_can_be_managed()
     {
diff --git a/tests/PersonalAccessTokenControllerTest.php b/tests/PersonalAccessTokenControllerTest.php
index 4e9f111a5..ad5b20925 100644
--- a/tests/PersonalAccessTokenControllerTest.php
+++ b/tests/PersonalAccessTokenControllerTest.php
@@ -2,9 +2,10 @@
 
 use Illuminate\Http\Request;
 use Laravel\Passport\Passport;
+use PHPUnit\Framework\TestCase;
 use Laravel\Passport\TokenRepository;
 
-class PersonalAccessTokenControllerTest extends PHPUnit_Framework_TestCase
+class PersonalAccessTokenControllerTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/PersonalAccessTokenFactoryTest.php b/tests/PersonalAccessTokenFactoryTest.php
index 09c5d5c45..179748078 100644
--- a/tests/PersonalAccessTokenFactoryTest.php
+++ b/tests/PersonalAccessTokenFactoryTest.php
@@ -1,6 +1,8 @@
 <?php
 
-class PersonalAccessTokenFactoryTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class PersonalAccessTokenFactoryTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/ScopeTest.php b/tests/ScopeTest.php
index 3f424abf3..97432eb83 100644
--- a/tests/ScopeTest.php
+++ b/tests/ScopeTest.php
@@ -1,6 +1,8 @@
 <?php
 
-class ScopeTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ScopeTest extends TestCase
 {
     public function test_scope_can_be_converted_to_array()
     {
diff --git a/tests/TokenGuardTest.php b/tests/TokenGuardTest.php
index fb1367884..839c315b5 100644
--- a/tests/TokenGuardTest.php
+++ b/tests/TokenGuardTest.php
@@ -3,10 +3,11 @@
 use Carbon\Carbon;
 use Firebase\JWT\JWT;
 use Illuminate\Http\Request;
+use PHPUnit\Framework\TestCase;
 use Illuminate\Container\Container;
 use Laravel\Passport\Guards\TokenGuard;
 
-class TokenGuardTest extends PHPUnit_Framework_TestCase
+class TokenGuardTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/TokenTest.php b/tests/TokenTest.php
index 797e51cc0..5ba823a96 100644
--- a/tests/TokenTest.php
+++ b/tests/TokenTest.php
@@ -1,6 +1,8 @@
 <?php
 
-class TokenTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class TokenTest extends TestCase
 {
     public function test_token_can_determine_if_it_has_scopes()
     {
diff --git a/tests/TransientTokenControllerTest.php b/tests/TransientTokenControllerTest.php
index 9283489f5..5a2c13613 100644
--- a/tests/TransientTokenControllerTest.php
+++ b/tests/TransientTokenControllerTest.php
@@ -1,8 +1,9 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Cookie;
 
-class TransientTokenControllerTest extends PHPUnit_Framework_TestCase
+class TransientTokenControllerTest extends TestCase
 {
     public function tearDown()
     {
diff --git a/tests/TransientTokenTest.php b/tests/TransientTokenTest.php
index e359c64da..623b2e3f7 100644
--- a/tests/TransientTokenTest.php
+++ b/tests/TransientTokenTest.php
@@ -1,6 +1,8 @@
 <?php
 
-class TransientTokenTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class TransientTokenTest extends TestCase
 {
     public function test_transient_token_can_do_anything()
     {

From cbea4a69b0f4ca9223173b062c70202d60fbbed4 Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Thu, 2 Nov 2017 16:41:17 -0200
Subject: [PATCH 2/2] Use beStrictAboutTestsThatDoNotTestAnything in
 phpunit.xml

---
 phpunit.xml.dist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d1c112e84..8a3a6251f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
+         beStrictAboutTestsThatDoNotTestAnything="false"
          bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"