Update dependencies for Laravel 6

praetoriandigital · Jul 21, 2021 · 24ad979 · 24ad979
1 parent 6da778b
commit 24ad979
Show file tree

Hide file tree

Showing 7 changed files with 158 additions and 213 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ composer.phar
 composer.lock
 .DS_Store
 .idea
-src/storage
+src/storage
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,5 @@
 language: php
 php:
-- 7.1
-- 7.2
-- 7.3
 - 7.4
 before_script:
 - travis_retry composer self-update

diff --git a/tests/Cub/CubLaravel/Test/CubAuthMiddlewareTest.php b/tests/Cub/CubLaravel/Test/CubAuthMiddlewareTest.php
@@ -6,8 +6,7 @@
 
 class CubAuthMiddlewareTest extends CubLaravelTestCase
 {
-    /** @test */
-    public function request_with_valid_token()
+    public function testRequestWithValidToken()
     {
         $expected = [
             'code' => 200,
@@ -19,12 +18,11 @@ public function request_with_valid_token()
 
         $actual = $this->get('restricted?cub_token='.$jwt);
 
-        $this->assertEquals($expected['code'], $actual->getStatusCode());
-        $this->assertEquals($expected['content'], $actual->getContent());
+        self::assertEquals($expected['code'], $actual->getStatusCode());
+        self::assertEquals($expected['content'], $actual->getContent());
     }
 
-    /** @test */
-    public function request_with_valid_token_header()
+    public function testRequestWithValidTokenHeader()
     {
         $expected = [
             'code' => 200,
@@ -36,12 +34,11 @@ public function request_with_valid_token_header()
 
         $actual = $this->get('restricted', ['HTTP_Authorization' => 'Bearer '.$jwt]);
 
-        $this->assertEquals($expected['code'], $actual->getStatusCode());
-        $this->assertEquals($expected['content'], $actual->getContent());
+        self::assertEquals($expected['code'], $actual->getStatusCode());
+        self::assertEquals($expected['content'], $actual->getContent());
     }
 
-    /** @test */
-    public function request_needs_token()
+    public function testRequestNeedsToken()
     {
         $expected = [
             'code' => 400,
@@ -50,12 +47,11 @@ public function request_needs_token()
 
         $actual = $this->get('restricted');
 
-        $this->assertEquals($expected['code'], $actual->getStatusCode());
-        $this->assertEquals($expected['content'], $actual->getContent());
+        self::assertEquals($expected['code'], $actual->getStatusCode());
+        self::assertEquals($expected['content'], $actual->getContent());
     }
 
-    /** @test */
-    public function request_with_expired_token()
+    public function testRequestWithExpiredToken()
     {
         $expected = [
             'code' => 401,
@@ -68,12 +64,11 @@ public function request_with_expired_token()
 
         $actual = $this->get('restricted?cub_token='.$jwt);
 
-        $this->assertEquals($expected['code'], $actual->getStatusCode());
-        $this->assertEquals($expected['content'], $actual->getContent());
+        self::assertEquals($expected['code'], $actual->getStatusCode());
+        self::assertEquals($expected['content'], $actual->getContent());
     }
 
-    /** @test */
-    public function request_with_expired_token_header()
+    public function testRequestWithExpiredTokenHeader()
     {
         $expected = [
             'code' => 401,
@@ -86,12 +81,11 @@ public function request_with_expired_token_header()
 
         $actual = $this->get('restricted', ['HTTP_Authorization' => 'Bearer '.$jwt]);
 
-        $this->assertEquals($expected['code'], $actual->getStatusCode());
-        $this->assertEquals($expected['content'], $actual->getContent());
+        self::assertEquals($expected['code'], $actual->getStatusCode());
+        self::assertEquals($expected['content'], $actual->getContent());
     }
 
-    /** @test */
-    public function request_with_token_not_yet_valid()
+    public function testRequestWithTokenNotYetValid()
     {
         $expected = [
             'code' => 401,
@@ -104,12 +98,11 @@ public function request_with_token_not_yet_valid()
 
         $actual = $this->get('restricted?cub_token='.$jwt);
 
-        $this->assertEquals($expected['code'], $actual->getStatusCode());
-        $this->assertEquals($expected['content'], $actual->getContent());
+        self::assertEquals($expected['code'], $actual->getStatusCode());
+        self::assertEquals($expected['content'], $actual->getContent());
     }
 
-    /** @test */
-    public function request_with_token_not_yet_valid_header()
+    public function testRequestWithTokenNotYetValidHeader()
     {
         $expected = [
             'code' => 401,
@@ -122,12 +115,11 @@ public function request_with_token_not_yet_valid_header()
 
         $actual = $this->get('restricted', ['HTTP_Authorization' => 'Bearer '.$jwt]);
 
-        $this->assertEquals($expected['code'], $actual->getStatusCode());
-        $this->assertEquals($expected['content'], $actual->getContent());
+        self::assertEquals($expected['code'], $actual->getStatusCode());
+        self::assertEquals($expected['content'], $actual->getContent());
     }
 
-    /** @test */
-    public function request_with_non_existent_user()
+    public function testRequestWithNonExistentUser()
     {
         User::whereCubId($this->details['id'])->first()->delete();
 
@@ -140,12 +132,11 @@ public function request_with_non_existent_user()
 
         $actual = $this->get('restricted?cub_token='.$jwt);
 
-        $this->assertEquals($expected['code'], $actual->getStatusCode());
-        $this->assertEquals($expected['content'], $actual->getContent());
+        self::assertEquals($expected['code'], $actual->getStatusCode());
+        self::assertEquals($expected['content'], $actual->getContent());
     }
 
-    /** @test */
-    public function request_with_non_existent_user_header()
+    public function testRequestWithNonExistentUserHeader()
     {
         User::whereCubId($this->details['id'])->first()->delete();
 
@@ -158,12 +149,11 @@ public function request_with_non_existent_user_header()
 
         $actual = $this->get('restricted', ['HTTP_Authorization' => 'Bearer '.$jwt]);
 
-        $this->assertEquals($expected['code'], $actual->getStatusCode());
-        $this->assertEquals($expected['content'], $actual->getContent());
+        self::assertEquals($expected['code'], $actual->getStatusCode());
+        self::assertEquals($expected['content'], $actual->getContent());
     }
 
-    /** @test */
-    public function request_with_token_with_scope_claim()
+    public function testRequestWithTokenWithScopeClaim()
     {
         $expected = [
             'code' => 401,
@@ -176,12 +166,11 @@ public function request_with_token_with_scope_claim()
 
         $actual = $this->get('restricted?cub_token='.$jwt);
 
-        $this->assertEquals($expected['code'], $actual->getStatusCode());
-        $this->assertEquals($expected['content'], $actual->getContent());
+        self::assertEquals($expected['code'], $actual->getStatusCode());
+        self::assertEquals($expected['content'], $actual->getContent());
     }
 
-    /** @test */
-    public function request_with_token_with_scope_claim_header()
+    public function testRequestWithTokenWithScopeClaimHeader()
     {
         $expected = [
             'code' => 401,
@@ -194,12 +183,11 @@ public function request_with_token_with_scope_claim_header()
 
         $actual = $this->get('restricted', ['HTTP_Authorization' => 'Bearer '.$jwt]);
 
-        $this->assertEquals($expected['code'], $actual->getStatusCode());
-        $this->assertEquals($expected['content'], $actual->getContent());
+        self::assertEquals($expected['code'], $actual->getStatusCode());
+        self::assertEquals($expected['content'], $actual->getContent());
     }
 
-    /** @test */
-    public function request_with_bad_token()
+    public function testRequestWithBadToken()
     {
         User::whereCubId($this->details['id'])->first()->delete();
 
@@ -215,12 +203,11 @@ public function request_with_bad_token()
 
         $actual = $this->get('restricted?cub_token='.$jwt);
 
-        $this->assertEquals($expected['code'], $actual->getStatusCode());
-        $this->assertEquals($expected['content'], $actual->getContent());
+        self::assertEquals($expected['code'], $actual->getStatusCode());
+        self::assertEquals($expected['content'], $actual->getContent());
     }
 
-    /** @test */
-    public function request_with_bad_token_header()
+    public function testRequestWithBadTokenHeader()
     {
         User::whereCubId($this->details['id'])->first()->delete();
 
@@ -236,7 +223,7 @@ public function request_with_bad_token_header()
 
         $actual = $this->get('restricted', ['HTTP_Authorization' => 'Bearer '.$jwt]);
 
-        $this->assertEquals($expected['code'], $actual->getStatusCode());
-        $this->assertEquals($expected['content'], $actual->getContent());
+        self::assertEquals($expected['code'], $actual->getStatusCode());
+        self::assertEquals($expected['content'], $actual->getContent());
     }
 }