Merge pull request #6 from worksome/feature/laravel-11

feat: add support for Laravel 11
worksome · Feb 13, 2024 · 969e6ff · 969e6ff
2 parents 7ca1eb0 + 1be8286
commit 969e6ff
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 54 deletions.
diff --git a/.editorconfig.php b/.editorconfig.php
diff --git a/.github/workflows/code-analysis.yml b/.github/workflows/code-analysis.yml
@@ -11,22 +11,22 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['8.2']
+        php: [8.2]
 
         actions:
           -   name: ECS
               run: 'composer test:style'
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
 
       - name: Install Composer dependencies
-        uses: ramsey/composer-install@v1
+        uses: ramsey/composer-install@v2
 
       - run: ${{ matrix.actions.run }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,28 +5,35 @@ on:
 
 jobs:
   setup:
-    runs-on: ubuntu-latest
-    name: Pest on PHP ${{ matrix.php }} - Testbench ${{ matrix.testbench }}
+    runs-on: ${{ matrix.os }}
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
     strategy:
       matrix:
-        php: ['8.2']
-        testbench: [8.*]
+        os: [ubuntu-latest]
+        php: [8.2, 8.3]
+        laravel: [10.*, 11.*]
+        stability: [prefer-lowest, prefer-stable]
+        include:
+            - laravel: 10.*
+              testbench: 8.*
+            - laravel: 11.*
+              testbench: 9.*
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
+          php-version: ${{ matrix.php }}
           extensions: oauth
           coverage: none
-          php-version: ${{ matrix.php }}
 
-      - name: Install Composer dependencies
+      - name: Install dependencies
         run: |
-            composer require "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-            composer update --prefer-dist --no-interaction
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction --ansi
 
-      - name: Test php code
+      - name: Execute tests
         run: composer test:unit
diff --git a/composer.json b/composer.json
@@ -8,9 +8,9 @@
         "azuyalabs/yasumi": "^2.5"
     },
     "require-dev": {
-        "orchestra/testbench": "^8.0",
-        "pestphp/pest": "^2.0",
-        "worksome/coding-style": "^2.5"
+        "orchestra/testbench": "^8.0 || ^9.0",
+        "pestphp/pest": "^2.33",
+        "worksome/coding-style": "^2.8"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml b/phpunit.xml
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,15 +3,16 @@
          xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true"
+         cacheDirectory=".phpunit.cache"
 >
     <testsuites>
         <testsuite name="Test Suite">
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
-    <coverage processUncoveredFiles="true">
+    <source>
         <include>
             <directory suffix=".php">./src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>