Laravel 9 Compatibility (#17)

RingierIMU · Oct 6, 2022 · e355efe · e355efe
1 parent da096b5
commit e355efe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 22 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,34 +14,23 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.3, 7.4, 8.0]
+        php: [7.3, 7.4, 8.0, 8.1]
         setup: [basic, stable, lowest]
         exclude:
           - php: 8.0
             setup: lowest
+          - php: 8.1
+            setup: lowest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{matrix.php}}
 
-      - name: Get Composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache Composer dependencies
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          # Use composer.json for key, if composer.lock is not committed.
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-
       - name: Install Composer dependencies
         run: |
           if [[ ${{matrix.setup}} = 'basic' ]]; then composer install --prefer-dist --no-interaction --no-suggest; fi

diff --git a/composer.json b/composer.json
@@ -18,8 +18,8 @@
     ],
     "require": {
         "php": "^7.3|^8.0",
-        "illuminate/events": "^7.0|^8.0",
-        "illuminate/support": "^7.0|^8.0",
+        "illuminate/events": "^7|^8|^9",
+        "illuminate/support": "^7|^8|^9",
         "symfony/event-dispatcher": "^5.1",
         "symfony/workflow": "^5.1",
         "symfony/property-access": "^5.1"
@@ -28,9 +28,9 @@
         "funkjedi/composer-include-files": "^1.0",
         "laravel/legacy-factories": "^1.1",
         "mockery/mockery": "^1.3|^1.4.2",
-        "orchestra/database": "^5.0|^6.0",
-        "orchestra/testbench": "^5.0|^6.0",
-        "phpunit/phpunit": "^8.0|^9.3.3"
+        "orchestra/database": "^5|^6|^7",
+        "orchestra/testbench": "^5|^6|^7",
+        "phpunit/phpunit": "^8|^9"
     },
     "extra": {
         "include_files": [
@@ -56,5 +56,10 @@
         ]
     },
     "minimum-stability": "dev",
-    "prefer-stable": true
+    "prefer-stable": true,
+    "config": {
+        "allow-plugins": {
+            "funkjedi/composer-include-files": true
+        }
+    }
 }