Merge pull request #144 from Laravel-Lang/3.x

Added support for publisher version 15
Laravel-Lang · Oct 30, 2023 · 66ccd21 · 66ccd21
2 parents 03e50c7 + 8b59e38
commit 66ccd21
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -8,20 +8,29 @@ jobs:
     laravel:
         runs-on: ubuntu-latest
 
+        strategy:
+            fail-fast: true
+            matrix:
+                php: [ "8.1", "8.2" ]
+                publisher: [ "14.0", "15.0" ]
+
+        name: PHP ${{ matrix.php }}, Publisher ${{ matrix.publisher }}
+
         steps:
             -   name: Checkout code
                 uses: actions/checkout@v4
 
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
+                    php-version: ${{ matrix.php }}
                     extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
                     coverage: xdebug
                 env:
                     COMPOSER_TOKEN: ${{ secrets.COMPOSER_TOKEN }}
 
             -   name: Install dependencies
-                run: composer update --prefer-stable --prefer-dist --no-progress --no-interaction
+                run: composer require laravel-lang/publisher:^${{ matrix.publisher }}
 
             -   name: Execute tests
                 run: sudo vendor/bin/phpunit --colors=always
diff --git a/composer.json b/composer.json
@@ -25,10 +25,10 @@
     "require": {
         "php": "^8.1",
         "ext-json": "*",
-        "laravel-lang/publisher": "^14.1"
+        "laravel-lang/publisher": "^14.1 || ^15.0"
     },
     "require-dev": {
-        "laravel-lang/status-generator": "^1.19",
+        "laravel-lang/status-generator": "^1.19 || ^2.0",
         "phpunit/phpunit": "^10.0",
         "symfony/var-dumper": "^6.0"
     },

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
-         backupGlobals="false"
-         backupStaticProperties="false"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="phpunit.php"
-         cacheDirectory=".phpunit.cache"
          cacheResult="false"
          colors="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
 >
     <coverage>
         <report>
@@ -23,12 +17,12 @@
     </php>
     <testsuites>
         <testsuite name="Test Suite">
-            <directory suffix="Test.php">./tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
     <source>
         <include>
-            <directory suffix=".php">./src</directory>
+            <directory>./src</directory>
         </include>
     </source>
 </phpunit>