From 525f4aeb174aca5e9ac0bf724d0b7c69a50edfc5 Mon Sep 17 00:00:00 2001
From: Italo Israel Baeza Cabrera <DarkGhostHunter@Gmail.com>
Date: Mon, 20 Feb 2023 20:29:48 -0300
Subject: [PATCH 1/2] First support for PHP 8.2, Laravel 10

---
 .github/workflows/php.yml | 10 ++++++++--
 composer.json             | 31 +++++++++++--------------------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index b6b12e1..4fcb1d8 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -29,7 +29,7 @@ jobs:
       - name: "Set up PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.1"
+          php-version: "latest"
           tools: "parallel-lint"
 
       - name: "Checkout code"
@@ -52,11 +52,16 @@ jobs:
         php-version:
           - "8.0"
           - "8.1"
+          - "8.2"
         laravel-constrain:
           - "9.*"
+          - "10.*"
         dependencies:
           - "lowest"
           - "highest"
+        exclude:
+          - laravel-constrain: "10.*"
+            php-version: "8.0"
     steps:
       - name: "Set up PHP"
         uses: "shivammathur/setup-php@v2"
@@ -77,7 +82,7 @@ jobs:
         run: "composer run-script test"
 
       - name: "Upload coverage to Codecov"
-        uses: "codecov/codecov-action@v2"
+        uses: "codecov/codecov-action@v3"
 
   static_analysis:
     name: "3️⃣ Static Analysis"
@@ -91,6 +96,7 @@ jobs:
         with:
           tools: "phpstan"
           php-version: "latest"
+          coverage: "none"
 
       - name: "Checkout code"
         uses: "actions/checkout@v3"
diff --git a/composer.json b/composer.json
index 25270b6..7af74e4 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
         {
             "name": "Italo Baeza C.",
             "email": "DarkGhostHunter@Gmail.com",
-            "homepage": "https://patreon.com/packagesforlaravel"
+            "homepage": "https://github.com/sponsors/DarkGhostHunter"
         }
     ],
     "support": {
@@ -17,17 +17,16 @@
         "issues": "https://github.com/laragear/cache-query/issues"
     },
     "require": {
-        "php": "^8.0.2",
-        "illuminate/cache": "9.*",
-        "illuminate/config": "9.*",
-        "illuminate/database": "9.*",
-        "illuminate/support": "9.*",
-        "illuminate/container": "9.*",
-        "illuminate/contracts": "9.*"
+        "php": "8.*",
+        "illuminate/cache": "9.*|10.*",
+        "illuminate/config": "9.*|10.*",
+        "illuminate/database": "9.*|10.*",
+        "illuminate/support": "9.*|10.*",
+        "illuminate/container": "9.*|10.*",
+        "illuminate/contracts": "9.*|10.*"
     },
     "require-dev": {
-        "orchestra/testbench": "7.*",
-        "phpunit/phpunit": "^9.5"
+        "orchestra/testbench": "^7.22|8.*"
     },
     "autoload": {
         "psr-4": {
@@ -55,16 +54,8 @@
     },
     "funding": [
         {
-            "type": "Patreon",
-            "url": "https://patreon.com/PackagesForLaravel"
-        },
-        {
-            "type": "Ko-Fi",
-            "url": "https://ko-fi.com/DarkGhostHunter"
-        },
-        {
-            "type": "Buy me a cofee",
-            "url": "https://www.buymeacoffee.com/darkghosthunter"
+            "type": "Github Sponsorship",
+            "url": "https://github.com/sponsors/DarkGhostHunter"
         },
         {
             "type": "Paypal",

From 9a5fa17c57f202249732e7912952cca720fe3a7c Mon Sep 17 00:00:00 2001
From: Italo Israel Baeza Cabrera <DarkGhostHunter@Gmail.com>
Date: Mon, 20 Feb 2023 20:59:29 -0300
Subject: [PATCH 2/2] Fixes coverage

---
 .gitignore  |  1 +
 phpunit.xml | 53 ++++++++++++++++++++++-------------------------------
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index f5dba49..77eda96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,6 @@
 /coverage
 /.idea
 .phpunit.result.cache
+.phpunit.cache
 phpunit.xml.dist.bak
 composer.lock
diff --git a/phpunit.xml b/phpunit.xml
index 0924d0d..7b65982 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,32 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
-    <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
-        <env name="DB_CONNECTION" value="sqlite"/>
-        <env name="DB_DATABASE" value=":memory:"/>
-        <env name="CACHE_DRIVER" value="array"/>
-    </php>
-</phpunit>
\ No newline at end of file
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_ENV" value="testing"/>
+    <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
+    <env name="DB_CONNECTION" value="sqlite"/>
+    <env name="DB_DATABASE" value=":memory:"/>
+    <env name="CACHE_DRIVER" value="array"/>
+  </php>
+</phpunit>