Merge branch 'master' of github.com:wujunze/php-cli-color

wujunze · Jul 18, 2018 · 14f8f89 · 14f8f89
2 parents 9cd740e + fb0e656
commit 14f8f89
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/Colors.php b/src/Colors.php
@@ -68,7 +68,7 @@ public function __construct()
     }
 
     // Returns colored string
-    public function getColoredString($string, $foreground_color = null, $background_color = null)
+    public function getColoredString($string, $foreground_color = null, $background_color = null, $new_line = true)
     {
         $colored_string = "";
 
@@ -84,7 +84,7 @@ public function getColoredString($string, $foreground_color = null, $background_
         // Add string and end coloring
         $colored_string .= $string . "\033[0m";
 
-        return $colored_string . PHP_EOL;
+        return $new_line ?  $colored_string . PHP_EOL : $colored_string;
     }
 
     // Returns all foreground color names

diff --git a/tests/ColorTest/CliColorTest.php b/tests/ColorTest/CliColorTest.php
@@ -21,6 +21,17 @@ public function testColoredString()
         $this->assertEquals('[0;35m[43mTesting Colors class, this is purple string on yellow background.[0m' . PHP_EOL, $res);
     }
 
+    public function testColorString()
+    {
+        $color = $this->createServer();
+        $res = $color->getColoredString("Testing Colors class, this is purple string on yellow background.",
+            "purple",
+            "yellow",
+            false);
+        $this->assertEquals('[0;35m[43mTesting Colors class, this is purple string on yellow background.[0m' , $res);
+
+    }
+
     public function testGetBackgroundColors()
     {
         $color = $this->createServer();