Fix tetss on Drupal 10

drush-ops · Jan 30, 2022 · ceef271 · ceef271
1 parent 45b7989
commit ceef271
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/TestTraits/CliTestTrait.php b/src/TestTraits/CliTestTrait.php
@@ -79,7 +79,7 @@ public function getErrorOutputRaw()
     /**
      * Run a command and return the process without waiting for it to finish.
      *
-     * @param string $command
+     * @param string|array $command
      *   The actual command line to run.
      * @param sting cd
      *   The directory to run the command in.
@@ -88,12 +88,11 @@ public function getErrorOutputRaw()
      * @param string $input
      *   A string representing the STDIN that is piped to the command.
      */
-    public function startExecute(string $command, $cd = null, $env = null, $input = null)
+    public function startExecute($command, $cd = null, $env = null, $input = null)
     {
         try {
             // Process uses a default timeout of 60 seconds, set it to 0 (none).
             $this->process = new Process($command, $cd, $env, $input, 0);
-            $this->process->inheritEnvironmentVariables(true);
             if ($this->timeout) {
                 $this->process->setTimeout($this->timeout)
                 ->setIdleTimeout($this->idleTimeout);

diff --git a/tests/fixtures/modules/woot/src/EventSubscriber/ConfigSubscriber.php b/tests/fixtures/modules/woot/src/EventSubscriber/ConfigSubscriber.php
@@ -14,7 +14,7 @@ class ConfigSubscriber extends ConfigImportValidateEventSubscriberBase
   /**
    * {@inheritdoc}
    */
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         $events = [];
 

diff --git a/tests/unish/CommandUnishTestCase.php b/tests/unish/CommandUnishTestCase.php
@@ -71,7 +71,7 @@ public function getErrorOutputRaw()
     public function drushBackground($command, array $args = [], array $options = [], $site_specification = null, $cd = null, $suffix = null, $env = [])
     {
         list($cmd, ) = $this->prepareDrushCommand($command, $args, $options, $site_specification, $suffix);
-        return $this->startExecute($cmd, $cd, $env);
+        return $this->startExecute(explode(' ', $cmd), $cd, $env);
     }
 
     /**
@@ -191,7 +191,8 @@ protected function prepareDrushCommand($command, array $args = [], array $option
         if ($hide_stderr) {
             $cmd[] = '2>' . $this->bitBucket();
         }
-        $exec = array_filter($cmd, 'strlen'); // Remove NULLs
+        // Remove NULLs
+        $exec = @array_filter($cmd, 'strlen');
         $cmd = implode(' ', $exec);
         return [$cmd, $coverage_file];
     }