From e382c85925917f8264b800dcb42bbee7e0237837 Mon Sep 17 00:00:00 2001
From: Andrey Helldar <helldar@dragon-code.pro>
Date: Mon, 24 Feb 2025 20:07:45 +0300
Subject: [PATCH] Fix

---
 .github/workflows/phpunit.yml | 36 ++++++-----------------------------
 composer.json                 |  4 +++-
 phpunit.xml                   |  1 +
 3 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 780f5ff..45fe103 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -11,75 +11,51 @@ jobs:
             matrix:
                 php: [ "8.0", "8.1", "8.2", "8.3", "8.4" ]
                 laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0", "11.0", "12.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: "6.0"
                         php: "8.3"
-
                     -   laravel: "6.0"
                         php: "8.4"
 
-                    -   laravel: "7.0"
-                        doctrine: "3.0"
-
                     -   laravel: "7.0"
                         php: "8.1"
-
                     -   laravel: "7.0"
                         php: "8.2"
-
                     -   laravel: "7.0"
                         php: "8.3"
-
                     -   laravel: "7.0"
                         php: "8.4"
 
-                    -   laravel: "8.0"
-                        doctrine: "2.0"
-
                     -   laravel: "8.0"
                         php: "8.2"
-
                     -   laravel: "8.0"
                         php: "8.3"
-
                     -   laravel: "8.0"
                         php: "8.4"
 
-                    -   laravel: "10.0"
-                        doctrine: "2.0"
+                    -   laravel: "9.0"
+                        php: "8.3"
+                    -   laravel: "9.0"
+                        php: "8.4"
 
                     -   laravel: "10.0"
                         php: "8.0"
 
-                    -   laravel: "11.0"
-                        doctrine: "2.0"
-
                     -   laravel: "11.0"
                         php: "8.0"
-
                     -   laravel: "11.0"
                         php: "8.1"
 
-                    -   laravel: "12.0"
-                        doctrine: "2.0"
-
                     -   laravel: "12.0"
                         php: "8.0"
-
                     -   laravel: "12.0"
                         php: "8.1"
 
-        name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}, Doctrine ${{ matrix.doctrine }}
+        name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
 
         services:
             mysql:
@@ -106,7 +82,7 @@ jobs:
                     coverage: xdebug
 
             -   name: Install dependencies
-                run: composer require --dev laravel/framework:^${{ matrix.laravel }} doctrine/dbal:^${{ matrix.doctrine }}
+                run: composer require --dev laravel/framework:^${{ matrix.laravel }}
 
             -   name: Execute tests
                 run: sudo vendor/bin/phpunit
diff --git a/composer.json b/composer.json
index aa0a4f7..1d9f3a3 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,6 @@
     ],
     "require": {
         "php": "^8.0",
-        "doctrine/dbal": "^2.6 || ^3.0",
         "dragon-code/laravel-cache": "^3.3 || ^4.0",
         "dragon-code/simple-dto": "^2.3",
         "dragon-code/support": "^6.0",
@@ -57,6 +56,9 @@
     "conflict": {
         "andrey-helldar/last-modified": "*"
     },
+    "suggest": {
+        "doctrine/dbal": "It is necessary to install when working with Laravel from 6 to 10"
+    },
     "minimum-stability": "stable",
     "prefer-stable": true,
     "autoload": {
diff --git a/phpunit.xml b/phpunit.xml
index b4b260e..aec6037 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -49,6 +49,7 @@
         <env name="REDIS_HOST" value="127.0.0.1"/>
         <env name="REDIS_PORT" value="6379"/>
         <env name="CACHE_DRIVER" value="redis"/>
+        <env name="CACHE_STORE" value="redis"/>
     </php>
     <testsuites>
         <testsuite name="Test Suite">