Merge pull request #34 from TheDragonCode/4.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-6.yml → .github/workflows/phpunit.yml

@@ -1,4 +1,5 @@
-name: "Laravel 6"
+name: phpunit
+
 on: [ push ]
 
 jobs:
@@ -8,10 +9,41 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ "8.0" ]
-                laravel: [ "6.0" ]
+                php: [ "8.0", "8.1", "8.2" ]
+                laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0" ]
+                doctrine: [ "2.0", "3.0" ]
+                exclude:
+                    -   laravel: "6.0"
+                        doctrine: "3.0"
+
+                    -   laravel: "6.0"
+                        php: "8.1"
+
+                    -   laravel: "6.0"
+                        php: "8.2"
+
+                    -   laravel: "7.0"
+                        doctrine: "3.0"
+
+                    -   laravel: "7.0"
+                        php: "8.1"
+
+                    -   laravel: "7.0"
+                        php: "8.2"
+
+                    -   laravel: "8.0"
+                        doctrine: "2.0"
+
+                    -   laravel: "8.0"
+                        php: "8.2"
+
+                    -   laravel: "10.0"
+                        doctrine: "2.0"
+
+                    -   laravel: "10.0"
+                        php: "8.0"
 
-        name: PHP ${{ matrix.php }}
+        name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}, Doctrine ${{ matrix.doctrine }}
 
         services:
             mysql:
@@ -38,7 +70,7 @@ jobs:
                     coverage: none
 
             -   name: Install dependencies
-                run: composer require --dev laravel/framework:^${{ matrix.laravel }} doctrine/dbal:^2.6
+                run: composer require --dev laravel/framework:^${{ matrix.laravel }} doctrine/dbal:^${{ matrix.doctrine }}
 
             -   name: Execute tests
                 run: sudo vendor/bin/phpunit

composer.json

@@ -4,10 +4,10 @@
     "license": "MIT",
     "type": "library",
     "keywords": [
-        "last modified",
-        "not modified",
+        "last-modified",
+        "not-modified",
         "headers",
-        "304 http code",
+        "304-http-code",
         "304",
         "seo",
         "dragon-code",
@@ -45,22 +45,22 @@
     "require": {
         "php": "^8.0",
         "doctrine/dbal": "^2.6 || ^3.0",
-        "dragon-code/laravel-cache": "^3.0",
+        "dragon-code/laravel-cache": "^3.3",
         "dragon-code/simple-dto": "^2.3",
         "dragon-code/support": "^6.0",
         "fig/http-message-util": "^1.1",
-        "illuminate/console": "^6.0 || ^7.0 || ^8.0 || ^9.0",
-        "illuminate/database": "^6.0 || ^7.0 || ^8.0 || ^9.0",
-        "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "illuminate/console": ">=6.0 <11.0",
+        "illuminate/database": ">=6.0 <11.0",
+        "illuminate/support": ">=6.0 <11.0",
         "lmc/http-constants": "^1.2",
         "nesbot/carbon": "^1.20 || ^2.0",
         "psr/http-message": "^1.0.1"
     },
     "require-dev": {
         "ext-json": "*",
         "mockery/mockery": "^1.3.1",
-        "orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0",
-        "phpunit/phpunit": "^9.0"
+        "orchestra/testbench": ">=4.0 <9.0",
+        "phpunit/phpunit": "^9.6"
     },
     "conflict": {
         "andrey-helldar/last-modified": "*"