Merge branch '1.x' into feature/custom-sb-version

area17 · Mar 6, 2024 · 6291558 · 6291558
2 parents d5f4c02 + b0dcaea
commit 6291558
Show file tree

Hide file tree

Showing 6 changed files with 297 additions and 512 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -2,9 +2,11 @@ name: phpunit
 
 on:
   push:
-    branches: ['1.x']
+    branches:
+      - 1.x
   pull_request:
-    branches: ['1.x']
+    branches:
+      - 1.x
 
 jobs:
   test:
@@ -13,30 +15,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.0']
+        php: ['8.0', '8.1', '8.2']
 
     name: P${{ matrix.php }}
 
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Setup PHP, with composer and extensions
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php }}
-
-    - name: Cache Composer packages
-      id: composer-cache
-      uses: actions/cache@v2
-      with:
-        path: vendor
-        key: ${{ runner.os }}-${{ matrix.php }}-node-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ matrix.php }}-node-
-
-    - name: Install dependencies
-      if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: composer install --no-progress --no-suggest
-
-    - name: Run test suite
-      run: vendor/bin/phpunit
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v2
+        with:
+          path: vendor
+          key: ${{ runner.os }}-${{ matrix.php }}-node-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.php }}-node-
+
+      - name: Install dependencies
+        if: "steps.composer-cache.outputs.cache-hit != 'true'"
+        run: composer install --no-progress --no-suggest
+
+      - name: Run test suite
+        run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -25,12 +25,12 @@
     "require": {
         "php": "^7.3|^8.0|^8.1",
         "ext-json": "*",
-        "illuminate/filesystem": "^7.0|^8.0|^9.0|^10.0",
-        "illuminate/support": "^7.0|^8.0|^9.0|^10.0",
-        "illuminate/view": "^7.0|^8.0|^9.0|^10.0"
+        "illuminate/filesystem": "^7.0|^8.0|^9.0|^10.0|^11.0",
+        "illuminate/support": "^7.0|^8.0|^9.0|^10.0|^11.0",
+        "illuminate/view": "^7.0|^8.0|^9.0|^10.0|^11.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.21|^7.0"
+        "orchestra/testbench": "^6.21|^7.0|^9.0"
     },
     "autoload": {
         "psr-4": {