Fixing Process building for PHP 5.4

minkphp · Mar 5, 2019 · c02a209 · c02a209
1 parent e30a95a
commit c02a209
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 34 deletions.
diff --git a/src/NodeJS/Server.php b/src/NodeJS/Server.php
@@ -11,6 +11,7 @@
 namespace Behat\Mink\Driver\NodeJS;
 
 use Symfony\Component\Process\Process;
+use Symfony\Component\Process\ProcessBuilder;
 
 /**
  * Abstract base class to start and connect to a NodeJS server process.
@@ -358,16 +359,35 @@ public function start(Process $process = null)
                 $env['OPTIONS'] = json_encode($this->options);
             }
 
-            $process = new Process(
-                array(
+            if (method_exists('\Symfony\Component\Process\Process', 'inheritEnvironmentVariables')) {
+                $process = new Process(
+                    array(
+                        $this->nodeBin,
+                        $this->serverPath,
+                    ),
+                    null,
+                    $env
+                );
+
+                $process->inheritEnvironmentVariables();
+            } else {
+                $processBuilder = new ProcessBuilder(array(
                     $this->nodeBin,
                     $this->serverPath,
-                ),
-                null,
-                $env
-            );
+                ));
+                $processBuilder->setEnv('HOST', $this->host)
+                    ->setEnv('PORT', $this->port);
+
+                if (!empty($this->nodeModulesPath)) {
+                    $processBuilder->setEnv('NODE_PATH', $this->nodeModulesPath);
+                }
 
-            $process->inheritEnvironmentVariables();
+                if (!empty($this->options)) {
+                    $processBuilder->setEnv('OPTIONS', json_encode($this->options));
+                }
+
+                $process = $processBuilder->getProcess();
+            }
         }
 
         $this->process = $process;

diff --git a/tests/Custom/InstantiationTestCase.php b/tests/Custom/InstantiationTestCase.php
@@ -3,6 +3,7 @@
 namespace Behat\Mink\Tests\Driver\Custom;
 
 use Behat\Mink\Driver\ZombieDriver;
+use PHPUnit\Framework\TestCase;
 
 class InstantiationTestCase extends TestCase
 {

diff --git a/tests/Custom/NodeJS/ServerTest.php b/tests/Custom/NodeJS/ServerTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Driver\NodeJS\Connection;
 use Behat\Mink\Driver\NodeJS\Server as BaseServer;
-use Behat\Mink\Tests\Driver\Custom\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class TestServer extends BaseServer
 {

diff --git a/tests/Custom/TestCase.php b/tests/Custom/TestCase.php