Merge pull request #29 from clue-labs/compat

[RFC] Improve compatibility with legacy versions

Author: clue

.travis.yml

@@ -1,6 +1,7 @@
 language: php
 
 php:
+  - 5.3
   - 5.4
   - 5.5
   - 5.6

composer.json

@@ -4,9 +4,9 @@
     "keywords": ["process"],
     "license": "MIT",
     "require": {
-        "php": ">=5.4.0",
-        "evenement/evenement": "~2.0",
-        "react/event-loop": "0.4.*",
+        "php": ">=5.3.0",
+        "evenement/evenement": "^2.0 || ^1.0",
+        "react/event-loop": "^0.4 || ^0.3",
         "react/stream": "^0.5 || ^0.4.4"
     },
     "require-dev": {

src/Process.php

@@ -103,21 +103,21 @@ public function start(LoopInterface $loop, $interval = 0.1)
 
         $closeCount = 0;
 
-        $streamCloseHandler = function () use (&$closeCount, $loop, $interval) {
+        $that = $this;
+        $streamCloseHandler = function () use (&$closeCount, $loop, $interval, $that) {
             $closeCount++;
 
             if ($closeCount < 2) {
                 return;
             }
 
-            $loop->addPeriodicTimer($interval, function (TimerInterface $timer) {
-                if (!$this->isRunning()) {
-                    $this->close();
+            $loop->addPeriodicTimer($interval, function (TimerInterface $timer) use ($that) {
+                if (!$that->isRunning()) {
+                    $that->close();
                     $timer->cancel();
-                    $this->emit('exit', array($this->getExitCode(), $this->getTermSignal()));
+                    $that->emit('exit', array($that->getExitCode(), $that->getTermSignal()));
                 }
             });
-
         };
 
         $this->stdin  = new Stream($this->pipes[0], $loop);
@@ -126,6 +126,13 @@ public function start(LoopInterface $loop, $interval = 0.1)
         $this->stdout->on('close', $streamCloseHandler);
         $this->stderr = new Stream($this->pipes[2], $loop);
         $this->stderr->on('close', $streamCloseHandler);
+
+        // legacy PHP < 5.4 SEGFAULTs for unbuffered, non-blocking reads
+        // work around by enabling read buffer again
+        if (PHP_VERSION_ID < 50400) {
+            stream_set_read_buffer($this->pipes[1], 1);
+            stream_set_read_buffer($this->pipes[2], 1);
+        }
     }
 
     /**

tests/AbstractProcessTest.php

@@ -66,6 +66,46 @@ public function testGetTermSignalWhenRunning($process)
         $this->assertNull($process->getTermSignal());
     }
 
+    public function testReceivesProcessStdoutFromEcho()
+    {
+        $cmd = 'echo test';
+
+        $loop = $this->createLoop();
+        $process = new Process($cmd);
+        $process->start($loop);
+
+        $buffer = '';
+        $process->stdout->on('data', function ($data) use (&$buffer) {
+            $buffer .= $data;
+        });
+
+        $loop->run();
+
+        $this->assertEquals('test', rtrim($buffer));
+    }
+
+    public function testReceivesProcessStdoutFromDd()
+    {
+        if (!file_exists('/dev/zero')) {
+            $this->markTestSkipped('Unable to read from /dev/zero, Windows?');
+        }
+
+        $cmd = 'dd if=/dev/zero bs=12345 count=1234';
+
+        $loop = $this->createLoop();
+        $process = new Process($cmd);
+        $process->start($loop);
+
+        $bytes = 0;
+        $process->stdout->on('data', function ($data) use (&$bytes) {
+            $bytes += strlen($data);
+        });
+
+        $loop->run();
+
+        $this->assertEquals(12345 * 1234, $bytes);
+    }
+
     public function testProcessWithDefaultCwdAndEnv()
     {
         $cmd = $this->getPhpBinary() . ' -r ' . escapeshellarg('echo getcwd(), PHP_EOL, count($_SERVER), PHP_EOL;');
@@ -268,21 +308,22 @@ public function testTerminateWithStopAndContinueSignalsUsingEventLoop()
             $termSignal = func_get_arg(1);
         });
 
-        $loop->addTimer(0.001, function(Timer $timer) use ($process) {
+        $that = $this;
+        $loop->addTimer(0.001, function(Timer $timer) use ($process, $that) {
             $process->start($timer->getLoop());
             $process->terminate(SIGSTOP);
 
-            $this->assertSoon(function() use ($process) {
-                $this->assertTrue($process->isStopped());
-                $this->assertTrue($process->isRunning());
-                $this->assertEquals(SIGSTOP, $process->getStopSignal());
+            $that->assertSoon(function() use ($process, $that) {
+                $that->assertTrue($process->isStopped());
+                $that->assertTrue($process->isRunning());
+                $that->assertEquals(SIGSTOP, $process->getStopSignal());
             });
 
             $process->terminate(SIGCONT);
 
-            $this->assertSoon(function() use ($process) {
-                $this->assertFalse($process->isStopped());
-                $this->assertEquals(SIGSTOP, $process->getStopSignal());
+            $that->assertSoon(function() use ($process, $that) {
+                $that->assertFalse($process->isStopped());
+                $that->assertEquals(SIGSTOP, $process->getStopSignal());
             });
         });
 
@@ -308,12 +349,13 @@ public function testIssue18() {
         $stdOut = '';
         $stdErr = '';
 
+        $that = $this;
         $process->on(
             'exit',
-            function ($exitCode) use (&$stdOut, &$stdErr, $testString) {
-                $this->assertEquals(0, $exitCode, "Exit code is 0");
+            function ($exitCode) use (&$stdOut, &$stdErr, $testString, $that) {
+                $that->assertEquals(0, $exitCode, "Exit code is 0");
 
-                $this->assertEquals($testString, $stdOut);
+                $that->assertEquals($testString, $stdOut);
             }
         );