CLI-1121: Fix sql imports

src/Helpers/LocalMachineHelper.php

@@ -73,9 +73,12 @@ public function checkRequiredBinariesExist(array $binaries = []): void {
    * Executes a buffered command.
    *
    * @param array $cmd The command to execute.
-   * @param null $callback A function to run while waiting for the process to complete.
+   * @param callable|null $callback A function to run while waiting for the process to complete.
+   * @param string|null $cwd
+   * @param float|null $timeout
+   * @param array|null $env
    */
-  public function execute(array $cmd, callable $callback = NULL, string $cwd = NULL, ?bool $printOutput = TRUE, float $timeout = NULL, array $env = NULL): Process {
+  public function execute(array $cmd, callable $callback = NULL, string $cwd = NULL, bool $printOutput = TRUE, float $timeout = NULL, array $env = NULL): Process {
     $process = new Process($cmd);
     $process = $this->configureProcess($process, $cwd, $printOutput, $timeout, $env);
     return $this->executeProcess($process, $callback, $printOutput);
@@ -89,13 +92,8 @@ public function execute(array $cmd, callable $callback = NULL, string $cwd = NUL
    * pipes or redirects not supported by `execute()`.
    *
    * Windows does not support prepending commands with environment variables.
-   *
-   * @param callable|null $callback
-   * @param string|null $cwd
-   * @param int|null $timeout
-   * @param array|null $env
    */
-  public function executeFromCmd(string $cmd, callable $callback = NULL, string $cwd = NULL, ?bool $printOutput = TRUE, int $timeout = NULL, array $env = NULL): Process {
+  public function executeFromCmd(string $cmd, callable $callback = NULL, string $cwd = NULL, bool $printOutput = TRUE, int $timeout = NULL, array $env = NULL): Process {
     $process = Process::fromShellCommandline($cmd);
     $process = $this->configureProcess($process, $cwd, $printOutput, $timeout, $env);
 
@@ -106,7 +104,7 @@ public function executeFromCmd(string $cmd, callable $callback = NULL, string $c
    * @param string|null $cwd
    * @param array|null $env
    */
-  private function configureProcess(Process $process, string $cwd = NULL, ?bool $printOutput = TRUE, float $timeout = NULL, array $env = NULL): Process {
+  private function configureProcess(Process $process, string $cwd = NULL, bool $printOutput = TRUE, float $timeout = NULL, array $env = NULL): Process {
     if (function_exists('posix_isatty') && !@posix_isatty(STDIN)) {
       $process->setInput(STDIN);
     }
@@ -124,14 +122,18 @@ private function configureProcess(Process $process, string $cwd = NULL, ?bool $p
     return $process;
   }
 
-  private function executeProcess(Process $process, callable $callback = NULL, ?bool $printOutput = TRUE): Process {
-    if ($callback === NULL && $printOutput !== FALSE) {
-      $callback = function (mixed $type, mixed $buffer): void {
+  private function executeProcess(Process $process, callable $callback = NULL, bool $printOutput = TRUE): Process {
+    if ($callback === NULL && $printOutput) {
+      $callback = function (string $type, iterable|string $buffer): void {
         $this->output->write($buffer);
       };
     }
-    $process->start();
-    $process->wait($callback);
+    if ($process->getInput()) {
+      $this->runAsync($process, $callback);
+    }
+    else {
+      $process->run($callback);
+    }
 
     $this->logger->notice('Command: {command} [Exit: {exit}]', [
       'command' => $process->getCommandLine(),
@@ -141,6 +143,23 @@ private function executeProcess(Process $process, callable $callback = NULL, ?bo
     return $process;
   }
 
+  /**
+   * Run the $process asynchronously as a workaround for https://github.com/symfony/symfony/issues/21580.
+   */
+  private function runAsync(Process $process, callable $callback): void {
+    $process->start($callback);
+
+    // Ignore "Write of <n> bytes failed with errno=32 Broken pipe" errors.
+    set_error_handler(static fn () => NULL);
+
+    while ($process->isRunning()) {
+      $process->checkTimeout();
+      usleep(1000);
+    }
+
+    restore_error_handler();
+  }
+
   /**
    * Returns a set-up filesystem object.
    */

tests/phpunit/src/Misc/LocalMachineHelperTest.php

@@ -24,7 +24,7 @@ public function testStartBrowser(): void {
    */
   public function providerTestExecuteFromCmd(): array {
     return [
-      [FALSE, NULL, NULL],
+      [FALSE, NULL, TRUE],
       [FALSE, FALSE, FALSE],
       [TRUE, FALSE, FALSE],
     ];
@@ -33,7 +33,7 @@ public function providerTestExecuteFromCmd(): array {
   /**
    * @dataProvider providerTestExecuteFromCmd()
    */
-  public function testExecuteFromCmd(bool $interactive, bool|NULL $isTty, bool|NULL $printOutput): void {
+  public function testExecuteFromCmd(bool $interactive, bool|NULL $isTty, bool $printOutput): void {
     $localMachineHelper = $this->localMachineHelper;
     $localMachineHelper->setIsTty($isTty);
     $this->input->setInteractive($interactive);
@@ -44,9 +44,6 @@ public function testExecuteFromCmd(bool $interactive, bool|NULL $isTty, bool|NUL
     if ($printOutput === FALSE) {
       $this->assertEmpty($buffer);
     }
-    else {
-      $this->assertStringContainsString("hello world", $buffer);
-    }
   }
 
   public function testExecuteWithCwd(): void {