Merge pull request #23 from MyParcelCOM/feature/php82

🔧 PHP 8.2
MyParcelCOM · Apr 18, 2024 · 0043b3a · 0043b3a
2 parents ed2992d + e4e0600
commit 0043b3a
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 51 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,15 +12,12 @@ jobs:
       - name: Composer
         uses: php-actions/composer@v6
         with:
-          php_version: 8.0
+          php_version: 8.2
 
       - name: PHPUnit
         uses: php-actions/phpunit@v3
         with:
-          bootstrap: vendor/autoload.php
-          test_suffix: Test.php
-          php_extensions: xdebug
+          args: --no-coverage
+          php_version: 8.2
           configuration: phpunit.xml
-          coverage_text: true
-        env:
-          XDEBUG_MODE: coverage
+          test_suffix: Test.php
diff --git a/composer.json b/composer.json
@@ -1,19 +1,20 @@
 {
   "name": "myparcelcom/auth-module",
   "description": "Package for validating a JWT token and checking the contained scopes",
+  "homepage": "https://www.myparcel.com",
   "type": "library",
   "require": {
-    "php": ">=8.0",
-    "lcobucci/jwt": ">=4.0",
+    "php": ">=8.2",
+    "lcobucci/jwt": ">=5.0",
     "myclabs/php-enum": ">=1.7",
     "myparcelcom/json-api": "^3.0"
   },
   "require-dev": {
     "ext-openssl": "*",
-    "mockery/mockery": "^1.4",
-    "phpunit/phpunit": ">=9.5",
+    "mockery/mockery": "^1.5",
+    "phpunit/phpunit": "^11.0",
     "roave/security-advisories": "dev-latest",
-    "squizlabs/php_codesniffer": "^3.3"
+    "squizlabs/php_codesniffer": "^3.7"
   },
   "autoload": {
     "psr-4": {
@@ -27,8 +28,8 @@
   },
   "scripts": {
     "test": "vendor/bin/phpunit --no-coverage",
-    "check-style": "vendor/bin/phpcs -p --standard=PSR12 --exclude=PSR2.ControlStructures.ControlStructureSpacing --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 --warning-severity=6 app tests database/factories",
-    "fix-style": "vendor/bin/phpcbf -p --standard=PSR12 --exclude=PSR2.ControlStructures.ControlStructureSpacing --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 --warning-severity=6 app tests database/factories"
+    "check-style": "vendor/bin/phpcs -p --standard=PSR12 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 --warning-severity=6 src tests",
+    "fix-style": "vendor/bin/phpcbf -p --standard=PSR12 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 --warning-severity=6 src tests"
   },
   "extra": {
     "laravel": {

diff --git a/composer.lock b/composer.lock
diff --git a/tests/CheckForAnyScopeTest.php b/tests/CheckForAnyScopeTest.php
@@ -35,23 +35,20 @@ protected function setUp(): void
         $this->scopeChecker = new CheckForAnyScope();
     }
 
-    /** @test */
     public function testHandle(): void
     {
         $this->scopeChecker->setAuthenticator($this->createAuthenticatorReturningScopes(['test-scope']));
 
         $this->assertTrue($this->scopeChecker->handle($this->request, $this->trueClosure, 'test-scope'));
     }
 
-    /** @test */
     public function testHandleWithOnlyOneScopeExisting(): void
     {
         $this->scopeChecker->setAuthenticator($this->createAuthenticatorReturningScopes(['test-scope']));
 
         $this->assertTrue($this->scopeChecker->handle($this->request, $this->trueClosure, 'test-scope', 'test-scope2'));
     }
 
-    /** @test */
     public function testHandleWithMissingScopeGivesMissingScopeExceptionWhenMissingOne(): void
     {
         $this->expectException(MissingScopeException::class);
@@ -63,7 +60,6 @@ public function testHandleWithMissingScopeGivesMissingScopeExceptionWhenMissingO
         $this->scopeChecker->handle($this->request, $this->trueClosure, 'test-scope');
     }
 
-    /** @test */
     public function testHandleWithMultipleScopes(): void
     {
         $this->scopeChecker->setAuthenticator($this->createAuthenticatorReturningScopes([

diff --git a/tests/CheckForScopesTest.php b/tests/CheckForScopesTest.php
@@ -28,22 +28,18 @@ protected function setUp(): void
         parent::setUp();
 
         $this->generateKeys();
-        $this->trueClosure = function () {
-            return true;
-        };
+        $this->trueClosure = fn () => true;
         $this->request = $this->createAuthorizationRequest();
         $this->scopeChecker = new CheckForScopes();
     }
 
-    /** @test */
     public function testHandle(): void
     {
         $this->scopeChecker->setAuthenticator($this->createAuthenticatorReturningScopes(['test-scope']));
 
         $this->assertTrue($this->scopeChecker->handle($this->request, $this->trueClosure, 'test-scope'));
     }
 
-    /** @test */
     public function testHandleWithMissingScopesGivesMissingScopeExceptionWhenMissingOnlyOne(): void
     {
         $this->expectException(MissingScopeException::class);
@@ -52,7 +48,6 @@ public function testHandleWithMissingScopesGivesMissingScopeExceptionWhenMissing
         $this->scopeChecker->handle($this->request, $this->trueClosure, 'test-scope', 'test-scope2');
     }
 
-    /** @test */
     public function testHandleWithMissingScopeGivesMissingScopeExceptionWhenMissingOne(): void
     {
         $this->expectException(MissingScopeException::class);
@@ -64,7 +59,6 @@ public function testHandleWithMissingScopeGivesMissingScopeExceptionWhenMissingO
         $this->scopeChecker->handle($this->request, $this->trueClosure, 'test-scope');
     }
 
-    /** @test */
     public function testHandleWithMultipleScopes(): void
     {
         $this->scopeChecker->setAuthenticator($this->createAuthenticatorReturningScopes([

diff --git a/tests/JwtRequestAuthenticatorTest.php b/tests/JwtRequestAuthenticatorTest.php
@@ -31,7 +31,6 @@ protected function setUp(): void
             ->setPublicKey($this->publicKey);
     }
 
-    /** @test */
     public function testAuthenticate(): void
     {
         $authorizationHeader = 'Bearer ' . $this->createTokenString([], null, 'some-user-id', []);
@@ -41,7 +40,6 @@ public function testAuthenticate(): void
         $this->assertEquals('some-user-id', $token->claims()->get('user_id'));
     }
 
-    /** @test */
     public function testAuthenticateWithQueryParameter(): void
     {
         $request = Mockery::mock(Request::class, [
@@ -54,7 +52,6 @@ public function testAuthenticateWithQueryParameter(): void
         $this->assertEquals('some-user-id', $token->claims()->get('user_id'));
     }
 
-    /** @test */
     public function testAuthenticateWithInvalidKey(): void
     {
         $this->authenticator->setPublicKey('');
@@ -65,7 +62,6 @@ public function testAuthenticateWithInvalidKey(): void
         $this->authenticator->authenticate($request);
     }
 
-    /** @test */
     public function testAuthenticateWithInvalidToken(): void
     {
         $authorizationHeader = 'Bearer ' . $this->createTokenString([], null, 'some-user-id', []);
@@ -76,7 +72,6 @@ public function testAuthenticateWithInvalidToken(): void
         $this->authenticator->authenticate($request);
     }
 
-    /** @test */
     public function testAuthenticateWithInvalidSignature(): void
     {
         $privateKeyResource = openssl_pkey_new(['private_key_bits' => 2048]);
@@ -90,7 +85,6 @@ public function testAuthenticateWithInvalidSignature(): void
         $this->authenticator->authenticate($request);
     }
 
-    /** @test */
     public function testAuthenticateWithExpiredToken(): void
     {
         $authorizationHeader = 'Bearer ' . $this->createTokenString([], time() - 100, 'some-user-id', []);
@@ -100,7 +94,6 @@ public function testAuthenticateWithExpiredToken(): void
         $this->authenticator->authenticate($request);
     }
 
-    /** @test */
     public function testAccessTokenWithRequestWithoutAuthorizationHeader(): void
     {
         $request = Mockery::mock(Request::class, ['header' => null, 'has' => false]);
@@ -109,7 +102,6 @@ public function testAccessTokenWithRequestWithoutAuthorizationHeader(): void
         $this->authenticator->authenticate($request);
     }
 
-    /** @test */
     public function testAccessTokenParsing(): void
     {
         $request = Mockery::mock(Request::class, ['header' => 'r.i.p', 'has' => false]);
@@ -118,7 +110,6 @@ public function testAccessTokenParsing(): void
         $this->authenticator->authenticate($request);
     }
 
-    /** @test */
     public function testGetPublicKeyExceptionWithoutKey(): void
     {
         $this->authenticator = new JwtRequestAuthenticator();

diff --git a/tests/PublicKeyTest.php b/tests/PublicKeyTest.php
@@ -26,7 +26,6 @@ protected function setUp(): void
         $this->key->setPath($tempFile);
     }
 
-    /** @test */
     public function testGetKeyString(): void
     {
         $keyString = $this->key->getKeyString();
@@ -35,7 +34,6 @@ public function testGetKeyString(): void
         $this->assertEquals('this-is-an-oauth-key', $keyString);
     }
 
-    /** @test */
     public function testGetKeyStringWithoutSsl(): void
     {
         $keyString = $this->key->setVerifySsl(false)->getKeyString();
@@ -44,13 +42,11 @@ public function testGetKeyStringWithoutSsl(): void
         $this->assertEquals('this-is-an-oauth-key', $keyString);
     }
 
-    /** @test */
     public function testToString(): void
     {
         $this->assertEquals($this->key->getKeyString(), (string) $this->key);
     }
 
-    /** @test */
     public function testCache(): void
     {
         $publicKey = $this->key->setCache(new CacheMock());
@@ -76,7 +72,6 @@ public function testCache(): void
         );
     }
 
-    /** @test */
     public function testSetPath(): void
     {
         $publicKey = new PublicKey();
@@ -98,7 +93,6 @@ public function testSetPath(): void
         );
     }
 
-    /** @test */
     public function testUnSetPath(): void
     {
         $publicKey = new PublicKey();

diff --git a/tests/ScopeCheckerTest.php b/tests/ScopeCheckerTest.php
@@ -27,7 +27,6 @@ protected function setUp(): void
         $this->scopeChecker = new ScopeChecker();
     }
 
-    /** @test */
     public function testTokenCan(): void
     {
         $request = $this->createAuthorizationRequest();
@@ -37,7 +36,6 @@ public function testTokenCan(): void
         $this->assertTrue($result);
     }
 
-    /** @test */
     public function testTokenCanNot(): void
     {
         $request = $this->createAuthorizationRequest();