From 58716a3b57fedfa81e380622bce8664b6c2ed67f Mon Sep 17 00:00:00 2001
From: Andreas Leathley <andreas.leathley@panaxis.ch>
Date: Fri, 1 Dec 2023 09:57:30 +0100
Subject: [PATCH] Allow Symfony 7

---
 composer.json         |  6 +++---
 phpstan-baseline.neon | 17 ++++++++++++++++-
 phpunit.xml.dist      | 29 +++++++++++++++--------------
 psalm-baseline.xml    | 21 +++++++++------------
 psalm.xml             |  2 ++
 5 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/composer.json b/composer.json
index 326e303..b0ace43 100644
--- a/composer.json
+++ b/composer.json
@@ -21,8 +21,8 @@
     ],
     "require": {
         "php": ">=8.0",
-        "symfony/console": "^5.0|^6.0",
-        "symfony/finder": "^5.0|^6.0",
+        "symfony/console": "^5.0|^6.0|^7.0",
+        "symfony/finder": "^5.0|^6.0|^7.0",
         "squirrelphp/debug": "^2.0",
         "squirrelphp/queries": "^1.2",
         "squirrelphp/types": "^1.0"
@@ -30,7 +30,7 @@
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8",
         "captainhook/plugin-composer": "^5.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.0",
         "mockery/mockery": "^1.0"
     },
     "suggest": {
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index a344f0f..f5586c8 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -61,7 +61,7 @@ parameters:
 			path: src/MultiRepositoryReadOnly.php
 
 		-
-			message: "#^Method Squirrel\\\\Entities\\\\MultiRepositoryReadOnly\\:\\:fetchAllAndFlatten\\(\\) should return array\\<bool\\|float\\|int\\|string\\|null\\> but returns array\\<int, mixed\\>\\.$#"
+			message: "#^Method Squirrel\\\\Entities\\\\MultiRepositoryReadOnly\\:\\:fetchAllAndFlatten\\(\\) should return array\\<bool\\|float\\|int\\|string\\|null\\> but returns array\\<int\\<0, max\\>, mixed\\>\\.$#"
 			count: 1
 			path: src/MultiRepositoryReadOnly.php
 
@@ -125,6 +125,21 @@ parameters:
 			count: 3
 			path: src/RepositoryReadOnly.php
 
+		-
+			message: "#^Parameter \\#1 \\$value of function floatval expects array\\|bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#"
+			count: 1
+			path: src/RepositoryReadOnly.php
+
+		-
+			message: "#^Parameter \\#1 \\$value of function intval expects array\\|bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#"
+			count: 2
+			path: src/RepositoryReadOnly.php
+
+		-
+			message: "#^Parameter \\#1 \\$value of function strval expects bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#"
+			count: 1
+			path: src/RepositoryReadOnly.php
+
 		-
 			message: "#^Parameter \\#1 \\$where of method Squirrel\\\\Entities\\\\RepositoryReadOnly\\:\\:preprocessWhere\\(\\) expects array\\<int\\|string, mixed\\>, mixed given\\.$#"
 			count: 1
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 8eb6b3e..67a1f9a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
-  <coverage>
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
-    <exclude>
-      <directory>src/Generate/PHPFilesInDirectoryGetContents.php</directory>
-    </exclude>
-  </coverage>
-  <testsuites>
-    <testsuite name="Unit Tests">
-      <directory>tests</directory>
-    </testsuite>
-  </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+    <coverage includeUncoveredFiles="false"/>
+    <testsuites>
+        <testsuite name="Squirrel Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <source>
+        <include>
+            <directory>src</directory>
+        </include>
+        <exclude>
+            <file>src/Generate/PHPFilesInDirectoryGetContents.php</file>
+        </exclude>
+    </source>
 </phpunit>
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index d2f2798..525010e 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,35 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.2.0@fb685a16df3050d4c18d8a4100fe83abe6458cba">
+<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591">
   <file src="src/Builder/SelectEntries.php">
-    <MissingTemplateParam occurrences="1">
+    <MissingTemplateParam>
       <code>\IteratorAggregate</code>
     </MissingTemplateParam>
   </file>
   <file src="src/Builder/SelectIterator.php">
-    <MissingTemplateParam occurrences="1">
+    <MissingTemplateParam>
       <code>\Iterator</code>
     </MissingTemplateParam>
   </file>
   <file src="src/MultiRepositoryReadOnly.php">
-    <MissingConstructor occurrences="2">
+    <MissingConstructor>
       <code>$db</code>
       <code>$db</code>
     </MissingConstructor>
-    <PossiblyInvalidArgument occurrences="1">
-      <code>$sanitizedOptions['query']</code>
+    <PossiblyInvalidArgument>
+      <code><![CDATA[$sanitizedOptions['query']]]></code>
     </PossiblyInvalidArgument>
   </file>
   <file src="src/RepositoryReadOnly.php">
-    <ArgumentTypeCoercion occurrences="3">
+    <ArgumentTypeCoercion>
       <code>$sanitizedQuery</code>
       <code>$sanitizedQuery</code>
       <code>$sanitizedQuery</code>
     </ArgumentTypeCoercion>
-    <InvalidArrayOffset occurrences="1">
-      <code>$query['limit']</code>
+    <InvalidArrayOffset>
+      <code><![CDATA[$query['limit']]]></code>
     </InvalidArrayOffset>
   </file>
-  <file src="tests/MultiRepositoryReadOnlyTest.php">
-    <ArgumentTypeCoercion occurrences="1"/>
-  </file>
 </files>
diff --git a/psalm.xml b/psalm.xml
index 01c2768..b9bedf4 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -6,6 +6,8 @@
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     errorBaseline="psalm-baseline.xml"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />