Merge branch '2.x' into 2.next

# Conflicts:
#	.phive/phars.xml

.phive/phars.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-    <phar name="phpstan" version="1.11.11" installed="1.11.11" location="./tools/phpstan" copy="false"/>
+    <phar name="phpstan" version="2.0.1" installed="2.0.1" location="./tools/phpstan" copy="false"/>
     <phar name="psalm" version="5.25.0" installed="5.25.0" location="./tools/psalm" copy="false"/>
 </phive>

phpstan-baseline.neon

@@ -0,0 +1,7 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Property CakeDumpSql\\Error\\VersionMismatchException\:\:\$message has no type specified\.$#'
+			identifier: missingType.property
+			count: 1
+			path: src/Error/VersionMismatchException.php

phpstan.neon

@@ -1,7 +1,13 @@
+includes:
+  - phpstan-baseline.neon
+
 parameters:
     paths:
       - src
       - tests/TestCase
-    level: 5
+    level: 8
     bootstrapFiles:
-      - tests/bootstrap.php
+      - tests/bootstrap.php
+    ignoreErrors:
+        -
+            identifier: missingType.iterableValue

psalm-baseline.xml

@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="dev-master@">
+<files psalm-version="5.14.1@b9d355e0829c397b9b3b47d0c0ed042a8a70284d">
   <file src="src/Sql/SqlBase.php">
-    <ForbiddenCode occurrences="1">
-      <code>shell_exec("$test $command")</code>
+    <ForbiddenCode>
+      <code><![CDATA[shell_exec("$test $command")]]></code>
     </ForbiddenCode>
-    <PossiblyNullArgument occurrences="1">
-      <code>shell_exec("$test $command")</code>
-    </PossiblyNullArgument>
   </file>
 </files>

src/Command/DumpSqlCommand.php

@@ -89,6 +89,11 @@ public function execute(Arguments $args, ConsoleIo $io): int
         if ($gzip) {
             if (function_exists('gzencode')) {
                 $result = gzencode($result, 9);
+                if (!$result) {
+                    $io->err('Failed to gzip the dump!');
+
+                    return self::CODE_ERROR;
+                }
             } else {
                 $io->err('Your PHP installation does not have zlib support to create a gzip file!');
 

src/Sql/SqlBase.php

@@ -66,6 +66,6 @@ protected function checkBinary(string $command): bool
         $windows = str_starts_with(PHP_OS, 'WIN');
         $test = $windows ? 'where' : 'command -v';
 
-        return is_executable(trim(shell_exec("$test $command")));
+        return is_executable(trim(shell_exec("$test $command") ?: ''));
     }
 }

tests/TestCase/Command/DumpSqlCommandTest.php

@@ -92,8 +92,12 @@ public function testCommandGzipped(): void
         $postsTable->save($entity);
 
         $this->exec('dump_sql --gzip');
-        $result = $this->_out->messages();
+        $result = $this->_out?->messages() ?? [];
         $sql = gzdecode($result[0]);
+        if (!$sql) {
+            $this->fail('Failed to decode gzipped output');
+        }
+
         if ($this->isDBType(Sqlite::class)) {
             $this->assertStringContainsString('CREATE TABLE IF NOT EXISTS "posts"', $sql);
             $this->assertStringContainsString('INSERT INTO posts VALUES(', $sql);