Merge pull request #2 from descom-es/laravel_11_tests

Add Support to Laravel 11

Author: llorensjj

.github/workflows/analyze.yml

@@ -1,4 +1,4 @@
-name: analyze
+name: Analyse
 
 on:
   push:
@@ -8,25 +8,25 @@ on:
 
 jobs:
   phpstan:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout code
+      uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 8.2
+        php-version: 8.3
 
     - name: Cache Composer packages
       id: composer-cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: vendor
-        key: ${{ runner.os }}-php-8.2
+        key: ${{ runner.os }}-php-8.3-${{ hashFiles('**/composer.json') }}
         restore-keys: |
-          ${{ runner.os }}-php-8.2
+          ${{ runner.os }}-php-8.3-
 
     - name: Install dependencies
       if: steps.composer-cache.outputs.cache-hit != 'true'

.github/workflows/style_fix.yml

@@ -1,33 +1,41 @@
-name: style_fix
+name: Style fix
 
 on:
   push:
     branches: [master]
-  pull_request:
-    branches: [master]
 
 jobs:
-  style:
-
+  style-fix:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: '8.1'
-
-    - name: Install dependencies
-      run: |
-        composer install --no-interaction --no-progress
-        composer dump
-
-    - name: Fix styles
-      run: vendor/bin/php-cs-fixer fix
-
-    - uses: EndBug/add-and-commit@v9
-
-    - name: Run style
-      run: vendor/bin/php-cs-fixer fix --dry-run --diff --format junit
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+            php-version: 8.3
+
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v4
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-8.3-${{ hashFiles('**/composer.json') }}
+          restore-keys: |
+            ${{ runner.os }}-php-8.3-
+
+      - name: Install dependencies
+        if: steps.composer-cache.outputs.cache-hit != 'true'
+        run: |
+          composer install --no-interaction --no-progress
+          composer dump
+
+      - name: Fix styles
+        run: vendor/bin/php-cs-fixer fix
+
+      - name: Run style
+        run: vendor/bin/php-cs-fixer fix --dry-run --diff --format junit
+
+      - uses: EndBug/add-and-commit@v9

.github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: tests
+name: Tests
 
 on:
   push:
@@ -8,32 +8,39 @@ on:
 
 jobs:
   phpunit:
-
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: true
       matrix:
-        php-versions: ['8.2', '8.1']
-        laravel: [9.*, 10.*]
-        include:
-          - laravel: 9.*
-            testbench: 7.*
-          - laravel: 10.*
-            testbench: 8.*
+        php: [8.1, 8.2, 8.3]
 
     steps:
-    - uses: actions/checkout@v4
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php-versions }}
-        extensions: curl
-
-    - name: Install dependencies
-      run: |
-       composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-       composer update --prefer-stable --prefer-dist --no-interaction --no-suggest
-
-    - name: Run test phpunit
-      run: vendor/bin/phpunit
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+            php-version: ${{ matrix.php }}
+
+      - name: Validate composer.json
+        run: composer validate
+
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v4
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-${{ matrix.php }}-
+
+      - name: Install dependencies
+        if: steps.composer-cache.outputs.cache-hit != 'true'
+        run: |
+            composer install --no-interaction --no-progress
+            composer dump
+
+      - name: Run test phpunit
+        run: vendor/bin/phpunit --stop-on-error --stop-on-failure

composer.json

@@ -12,18 +12,18 @@
     "require": {
         "php": "^8.1",
         "aws/aws-php-sns-message-validator": "^1.1",
-        "illuminate/config": "^9.0|^10.0",
-        "illuminate/http": "^9.0|^10.0",
-        "illuminate/routing": "^9.0|^10.0",
-        "illuminate/support": "^9.0|^10.0"
+        "illuminate/config": "^9.0|^10.0|^11.0",
+        "illuminate/http": "^9.0|^10.0|^11.0",
+        "illuminate/routing": "^9.0|^10.0|^11.0",
+        "illuminate/support": "^9.0|^10.0|^11.0"
     },
     "require-dev": {
         "descom/dev": "^1.0",
         "friendsofphp/php-cs-fixer": "^3.4",
         "nunomaduro/larastan": "^2.0",
-        "orchestra/testbench": "^7.5|^8.0",
+        "orchestra/testbench": "^7.5|^8.0|^9.0",
         "phpstan/phpstan": "^1.2",
-        "phpunit/phpunit": "^9.3"
+        "phpunit/phpunit": "^9.3|^10.0|^10.5"
     },
     "autoload": {
         "psr-4": {
@@ -50,4 +50,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}