consistent verbosity

[pharext/pharext] / src / pharext / ExecCmd.php

diff --git a/src/pharext/ExecCmd.php b/src/pharext/ExecCmd.php
index 7e657f3d6f4bab3351988eb754d49c6639d7a032..5a6ee81f6fdad1be6b6eb4756d3c5cf966de58ae 100644 (file)
--- a/src/pharext/ExecCmd.php
+++ b/src/pharext/ExecCmd.php
@@ -94,7 +94,7 @@ class ExecCmd
                                print $this->progress($data, 0);
                        } else {
                                if ($verbose) {
-                                       printf("%s\n", $data);
+                                       printf("%s", $data);
                                }
                                $this->output .= $data;
                        }
@@ -112,14 +112,18 @@ class ExecCmd
         * @return string
         */
        private function progress($string, $flags) {
-               static $c = 0;
-               static $s = ["\\","|","/","-"];
+               static $counter = 0;
+               static $symbols = ["\\","|","/","-"];
 
                $this->output .= $string;
+               
+               if (false !== strpos($string, "\n")) {
+                       ++$counter;
+               }
 
                return $flags & PHP_OUTPUT_HANDLER_FINAL
                        ? "   \r"
-                       : sprintf("  %s\r", $s[$c++ % count($s)]);
+                       : sprintf("  %s\r", $symbols[$counter % 4]);
        }
 
        /**