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

build(deps): add Laravel 11 support
eXolnet · Mar 26, 2024 · 74d4787 · 74d4787
2 parents 8e8fcf5 + 512e308
commit 74d4787
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -10,11 +10,16 @@ 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.*
         include:
           - laravel: 10.*
             testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

diff --git a/composer.json b/composer.json
@@ -25,9 +25,9 @@
     "require": {
         "php": "^8.1",
         "graylog2/gelf-php": "^1.7",
-        "illuminate/contracts": "^10.0",
-        "illuminate/log": "^10.0",
-        "illuminate/support": "^10.0",
+        "illuminate/contracts": "^10.0|^11.0",
+        "illuminate/log": "^10.0|^11.0",
+        "illuminate/support": "^10.0|^11.0",
         "monolog/monolog": "^2.0|^3.3"
     },
     "require-dev": {
@@ -36,8 +36,8 @@
         "exolnet/phpcs-config": "^2.0",
         "laravel/pint": "^1.2",
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^8.0",
-        "phpunit/phpunit": "^9.3.3",
+        "orchestra/testbench": "^8.0|^9.0",
+        "phpunit/phpunit": "^10.5",
         "squizlabs/php_codesniffer": "^3.6"
     },
     "autoload": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,14 +1,9 @@
 <?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="Unit">
             <directory suffix="Test.php">./tests/Unit</directory>
@@ -18,9 +13,9 @@
             <directory suffix="Test.php">./tests/Feature</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
+    <source>
+        <include>
             <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </source>
 </phpunit>
diff --git a/tests/Unit/Transport/TransportFactoryTest.php b/tests/Unit/Transport/TransportFactoryTest.php
@@ -2,18 +2,18 @@
 
 namespace Exolnet\Graylog\Tests\Unit\Transport;
 
+use Exolnet\Graylog\Tests\Unit\UnitTestCase;
 use Exolnet\Graylog\Transport\TransportFactory;
 use Gelf\Transport\HttpTransport;
 use Gelf\Transport\KeepAliveRetryTransportWrapper;
 use Gelf\Transport\TcpTransport;
 use Gelf\Transport\UdpTransport;
 use InvalidArgumentException;
-use PHPUnit\Framework\TestCase;
 
 /**
  * @covers \Exolnet\Graylog\Transport\TransportFactory
  */
-class TransportFactoryTest extends TestCase
+class TransportFactoryTest extends UnitTestCase
 {
     /**
      * @var \Exolnet\Graylog\Transport\TransportFactory

diff --git a/tests/Unit/UnitTest.php → tests/Unit/UnitTestCase.php b/tests/Unit/UnitTest.php → tests/Unit/UnitTestCase.php
@@ -5,7 +5,7 @@
 use Mockery;
 use PHPUnit\Framework\TestCase;
 
-abstract class UnitTest extends TestCase
+abstract class UnitTestCase extends TestCase
 {
     public function tearDown(): void
     {