Merge pull request #41 from minvws/add-laravel-11

Add Laravel 11 to Github CI test

Author: annejan

.github/workflows/ci.yml

@@ -13,22 +13,19 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [ 8.1, 8.2 ]
-                laravel: [ 8.*, 9.*, 10.* ]
+                php: [ 8.1, 8.2, 8.3 ]
+                laravel: [ 10.*, 11.* ]
                 stability: [ prefer-stable ]
                 experimental: [ false ]
                 include:
-                  - laravel: 8.*
-                    testbench: 6.*
-                  - laravel: 9.*
-                    testbench: 7.*
                   - laravel: 10.*
                     testbench: 8.*
-                  - php: 8.3
-                    laravel: 10.*
-                    testbench: 8.*
-                    stability: prefer-stable
-                    experimental: true
+                  - laravel: 11.*
+                    testbench: 9.*
+                exclude:
+                  - php: 8.1
+                    laravel: 11.*
+
 
         name: PHP ${{ matrix.php }} - L${{ matrix.laravel }}
         steps:

.gitignore

@@ -1,2 +1,3 @@
 /vendor/
+/.phpunit.cache
 composer.lock

composer.json

@@ -33,11 +33,12 @@
         "php": ">=8.1",
         "jumbojett/openid-connect-php": "^1.0.0",
         "guzzlehttp/guzzle": "^7.5",
+        "illuminate/contracts": "^10.0||^11.0",
         "web-token/jwt-library": "^3.4"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.0|^7.0|^8.0",
-        "phpunit/phpunit": "^9.6",
+        "orchestra/testbench": "^8.0||^9.0",
+        "phpunit/phpunit": "^10.0",
         "vimeo/psalm": "^5.8",
         "phpstan/phpstan": "^1.10",
         "squizlabs/php_codesniffer": "^3.8",

phpunit.xml.dist

@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        bootstrap="vendor/autoload.php"
-        backupGlobals="false"
-        backupStaticAttributes="false"
-        colors="true"
-        verbose="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        processIsolation="false"
-        stopOnFailure="false"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
->
-    <coverage>
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-    </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         colors="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false">
     <testsuites>
         <testsuite name="Unit">
             <directory suffix="Test.php">./tests/Unit</directory>
@@ -30,4 +20,9 @@
         <env name="DB_CONNECTION" value="testing"/>
         <env name="APP_KEY" value="base64:dTE5YzljdWRsc292a2x3ZXRjeWg2ZWxrYm1mZnI4a3c="/>
     </php>
-</phpunit>
+    <source>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </source>
+</phpunit>

tests/Feature/Http/Controllers/LoginControllerResponseTest.php

@@ -13,6 +13,7 @@
 use MinVWS\OpenIDConnectLaravel\OpenIDConfiguration\OpenIDConfigurationLoader;
 use MinVWS\OpenIDConnectLaravel\Tests\TestCase;
 use Mockery;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 use function MinVWS\OpenIDConnectLaravel\Tests\{
     generateJwt,
@@ -85,9 +86,7 @@ public function testNonceAndStateAreSetInCache(): void
             ->assertRedirectContains('client_id=test-client-id');
     }
 
-    /**
-     * @dataProvider codeChallengeMethodProvider
-     */
+    #[DataProvider('codeChallengeMethodProvider')]
     public function testCodeChallengeIsSetWhenSupported(
         ?string $requestedCodeChallengeMethod,
         array $codeChallengesSupportedAtProvider,
@@ -119,7 +118,7 @@ public function testCodeChallengeIsSetWhenSupported(
         }
     }
 
-    public function codeChallengeMethodProvider(): array
+    public static function codeChallengeMethodProvider(): array
     {
         return [
             'no code challenge method requested' => [null, [], false],

tests/Feature/Http/Controllers/LoginControllerTest.php

@@ -10,6 +10,7 @@
 use MinVWS\OpenIDConnectLaravel\OpenIDConnectClient;
 use MinVWS\OpenIDConnectLaravel\Tests\TestCase;
 use Mockery;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class LoginControllerTest extends TestCase
 {
@@ -40,9 +41,7 @@ public function testLoginRouteRedirectsToAuthorizeUrlOfProvider(): void
             ->assertRedirectContains('code_challenge_method=S256');
     }
 
-    /**
-     * @dataProvider scopesProvider
-     */
+    #[DataProvider('scopesProvider')]
     public function testLoginRouteRedirectsToAuthorizeUrlOfProviderWithScopes(
         array $additionalScopes,
         string $scopeInUrl