Making ConsoleOutput work correctly when multiple identical tags are …

…used.
cakephp · Oct 15, 2010 · b846716 · b846716
1 parent 0428320
commit b846716
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cake/console/console_output.php b/cake/console/console_output.php
@@ -163,7 +163,7 @@ public function styleText($text) {
 			return strip_tags($text);
 		}
 		return preg_replace_callback(
-			'/<(?<tag>[a-z0-9-_]+)>(?<text>.*)<\/(\1)>/i', array($this, '_replaceTags'), $text
+			'/<(?<tag>[a-z0-9-_]+)>(?<text>.*?)<\/(\1)>/i', array($this, '_replaceTags'), $text
 		);
 	}
 

diff --git a/cake/tests/cases/console/console_output.test.php b/cake/tests/cases/console/console_output.test.php
@@ -194,7 +194,10 @@ function testFormattingMultipleStylesName() {
  * @return void
  */
 	function testFormattingMultipleSameTags() {
-		$this->markTestIncomplete('This test needs to be written.');
+		$this->output->expects($this->once())->method('_write')
+			->with("\033[31;4mBad\033[0m \033[31;4mWarning\033[0m Regular");
+
+		$this->output->write('<error>Bad</error> <error>Warning</error> Regular', false);
 	}
 
 /**