From a59a13791077fe3d44f90e7133eb68e7d22eaff2 Mon Sep 17 00:00:00 2001
From: Graham Campbell <hello@gjcampbell.co.uk>
Date: Sat, 20 Jul 2024 22:52:34 +0100
Subject: [PATCH] Upgrade deps

---
 composer.json                    |  4 ++--
 phpstan-baseline.neon            |  2 +-
 psalm-baseline.xml               | 32 ++++++++++++++++++++------------
 psalm.xml                        |  2 ++
 vendor-bin/phpstan/composer.json |  8 ++++----
 vendor-bin/psalm/composer.json   |  2 +-
 6 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/composer.json b/composer.json
index 50bc3b72..3636317f 100644
--- a/composer.json
+++ b/composer.json
@@ -18,8 +18,8 @@
     "require": {
         "php": "^7.2.5 || ^8.0",
         "ext-pcre": "*",
-        "graham-campbell/result-type": "^1.1.2",
-        "phpoption/phpoption": "^1.9.2",
+        "graham-campbell/result-type": "^1.1.3",
+        "phpoption/phpoption": "^1.9.3",
         "symfony/polyfill-ctype": "^1.24",
         "symfony/polyfill-mbstring": "^1.24",
         "symfony/polyfill-php80": "^1.24"
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index ae965032..86edd7ee 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,7 +1,7 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Anonymous function should return GrahamCampbell\\\\ResultType\\\\Result\\<array\\{mixed, mixed\\}, string\\> but returns GrahamCampbell\\\\ResultType\\\\Result\\<array\\{Dotenv\\\\Parser\\\\Value, mixed\\}, string\\>\\.$#"
+			message: "#^Parameter \\#2 \\$callback of function array_reduce expects callable\\(GrahamCampbell\\\\ResultType\\\\Result\\<array\\{Dotenv\\\\Parser\\\\Value, int\\}, mixed\\>\\|GrahamCampbell\\\\ResultType\\\\Result\\<array\\{mixed, int\\}, string\\>, string\\)\\: \\(GrahamCampbell\\\\ResultType\\\\Result\\<array\\{Dotenv\\\\Parser\\\\Value, int\\}, mixed\\>\\|GrahamCampbell\\\\ResultType\\\\Result\\<array\\{mixed, int\\}, string\\>\\), Closure\\(GrahamCampbell\\\\ResultType\\\\Result, string\\)\\: GrahamCampbell\\\\ResultType\\\\Result\\<array\\{Dotenv\\\\Parser\\\\Value, int\\}, string\\> given\\.$#"
 			count: 1
 			path: src/Parser/EntryParser.php
 
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index a86b8ae0..3d8d69c8 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,28 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
+<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
   <file src="src/Repository/Adapter/EnvConstAdapter.php">
     <RedundantConditionGivenDocblockType>
-      <code>\is_scalar($value)</code>
+      <code><![CDATA[\is_scalar($value)]]></code>
     </RedundantConditionGivenDocblockType>
   </file>
   <file src="src/Repository/RepositoryBuilder.php">
     <InvalidStringClass>
-      <code>$adapter::create()</code>
-      <code>$reader::create()</code>
-      <code>$writer::create()</code>
+      <code><![CDATA[$adapter::create()]]></code>
+      <code><![CDATA[$reader::create()]]></code>
+      <code><![CDATA[$writer::create()]]></code>
     </InvalidStringClass>
     <MissingClosureReturnType>
-      <code>static function ($adapter) {</code>
-      <code>static function ($reader) {</code>
-      <code>static function ($writer) {</code>
+      <code><![CDATA[static function ($adapter) {]]></code>
+      <code><![CDATA[static function ($reader) {]]></code>
+      <code><![CDATA[static function ($writer) {]]></code>
     </MissingClosureReturnType>
   </file>
   <file src="src/Util/Regex.php">
     <ArgumentTypeCoercion>
-      <code>$pattern</code>
-      <code>$pattern</code>
-      <code>$pattern</code>
-      <code>$pattern</code>
+      <code><![CDATA[$pattern]]></code>
+      <code><![CDATA[$pattern]]></code>
+      <code><![CDATA[$pattern]]></code>
+      <code><![CDATA[$pattern]]></code>
     </ArgumentTypeCoercion>
+    <InvalidReturnStatement>
+      <code><![CDATA[self::pregAndWrap(static function (string $subject) use ($pattern) {
+            return (int) @\preg_match_all($pattern, $subject);
+        }, $subject)]]></code>
+    </InvalidReturnStatement>
+    <InvalidReturnType>
+      <code><![CDATA[\GrahamCampbell\ResultType\Result<int,string>]]></code>
+    </InvalidReturnType>
   </file>
 </files>
diff --git a/psalm.xml b/psalm.xml
index ef184d85..30adb0ee 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" />
diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
index 5889256c..ea7c6430 100644
--- a/vendor-bin/phpstan/composer.json
+++ b/vendor-bin/phpstan/composer.json
@@ -1,10 +1,10 @@
 {
     "require": {
         "php": "^8.3",
-        "phpstan/phpstan": "1.10.41",
-        "phpstan/extension-installer": "1.3.1",
-        "phpstan/phpstan-deprecation-rules": "1.1.4",
-        "phpstan/phpstan-strict-rules": "1.5.2",
+        "phpstan/phpstan": "1.11.7",
+        "phpstan/extension-installer": "1.4.1",
+        "phpstan/phpstan-deprecation-rules": "1.2.0",
+        "phpstan/phpstan-strict-rules": "1.6.0",
         "thecodingmachine/phpstan-strict-rules": "1.0.0"
     },
     "config": {
diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json
index e76dd540..151617dd 100644
--- a/vendor-bin/psalm/composer.json
+++ b/vendor-bin/psalm/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^8.3",
-        "psalm/phar": "5.15.0"
+        "psalm/phar": "5.25.0"
     },
     "config": {
         "preferred-install": "dist"