Merge pull request #3 from kamermans/bugfix/null_exit_code

Don't exit loop until an exit code is returned
kamermans · Sep 29, 2017 · e053a20 · e053a20
2 parents 190b97c + 9920624
commit e053a20
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/ProcessManager.php b/src/ProcessManager.php
@@ -8,7 +8,7 @@
  * @package kamermans\Command
  */
 class ProcessManager {
-    
+
     protected $cmd;
     protected $buffers;
     protected $handle;
@@ -74,7 +74,7 @@ public function exec($callback, $callbacklines, $buffer_size, $cwd, $env, $conf)
                 }
 
                 $finished_handles = count(array_filter($this->io_reads, 'feof'));
-                if ($finished_handles === count($this->io_reads)) {
+                if ($exit_code !== null && $finished_handles === count($this->io_reads)) {
                     break;
                 }
 
@@ -243,8 +243,8 @@ protected function setupStreams($callback, $callbacklines, $buffer_size)
         } else if ($this->isStdInStreaming()) {
             // STDIN is streaming to the process
             $stdin_stream = new Stream\StreamWriter(
-                $this->buffers[Command::STDIN], 
-                $this->io_handles[Command::STDIN], 
+                $this->buffers[Command::STDIN],
+                $this->io_handles[Command::STDIN],
                 $buffer_size
             );
         } else {

diff --git a/src/Stream/StreamWriter.php b/src/Stream/StreamWriter.php
@@ -55,7 +55,7 @@ public function write($auto_close=true)
             $this->buffer .= stream_get_contents($this->stream, $this->buffer_size);
         }
 
-        $bytes_written = fwrite($this->dest_stream, $this->buffer);
+        $bytes_written = @fwrite($this->dest_stream, $this->buffer);
 
         if ($bytes_written === false) {
             return 0;