From 6f842c0a0d6f078e88dae3f851245d5d430815a0 Mon Sep 17 00:00:00 2001
From: otsch <otsch@users.noreply.github.com>
Date: Wed, 6 Nov 2024 23:15:29 +0100
Subject: [PATCH 1/2] Update phpunit.xml

From deprecated schema. And add .phpunit.cache to .gitignore.
---
 .gitignore  |  1 +
 phpunit.xml | 25 +++++++++++--------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index d4cb823..54de472 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ composer.lock
 vendor
 .php-cs-fixer.cache
 .phpunit.result.cache
+.phpunit.cache
diff --git a/phpunit.xml b/phpunit.xml
index fe850a6..dbb0c53 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         colors="true">
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true" cacheDirectory=".phpunit.cache">
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>

From e5744535ba588d38287309bd9880a7b988fc3241 Mon Sep 17 00:00:00 2001
From: otsch <otsch@users.noreply.github.com>
Date: Wed, 6 Nov 2024 23:19:46 +0100
Subject: [PATCH 2/2] Fix after PHPStan update

Newest version of PHPStan complains about `@return $this`.
---
 src/Query.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Query.php b/src/Query.php
index 5e9ac46..e6adc92 100644
--- a/src/Query.php
+++ b/src/Query.php
@@ -890,7 +890,7 @@ private function firstOrLast(?string $key = null, bool $first = true): mixed
 
     /**
      * @param string|mixed[] $query
-     * @return $this
+     * @return self
      * @throws Exception
      */
     private function newWithSameSettings(string|array $query): self