Merge 4.0.

taylorotwell · taylorotwell · commit 723c7a4e434b · 2013-10-15T21:03:18.000-05:00
diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
@@ -814,6 +814,8 @@ public function orHavingRaw($sql, array $bindings = array())
 	 */
 	public function orderBy($column, $direction = 'asc')
 	{
+		$direction = strtolower($direction) == 'asc' ? 'asc' : 'desc';
+
 		$this->orders[] = compact('column', 'direction');
 
 		return $this;
@@ -986,7 +988,7 @@ public function find($id, $columns = array('*'))
 	}
 
 	/**
-	 * Pluck a single column from the database.
+	 * Pluck a single column's value from the first result of a query.
 	 *
 	 * @param  string  $column
 	 * @return mixed
diff --git a/src/Illuminate/Database/Schema/Builder.php b/src/Illuminate/Database/Schema/Builder.php
@@ -56,7 +56,9 @@ public function hasTable($table)
 	 */
 	public function hasColumn($table, $column)
 	{
-		return in_array($column, $this->getColumnListing($table));
+		$column = strtolower($column);
+
+		return in_array($column, array_map('strtolower', $this->getColumnListing($table)));
 	}
 
 	/**
diff --git a/src/Illuminate/Foundation/changes.json b/src/Illuminate/Foundation/changes.json
@@ -74,6 +74,7 @@
 		{"message": "Added 'shared' method to View to pull a single shared item out.", "backport": null},
 		{"message": "Added assertHasOldInput test assertion.", "backport": null},
 		{"message": "Added slick new 'sometimes' method to Validator for conditionally adding rules.", "backport": null},
-		{"message": "Added new '--sleep' option to queue:listen command to control time between jobs.", "backport": null}
+		{"message": "Added new '--sleep' option to queue:listen command to control time between jobs.", "backport": null},
+		{"message": "Allow Blade processing on echos to be escaped using the @ sign.", "backport": null}
 	]
 }
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -1613,7 +1613,7 @@ public function addImplicitExtensions(array $extensions)
 	 */
 	public function addExtension($rule, $extension)
 	{
-		$this->extensions[$rule] = $extension;
+		$this->extensions[snake_case($rule)] = $extension;
 	}
 
 	/**
diff --git a/src/Illuminate/View/Compilers/BladeCompiler.php b/src/Illuminate/View/Compilers/BladeCompiler.php
@@ -190,9 +190,14 @@ protected function compileEchos($value)
 	 */
 	protected function compileRegularEchos($value)
 	{
-		$pattern = sprintf('/%s\s*(.+?)\s*%s/s', $this->contentTags[0], $this->contentTags[1]);
+		$pattern = sprintf('/(@)?%s\s*(.+?)\s*%s/s', $this->contentTags[0], $this->contentTags[1]);
 
-		return preg_replace($pattern, '<?php echo $1; ?>', $value);
+		$callback = function($matches)
+		{
+			return $matches[1] ? substr($matches[0], 1) : '<?php echo '.$matches[2].'; ?>';
+		};
+
+		return preg_replace_callback($pattern, $callback, $value);
 	}
 
 	/**
diff --git a/src/Illuminate/View/Engines/PhpEngine.php b/src/Illuminate/View/Engines/PhpEngine.php
@@ -42,7 +42,7 @@ protected function evaluatePath($__path, $__data)
 			$this->handleViewException($e);
 		}
 
-		return ob_get_clean();
+		return ltrim(ob_get_clean());
 	}
 
 	/**
diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -799,6 +799,14 @@ public function testCustomValidators()
 		$this->assertFalse($v->passes());
 		$v->messages()->setFormat(':message');
 		$this->assertEquals('foo!', $v->messages()->first('name'));
+
+		$trans = $this->getRealTranslator();
+		$trans->addResource('array', array('validation.foo_bar' => 'foo!'), 'en', 'messages');
+		$v = new Validator($trans, array('name' => 'taylor'), array('name' => 'foo_bar'));
+		$v->addExtension('FooBar', function() { return false; });
+		$this->assertFalse($v->passes());
+		$v->messages()->setFormat(':message');
+		$this->assertEquals('foo!', $v->messages()->first('name'));
 	}
 
 
diff --git a/tests/View/ViewBladeCompilerTest.php b/tests/View/ViewBladeCompilerTest.php
@@ -74,6 +74,20 @@ public function testEchosAreCompiled()
 	}
 
 
+	public function testEscapedWithAtEchosAreCompiled()
+	{
+		$compiler = new BladeCompiler($this->getFiles(), __DIR__);
+		$this->assertEquals('{{$name}}', $compiler->compileString('@{{$name}}'));
+		$this->assertEquals('{{ $name }}', $compiler->compileString('@{{ $name }}'));
+		$this->assertEquals('{{
+			$name
+		}}', 
+		$compiler->compileString('@{{
+			$name
+		}}'));
+	}
+
+
 	public function testReversedEchosAreCompiled()
 	{
 		$compiler = new BladeCompiler($this->getFiles(), __DIR__);
diff --git a/tests/View/fixtures/basic.php b/tests/View/fixtures/basic.php
@@ -1 +1,2 @@
+
 Hello World

Original file line number	Diff line number	Diff line change
`@@ -814,6 +814,8 @@ public function orHavingRaw($sql, array $bindings = array())`
`814`	`814`	`*/`
`815`	`815`	`public function orderBy($column, $direction = 'asc')`
`816`	`816`	`{`
	`817`	`+ $direction = strtolower($direction) == 'asc' ? 'asc' : 'desc';`
	`818`	`+`
`817`	`819`	`$this->orders[] = compact('column', 'direction');`
`818`	`820`
`819`	`821`	`return $this;`
`@@ -986,7 +988,7 @@ public function find($id, $columns = array('*'))`
`986`	`988`	`}`
`987`	`989`
`988`	`990`	`/**`
`989`		`- * Pluck a single column from the database.`
	`991`	`+ * Pluck a single column's value from the first result of a query.`
`990`	`992`	`*`
`991`	`993`	`* @param string $column`
`992`	`994`	`* @return mixed`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,9 @@ public function hasTable($table)`
`56`	`56`	`*/`
`57`	`57`	`public function hasColumn($table, $column)`
`58`	`58`	`{`
`59`		`- return in_array($column, $this->getColumnListing($table));`
	`59`	`+ $column = strtolower($column);`
	`60`	`+`
	`61`	`+ return in_array($column, array_map('strtolower', $this->getColumnListing($table)));`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@`
`74`	`74`	`{"message": "Added 'shared' method to View to pull a single shared item out.", "backport": null},`
`75`	`75`	`{"message": "Added assertHasOldInput test assertion.", "backport": null},`
`76`	`76`	`{"message": "Added slick new 'sometimes' method to Validator for conditionally adding rules.", "backport": null},`
`77`		`- {"message": "Added new '--sleep' option to queue:listen command to control time between jobs.", "backport": null}`
	`77`	`+ {"message": "Added new '--sleep' option to queue:listen command to control time between jobs.", "backport": null},`
	`78`	`+ {"message": "Allow Blade processing on echos to be escaped using the @ sign.", "backport": null}`
`78`	`79`	`]`
`79`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1613,7 +1613,7 @@ public function addImplicitExtensions(array $extensions)`
`1613`	`1613`	`*/`
`1614`	`1614`	`public function addExtension($rule, $extension)`
`1615`	`1615`	`{`
`1616`		`- $this->extensions[$rule] = $extension;`
	`1616`	`+ $this->extensions[snake_case($rule)] = $extension;`
`1617`	`1617`	`}`
`1618`	`1618`
`1619`	`1619`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ protected function evaluatePath($__path, $__data)`
`42`	`42`	`$this->handleViewException($e);`
`43`	`43`	`}`
`44`	`44`
`45`		`- return ob_get_clean();`
	`45`	`+ return ltrim(ob_get_clean());`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/**`