Merge pull request #13 from TheDragonCode/1.x

Added Laravel 10 support

.github/workflows/code-style.yml

@@ -0,0 +1,35 @@
+name: code-style
+
+on:
+    push:
+    pull_request:
+
+permissions: write-all
+
+jobs:
+    check:
+        if: ${{ ! (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
+
+        runs-on: ubuntu-latest
+
+        steps:
+            -   name: Checkout code
+                uses: actions/checkout@v3
+
+            -   name: Checking PHP Syntax
+                uses: TheDragonCode/[email protected]
+
+    fix:
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+
+        runs-on: ubuntu-latest
+
+        steps:
+            -   name: Checkout code
+                uses: actions/checkout@v3
+
+            -   name: Checking PHP Syntax
+                uses: TheDragonCode/[email protected]
+                with:
+                    github_token: ${{ secrets.COMPOSER_TOKEN }}
+                    fix: true

.github/workflows/laravel-8.yml → .github/workflows/phpunit.yml

@@ -1,4 +1,4 @@
-name: "Laravel 8"
+name: phpunit
 
 on: [ push ]
 
@@ -9,10 +9,14 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ "8.0", "8.1" ]
-                laravel: [ "8.0" ]
+                php: [ "8.0", "8.1", "8.2" ]
+                laravel: [ "8.0", "9.0", "10.0" ]
+                dragon: [ "5.8", "6.0" ]
+                exclude:
+                    -   laravel: "10.0"
+                        php: "8.0"
 
-        name: PHP ${{ matrix.php }}
+        name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}, Dragon ${{ matrix.dragon }}
 
         steps:
             -   name: Checkout code
@@ -26,7 +30,7 @@ jobs:
                     coverage: none
 
             -   name: Install dependencies
-                run: composer require --dev laravel/framework:^${{ matrix.laravel }}
+                run: composer require --dev laravel/framework:^${{ matrix.laravel }} dragon-code/support:^${{ matrix.dragon }}
 
             -   name: Execute tests
-                run: sudo vendor/bin/phpunit --colors=always
+                run: sudo vendor/bin/phpunit

composer.json

@@ -48,16 +48,16 @@
         "php": "^8.0",
         "doctrine/dbal": "^3.3",
         "dragon-code/support": "^5.8 || ^6.0",
-        "illuminate/contracts": "^8.37 || ^9.0",
-        "illuminate/database": "^8.37 || ^9.0",
-        "illuminate/http": "^8.37 || ^9.0",
-        "illuminate/routing": "^8.37 || ^9.0",
-        "illuminate/support": "^8.37 || ^9.0"
+        "illuminate/contracts": "^8.37 || ^9.0 || ^10.0",
+        "illuminate/database": "^8.37 || ^9.0 || ^10.0",
+        "illuminate/http": "^8.37 || ^9.0 || ^10.0",
+        "illuminate/routing": "^8.37 || ^9.0 || ^10.0",
+        "illuminate/support": "^8.37 || ^9.0 || ^10.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.5",
-        "orchestra/testbench": "^6.0 || ^7.0",
-        "phpunit/phpunit": "^9.5"
+        "orchestra/testbench": "^6.0 || ^7.0 || ^8.0",
+        "phpunit/phpunit": "^9.6"
     },
     "minimum-stability": "stable",
     "prefer-stable": true,