Merge pull request #13 from eXolnet/feature/laravel11-support

build(deps): add Laravel 11 support
eXolnet · Mar 26, 2024 · 6f51c53 · 6f51c53
2 parents efd8807 + 7c4969f
commit 6f51c53
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 24 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -10,8 +10,11 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.1, 8.2]
-        laravel: [10.*]
+        laravel: [10.*, 11.*]
         dependency-version: [prefer-lowest, prefer-stable]
+        exclude:
+          - php: 8.1
+            laravel: 11.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

diff --git a/composer.json b/composer.json
@@ -10,11 +10,11 @@
     ],
     "require": {
         "php": "^8.1",
-        "laravel/framework": "^10.0"
+        "laravel/framework": "^10.0|^11.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.5.1",
-        "phpunit/phpunit": "^9.5.10",
+        "phpunit/phpunit": "^10.5",
         "squizlabs/php_codesniffer": "^3.6"
     },
     "autoload": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,22 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
          colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+>
     <testsuites>
         <testsuite name="Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
+    <source>
+        <include>
             <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </source>
 </phpunit>
diff --git a/tests/UnitTest.php → tests/TestCase.php b/tests/UnitTest.php → tests/TestCase.php
@@ -3,9 +3,9 @@
 namespace Exolnet\Image\Tests;
 
 use Mockery;
-use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\TestCase as BaseTestCase;
 
-abstract class UnitTest extends TestCase
+abstract class TestCase extends BaseTestCase
 {
     /**
      * @return void

diff --git a/tests/Unit/FilesystemRepositoryTest.php b/tests/Unit/FilesystemRepositoryTest.php
@@ -4,12 +4,12 @@
 
 use Exolnet\Image\Image;
 use Exolnet\Image\Repository\FilesystemRepository;
-use Exolnet\Image\Tests\UnitTest;
+use Exolnet\Image\Tests\TestCase;
 use Illuminate\Filesystem\Filesystem;
 use Mockery as m;
 use Symfony\Component\HttpFoundation\File\File;
 
-class FilesystemRepositoryTest extends UnitTest
+class FilesystemRepositoryTest extends TestCase
 {
     protected $filesystemRepository;
 

diff --git a/tests/Unit/ImageServiceTest.php b/tests/Unit/ImageServiceTest.php
@@ -5,11 +5,11 @@
 use Exolnet\Image\Image;
 use Exolnet\Image\ImageService;
 use Exolnet\Image\Repository\FilesystemRepository;
-use Exolnet\Image\Tests\UnitTest;
+use Exolnet\Image\Tests\TestCase;
 use Mockery as m;
 use Symfony\Component\HttpFoundation\File\File;
 
-class ImageServiceTest extends UnitTest
+class ImageServiceTest extends TestCase
 {
     /** @var \Exolnet\Image\ImageService */
     protected $service;

diff --git a/tests/Unit/ImageTest.php b/tests/Unit/ImageTest.php
@@ -3,9 +3,9 @@
 namespace Exolnet\Image\Tests\Unit;
 
 use Exolnet\Image\Image;
-use Exolnet\Image\Tests\UnitTest;
+use Exolnet\Image\Tests\TestCase;
 
-class ImageTest extends UnitTest
+class ImageTest extends TestCase
 {
     /**
      * @var \Exolnet\Image\Image