Fix problem with incomplete end sequences

Thomas Off · Thomas Off · commit f7aa50d5296c · 2013-08-19T09:58:44.000+02:00
Some terminals seem to not issue the complete end sequence '[0m' for returning to default color, but using a shorthand '[m', which can be fixed with a little tweak of the regular expression.
diff --git a/SensioLabs/AnsiConverter/AnsiToHtmlConverter.php b/SensioLabs/AnsiConverter/AnsiToHtmlConverter.php
@@ -87,7 +87,7 @@ protected function convertAnsiToColor($ansi)
     {
         $bg = 0;
         $fg = 7;
-        if ('0' != $ansi) {
+        if ('0' != $ansi && '' != $ansi) {
             $options = explode(';', $ansi);
 
             foreach ($options as $option) {
@@ -127,7 +127,7 @@ protected function convertAnsiToColor($ansi)
     protected function tokenize($text)
     {
         $tokens = array();
-        preg_match_all("/(?:\e\[(.+?)m|(\x08))/", $text, $matches, PREG_OFFSET_CAPTURE);
+        preg_match_all("/(?:\e\[(.*?)m|(\x08))/", $text, $matches, PREG_OFFSET_CAPTURE);
 
         $offset = 0;
         foreach ($matches[0] as $i => $match) {
