Merge pull request laravel#1818 from robclancy/4.0

taylorotwell · taylorotwell · commit 19f8d3c4c1ef · 2013-07-08T19:34:41.000-07:00
Fix for compiler tags breaking in certain situations
diff --git a/src/Illuminate/View/Compilers/BladeCompiler.php b/src/Illuminate/View/Compilers/BladeCompiler.php
@@ -172,6 +172,13 @@ protected function compileComments($value)
 	 */
 	protected function compileEchos($value)
 	{
+		$difference = strlen($this->contentTags[0]) - strlen($this->escapedTags[0]);
+		
+		if ($difference > 0)
+		{
+			return $this->compileEscapedEchos($this->compileRegularEchos($value));
+		}
+
 		return $this->compileRegularEchos($this->compileEscapedEchos($value));
 	}
 
diff --git a/tests/View/ViewBladeCompilerTest.php b/tests/View/ViewBladeCompilerTest.php
@@ -74,6 +74,19 @@ public function testEchosAreCompiled()
 	}
 
 
+	public function testReversedEchosAreCompiled()
+	{
+		$compiler = new BladeCompiler($this->getFiles(), __DIR__);
+		$compiler->setEscapedContentTags('{{', '}}');
+		$compiler->setContentTags('{{{', '}}}');
+		$this->assertEquals('<?php echo e($name); ?>', $compiler->compileString('{{$name}}'));
+		$this->assertEquals('<?php echo $name; ?>', $compiler->compileString('{{{$name}}}'));
+		$this->assertEquals('<?php echo $name; ?>', $compiler->compileString('{{{ $name }}}'));
+		$this->assertEquals('<?php echo $name; ?>', $compiler->compileString('{{{ 
+			$name
+		}}}'));
+	}
+
 	public function testExtendsAreCompiled()
 	{
 		$compiler = new BladeCompiler($this->getFiles(), __DIR__);

Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,13 @@ protected function compileComments($value)`
`172`	`172`	`*/`
`173`	`173`	`protected function compileEchos($value)`
`174`	`174`	`{`
	`175`	`+ $difference = strlen($this->contentTags[0]) - strlen($this->escapedTags[0]);`
	`176`	`+`
	`177`	`+ if ($difference > 0)`
	`178`	`+ {`
	`179`	`+ return $this->compileEscapedEchos($this->compileRegularEchos($value));`
	`180`	`+ }`
	`181`	`+`
`175`	`182`	`return $this->compileRegularEchos($this->compileEscapedEchos($value));`
`176`	`183`	`}`
`177`	`184`