Merge branch '2.x' into 2.next

# Conflicts: # .phive/phars.xml
LordSimal · Nov 17, 2024 · 103e913 · 103e913
2 parents 0efcee1 + ebd96a5
commit 103e913
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
     <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"/>
+    <phar name="psalm" version="5.26.1" installed="5.26.1" location="./tools/psalm" copy="false"/>
 </phive>
diff --git a/src/Command/DumpSqlCommand.php b/src/Command/DumpSqlCommand.php
@@ -89,7 +89,7 @@ public function execute(Arguments $args, ConsoleIo $io): int
         if ($gzip) {
             if (function_exists('gzencode')) {
                 $result = gzencode($result, 9);
-                if (!$result) {
+                if ($result === false) {
                     $io->err('Failed to gzip the dump!');
 
                     return self::CODE_ERROR;

diff --git a/src/Sql/SqlBase.php b/src/Sql/SqlBase.php
@@ -65,7 +65,11 @@ protected function checkBinary(string $command): bool
     {
         $windows = str_starts_with(PHP_OS, 'WIN');
         $test = $windows ? 'where' : 'command -v';
+        $commandResult = shell_exec("$test $command");
+        if ($commandResult === null || $commandResult === false) {
+            return false;
+        }
 
-        return is_executable(trim(shell_exec("$test $command") ?: ''));
+        return is_executable(trim($commandResult));
     }
 }