Merge pull request #8 from descom-es/laravel_11_tests

Add Support to Laravel 11
descom-es · Apr 18, 2024 · fc4781b · fc4781b
2 parents 61418ac + e8cb6e2
commit fc4781b
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 65 deletions.
diff --git a/.github/workflows/analyse.yml b/.github/workflows/analyse.yml
@@ -1,4 +1,4 @@
-name: analyse
+name: Analyse
 
 on:
   push:
@@ -8,30 +8,31 @@ on:
 
 jobs:
   phpstan:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
 
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: 8.1
+      - 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: Cache Composer packages
-      id: composer-cache
-      uses: actions/cache@v2
-      with:
-        path: vendor
-        key: ${{ runner.os }}-php-8.1-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-php-8.1-
-    - name: Install dependencies
-      if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: |
-        composer install
-        composer dump
+      - name: Install dependencies
+        if: steps.composer-cache.outputs.cache-hit != 'true'
+        run: |
+          composer install --no-interaction --no-progress
+          composer dump
 
-    - name: Run analyse phpstan
-      run: vendor/bin/phpstan analyse --error-format github
+      - name: Run analyse phpstan
+        run: vendor/bin/phpstan analyse --error-format github
diff --git a/.github/workflows/fix_style.yml b/.github/workflows/fix_style.yml
@@ -1,34 +1,37 @@
-name: Fix Styles
+name: Style fix
 
 on:
   push:
     branches: [master]
 
 jobs:
-  style:
+  style-fix:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout code
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          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.1-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-php-8.3-${{ hashFiles('**/composer.json') }}
           restore-keys: |
-            ${{ runner.os }}-php-8.1
+            ${{ runner.os }}-php-8.3-
+
       - name: Install dependencies
         if: steps.composer-cache.outputs.cache-hit != 'true'
         run: |
-          composer install
+          composer install --no-interaction --no-progress
           composer dump
+
       - name: Fix styles
         run: vendor/bin/php-cs-fixer fix
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,4 +1,4 @@
-name: tests
+name: Tests
 
 on:
   push:
@@ -8,41 +8,39 @@ on:
 
 jobs:
   phpunit:
-
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: true
       matrix:
-        php: [8.2, 8.1, 8.0]
-        laravel: [10.*, 9.*]
-
-    name: PHP${{ matrix.php }}
+        php: [8.0, 8.1, 8.2, 8.3]
 
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php }}
-
-    - name: Validate composer.json and composer.lock
-      run: composer validate
-
-    - name: Cache Composer packages
-      id: composer-cache
-      uses: actions/cache@v2
-      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
-        composer dump
-
-    - name: Run test phpunit
-      run: composer test
+      - 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: composer test
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "prefer-stable": true,
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.4",
-        "phpunit/phpunit": "^9.3",
+        "phpunit/phpunit": "^9.3|^10.0|^10.5",
         "phpstan/phpstan": "^1.2"
     },
     "autoload": {
@@ -37,4 +37,4 @@
         "style": "vendor/bin/php-cs-fixer fix",
         "analyse": "vendor/bin/phpstan analyse"
     }
-}
+}