Merge remote-tracking branch 'origin/main' into CLI-1210

acquia · Nov 27, 2023 · e99a5f3 · e99a5f3
2 parents 62901d6 + ef27522
commit e99a5f3
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 75 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Command/Pull/PullCommandBase.php b/src/Command/Pull/PullCommandBase.php
@@ -410,7 +410,7 @@ private function importDatabaseDump(string $localDumpFilepath, string $dbHost, s
     }
     else {
       $this->io->warning('Install `pv` to see progress bar');
-      $command = "gunzip $localDumpFilepath | MYSQL_PWD=$dbPassword mysql --host=$dbHost --user=$dbUser $dbName";
+      $command = "gunzip -c $localDumpFilepath | MYSQL_PWD=$dbPassword mysql --host=$dbHost --user=$dbUser $dbName";
     }
 
     $process = $this->localMachineHelper->executeFromCmd($command, $outputCallback, NULL, ($this->output->getVerbosity() > OutputInterface::VERBOSITY_NORMAL));

diff --git a/tests/phpunit/src/CommandTestBase.php b/tests/phpunit/src/CommandTestBase.php
@@ -358,11 +358,12 @@ protected function mockCreateMySqlDumpOnLocal(ObjectProphecy $localMachineHelper
   }
 
   protected function mockExecutePvExists(
-        ObjectProphecy $localMachineHelper
+        ObjectProphecy $localMachineHelper,
+        bool $pvExists = TRUE
     ): void {
     $localMachineHelper
             ->commandExists('pv')
-            ->willReturn(TRUE)
+            ->willReturn($pvExists)
             ->shouldBeCalled();
   }