Ensure content and escaped tags are not quotted when set

lucasmichot · lucasmichot · commit f69cf39152ab · 2014-12-17T20:38:53.000+01:00
diff --git a/src/Illuminate/View/Compilers/BladeCompiler.php b/src/Illuminate/View/Compilers/BladeCompiler.php
@@ -177,7 +177,9 @@ protected function compileExtensions($value)
 	 */
 	protected function compileComments($value)
 	{
-		$pattern = sprintf('/%s--((.|\s)*?)--%s/', $this->contentTags[0], $this->contentTags[1]);
+		$contentTags = $this->quoteTags($this->contentTags);
+
+		$pattern = sprintf('/%s--((.|\s)*?)--%s/', $contentTags[0], $contentTags[1]);
 
 		return preg_replace($pattern, '<?php /*$1*/ ?>', $value);
 	}
@@ -190,7 +192,11 @@ protected function compileComments($value)
 	 */
 	protected function compileEchos($value)
 	{
-		$difference = strlen($this->contentTags[0]) - strlen($this->escapedTags[0]);
+		$contentTags = $this->quoteTags($this->contentTags);
+
+		$escapedTags = $this->quoteTags($this->escapedTags);
+
+		$difference = strlen($contentTags[0]) - strlen($escapedTags[0]);
 
 		if ($difference > 0)
 		{
@@ -229,7 +235,9 @@ protected function compileStatements($value)
 	 */
 	protected function compileRegularEchos($value)
 	{
-		$pattern = sprintf('/(@)?%s\s*(.+?)\s*%s(\r?\n)?/s', $this->contentTags[0], $this->contentTags[1]);
+		$contentTags = $this->quoteTags($this->contentTags);
+
+		$pattern = sprintf('/(@)?%s\s*(.+?)\s*%s(\r?\n)?/s', $contentTags[0], $contentTags[1]);
 
 		$callback = function($matches)
 		{
@@ -249,7 +257,9 @@ protected function compileRegularEchos($value)
 	 */
 	protected function compileEscapedEchos($value)
 	{
-		$pattern = sprintf('/%s\s*(.+?)\s*%s(\r?\n)?/s', $this->escapedTags[0], $this->escapedTags[1]);
+		$escapedTags = $this->quoteTags($this->escapedTags);
+
+		$pattern = sprintf('/%s\s*(.+?)\s*%s(\r?\n)?/s', $escapedTags[0], $escapedTags[1]);
 
 		$callback = function($matches)
 		{
@@ -676,7 +686,7 @@ public function setContentTags($openTag, $closeTag, $escaped = false)
 	{
 		$property = ($escaped === true) ? 'escapedTags' : 'contentTags';
 
-		$this->{$property} = array(preg_quote($openTag), preg_quote($closeTag));
+		$this->{$property} = array($openTag, $closeTag);
 	}
 
 	/**
@@ -711,4 +721,18 @@ public function getEscapedContentTags()
 		return $this->escapedTags;
 	}
 
+	/**
+	 * Quote tags.
+	 *
+	 * @param array  $tags
+	 * @return array
+	 */
+	protected function quoteTags($tags)
+	{
+		return [
+			preg_quote($tags[0]),
+			preg_quote($tags[1]),
+		];
+	}
+
 }
diff --git a/tests/View/ViewBladeCompilerTest.php b/tests/View/ViewBladeCompilerTest.php
@@ -456,6 +456,24 @@ public function testExpressionWithinHTML()
 	}
 
 
+	public function testSetAndRetriveContentTags()
+	{
+		$compiler = new BladeCompiler($this->getFiles(), __DIR__);
+		$this->assertEquals(['{{', '}}'], $compiler->getContentTags());
+		$compiler->setContentTags('{{', '}}');
+		$this->assertEquals(['{{', '}}'], $compiler->getContentTags());
+	}
+
+
+	public function testSetAndRetriveEscapedTags()
+	{
+		$compiler = new BladeCompiler($this->getFiles(), __DIR__);
+		$this->assertEquals(['{{{', '}}}'], $compiler->getEscapedContentTags());
+		$compiler->setContentTags('{{{', '}}}');
+		$this->assertEquals(['{{{', '}}}'], $compiler->getEscapedContentTags());
+	}
+
+
 	protected function getFiles()
 	{
 		return m::mock('Illuminate\Filesystem\Filesystem');

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,9 @@ protected function compileExtensions($value)`
`177`	`177`	`*/`
`178`	`178`	`protected function compileComments($value)`
`179`	`179`	`{`
`180`		`- $pattern = sprintf('/%s--((.\|\s)*?)--%s/', $this->contentTags[0], $this->contentTags[1]);`
	`180`	`+ $contentTags = $this->quoteTags($this->contentTags);`
	`181`	`+`
	`182`	`+ $pattern = sprintf('/%s--((.\|\s)*?)--%s/', $contentTags[0], $contentTags[1]);`
`181`	`183`
`182`	`184`	`return preg_replace($pattern, '<?php /$1/ ?>', $value);`
`183`	`185`	`}`
`@@ -190,7 +192,11 @@ protected function compileComments($value)`
`190`	`192`	`*/`
`191`	`193`	`protected function compileEchos($value)`
`192`	`194`	`{`
`193`		`- $difference = strlen($this->contentTags[0]) - strlen($this->escapedTags[0]);`
	`195`	`+ $contentTags = $this->quoteTags($this->contentTags);`
	`196`	`+`
	`197`	`+ $escapedTags = $this->quoteTags($this->escapedTags);`
	`198`	`+`
	`199`	`+ $difference = strlen($contentTags[0]) - strlen($escapedTags[0]);`
`194`	`200`
`195`	`201`	`if ($difference > 0)`
`196`	`202`	`{`
`@@ -229,7 +235,9 @@ protected function compileStatements($value)`
`229`	`235`	`*/`
`230`	`236`	`protected function compileRegularEchos($value)`
`231`	`237`	`{`
`232`		`- $pattern = sprintf('/(@)?%s\s(.+?)\s%s(\r?\n)?/s', $this->contentTags[0], $this->contentTags[1]);`
	`238`	`+ $contentTags = $this->quoteTags($this->contentTags);`
	`239`	`+`
	`240`	`+ $pattern = sprintf('/(@)?%s\s(.+?)\s%s(\r?\n)?/s', $contentTags[0], $contentTags[1]);`
`233`	`241`
`234`	`242`	`$callback = function($matches)`
`235`	`243`	`{`
`@@ -249,7 +257,9 @@ protected function compileRegularEchos($value)`
`249`	`257`	`*/`
`250`	`258`	`protected function compileEscapedEchos($value)`
`251`	`259`	`{`
`252`		`- $pattern = sprintf('/%s\s(.+?)\s%s(\r?\n)?/s', $this->escapedTags[0], $this->escapedTags[1]);`
	`260`	`+ $escapedTags = $this->quoteTags($this->escapedTags);`
	`261`	`+`
	`262`	`+ $pattern = sprintf('/%s\s(.+?)\s%s(\r?\n)?/s', $escapedTags[0], $escapedTags[1]);`
`253`	`263`
`254`	`264`	`$callback = function($matches)`
`255`	`265`	`{`
`@@ -676,7 +686,7 @@ public function setContentTags($openTag, $closeTag, $escaped = false)`
`676`	`686`	`{`
`677`	`687`	`$property = ($escaped === true) ? 'escapedTags' : 'contentTags';`
`678`	`688`
`679`		`- $this->{$property} = array(preg_quote($openTag), preg_quote($closeTag));`
	`689`	`+ $this->{$property} = array($openTag, $closeTag);`
`680`	`690`	`}`
`681`	`691`
`682`	`692`	`/**`
`@@ -711,4 +721,18 @@ public function getEscapedContentTags()`
`711`	`721`	`return $this->escapedTags;`
`712`	`722`	`}`
`713`	`723`
	`724`	`+ /**`
	`725`	`+ * Quote tags.`
	`726`	`+ *`
	`727`	`+ * @param array $tags`
	`728`	`+ * @return array`
	`729`	`+ */`
	`730`	`+ protected function quoteTags($tags)`
	`731`	`+ {`
	`732`	`+ return [`
	`733`	`+ preg_quote($tags[0]),`
	`734`	`+ preg_quote($tags[1]),`
	`735`	`+ ];`
	`736`	`+ }`
	`737`	`+`
`714`	`738`	`}`