Refactoring, and change to return trimmed output and error by default

Author: DivineOmega

src/SSHCommand.php

@@ -36,13 +36,18 @@ private function execute()
             throw new RuntimeException('Failed to execute command (no stdout stream): '.$this->command);
         }
 
+        $this->readStreams($stdout, $stderr);
+    }
+
+    private function readStreams($stdout, $stderr)
+    {
         $startTime = time();
 
         do {
-            $this->error = fread($stderr, self::STREAM_BYTES_PER_READ);
             $this->output = fread($stdout, self::STREAM_BYTES_PER_READ);
+            $this->error = fread($stderr, self::STREAM_BYTES_PER_READ);
 
-            $streamsComplete = (feof($stderr) && feof($stdout));
+            $streamsComplete = (feof($stdout) && feof($stderr));
 
             if (!$streamsComplete) {
                 // Prevent thrashing.
@@ -54,13 +59,23 @@ private function execute()
         } while ($executionDuration <= self::EXECUTION_TIMEOUT_SECONDS && !$streamsComplete);
     }
 
-    public function getOutput(): string
+    public function getRawOutput(): string
     {
         return $this->output;
     }
 
-    public function getError(): string
+    public function getRawError(): string
     {
         return $this->error;
     }
+
+    public function getOutput(): string
+    {
+        return trim($this->getRawOutput());
+    }
+
+    public function getError(): string
+    {
+        return trim($this->getRawError());
+    }
 }