Merge pull request #8 from swisnl/feature/laravel-11

Add support for Laravel 11
swisnl · Mar 5, 2024 · 1cc5359 · 1cc5359
2 parents d98df6b + f6f7218
commit 1cc5359
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 31 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,18 +9,37 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.4', '8.0', '8.1', '8.2' ]
-        laravel: [ '8.*', '9.*', '10.*' ]
+        php: [ 7.4, '8.0', 8.1, 8.2, 8.3 ]
+        laravel: [ 8.*, 9.*, 10.*, 11.* ]
         stability: [ prefer-stable ]
         exclude:
-          - laravel: '8.*'
-            php: '8.2'
-          - laravel: '9.*'
-            php: '7.4'
-          - laravel: '10.*'
-            php: '7.4'
-          - laravel: '10.*'
+          - laravel: 8.*
+            php: 8.2
+          - laravel: 8.*
+            php: 8.3
+          - laravel: 9.*
+            php: 7.4
+          - laravel: 9.*
+            php: 8.3
+          - laravel: 10.*
+            php: 7.4
+          - laravel: 10.*
             php: '8.0'
+          - laravel: 11.*
+            php: 7.4
+          - laravel: 11.*
+            php: '8.0'
+          - laravel: 11.*
+            php: 8.1
+        include:
+          - laravel: 8.*
+            phpunit: ^9.5
+          - laravel: 9.*
+            phpunit: ^9.5
+          - laravel: 10.*
+            phpunit: ^10.5
+          - laravel: 11.*
+            phpunit: ^10.5
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
 
@@ -52,10 +71,11 @@ jobs:
       - name: Install dependencies
         run: |
           composer require "illuminate/contracts:${{ matrix.laravel }}" --no-interaction --no-update
+          composer require "phpunit/phpunit:${{ matrix.phpunit }}" --dev --no-interaction --no-update
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
       - name: Execute tests
-        run: XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
+        run: XDEBUG_MODE=coverage vendor/bin/phpunit --configuration=${{ matrix.phpunit == '^9.5' && 'phpunit-9.xml' || 'phpunit.xml' }} --coverage-text --coverage-clover=coverage.clover
 
       - name: Upload Scrutinizer coverage
         uses: sudo-bot/action-scrutinizer@latest

diff --git a/composer.json b/composer.json
@@ -4,15 +4,15 @@
     "description": "A PHP package for mapping remote JSON:API resources to Eloquent like models and collections.",
     "require": {
         "php": "^7.4|^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "swisnl/json-api-client": "^2.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.0",
         "guzzlehttp/guzzle": "^7.3",
         "guzzlehttp/psr7": "^2.1",
-        "orchestra/testbench": "^6.15|^7.0|^8.0",
-        "phpunit/phpunit": "^9.5"
+        "orchestra/testbench": "^6.15|^7.0|^8.0|^9.0",
+        "phpunit/phpunit": "^9.5|^10.5"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit-9.xml b/phpunit-9.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.2/phpunit.xsd"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false">
+    <testsuites>
+        <testsuite name="tests">
+            <directory suffix="Test.php">./tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,23 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.2/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
          backupGlobals="false"
-         backupStaticAttributes="false"
+         backupStaticProperties="false"
          colors="true"
          bootstrap="vendor/autoload.php"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
+         cacheDirectory=".phpunit.cache"
          processIsolation="false"
          stopOnFailure="false">
     <testsuites>
         <testsuite name="tests">
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <source>
+        <include>
             <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </source>
 </phpunit>
diff --git a/tests/AbstractTest.php → tests/AbstractTestCase.php b/tests/AbstractTest.php → tests/AbstractTestCase.php
@@ -7,7 +7,7 @@
 use Orchestra\Testbench\TestCase;
 use Swis\JsonApi\Client\Providers\ServiceProvider;
 
-abstract class AbstractTest extends TestCase
+abstract class AbstractTestCase extends TestCase
 {
     /**
      * Define environment setup.

diff --git a/tests/Providers/ServiceProviderTest.php b/tests/Providers/ServiceProviderTest.php
@@ -7,9 +7,9 @@
 use Illuminate\Http\Client\Request;
 use Illuminate\Support\Facades\Http;
 use Swis\JsonApi\Client\Document;
-use Swis\JsonApi\Client\Tests\AbstractTest;
+use Swis\JsonApi\Client\Tests\AbstractTestCase;
 
-class ServiceProviderTest extends AbstractTest
+class ServiceProviderTest extends AbstractTestCase
 {
     protected function setUp(): void
     {

diff --git a/tests/Providers/TypeMapperServiceProviderTest.php b/tests/Providers/TypeMapperServiceProviderTest.php
@@ -4,13 +4,13 @@
 
 namespace Swis\JsonApi\Client\Tests\Providers;
 
-use Swis\JsonApi\Client\Tests\AbstractTest;
+use Swis\JsonApi\Client\Tests\AbstractTestCase;
 use Swis\JsonApi\Client\Tests\Mocks\Items\ChildItem;
 use Swis\JsonApi\Client\Tests\Mocks\Items\ParentItem;
 use Swis\JsonApi\Client\Tests\Mocks\MockTypeMapperServiceProvider;
 use Swis\JsonApi\Client\TypeMapper;
 
-class TypeMapperServiceProviderTest extends AbstractTest
+class TypeMapperServiceProviderTest extends AbstractTestCase
 {
     /**
      * @test
@@ -21,10 +21,19 @@ public function itRegistersTypesWithTheTypeMapper()
         $typeMapper = $this->createMock(TypeMapper::class);
         $typeMapper->expects($this->exactly(2))
             ->method('setMapping')
-            ->withConsecutive(
-                ['child', ChildItem::class],
-                ['parent', ParentItem::class]
-            );
+            ->willReturnCallback(function (string $type, string $class) {
+                static $i = 0;
+                switch (++$i) {
+                    case 1:
+                        $this->assertEquals('child', $type);
+                        $this->assertEquals(ChildItem::class, $class);
+                        break;
+                    case 2:
+                        $this->assertEquals('parent', $type);
+                        $this->assertEquals(ParentItem::class, $class);
+                        break;
+                }
+            });
 
         $provider->boot($typeMapper);
     }