Merge pull request laravel#3733 from anlutro-pull-requests/fix/elq-nested-where-return

taylorotwell · taylorotwell · commit ba86dd47cf6b · 2014-02-28T08:02:56.000-06:00
Don't return underlying query builder
diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php
@@ -599,7 +599,7 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
 		}
 		else
 		{
-			return call_user_func_array(
+			call_user_func_array(
 				array($this->query, 'where'), array_slice(func_get_args(), 0, func_num_args())
 			);
 		}
diff --git a/tests/Database/DatabaseEloquentBuilderTest.php b/tests/Database/DatabaseEloquentBuilderTest.php
@@ -383,6 +383,15 @@ public function testRealNestedWhereWithScopes()
 	}
 
 
+	public function testSimpleWhere()
+	{
+		$builder = $this->getBuilder();
+		$builder->getQuery()->shouldReceive('where')->once()->with('foo', '=', 'bar');
+		$result = $builder->where('foo', '=', 'bar');
+		$this->assertEquals($result, $builder);
+	}
+
+
 	protected function mockConnectionForModel($model, $database)
 	{
 		$grammarClass = 'Illuminate\Database\Query\Grammars\\'.$database.'Grammar';

Original file line number	Diff line number	Diff line change
`@@ -599,7 +599,7 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'`
`599`	`599`	`}`
`600`	`600`	`else`
`601`	`601`	`{`
`602`		`- return call_user_func_array(`
	`602`	`+ call_user_func_array(`
`603`	`603`	`array($this->query, 'where'), array_slice(func_get_args(), 0, func_num_args())`
`604`	`604`	`);`
`605`	`605`	`}`
Original file line number	Diff line number	Diff line change
`@@ -383,6 +383,15 @@ public function testRealNestedWhereWithScopes()`
`383`	`383`	`}`
`384`	`384`
`385`	`385`
	`386`	`+ public function testSimpleWhere()`
	`387`	`+ {`
	`388`	`+ $builder = $this->getBuilder();`
	`389`	`+ $builder->getQuery()->shouldReceive('where')->once()->with('foo', '=', 'bar');`
	`390`	`+ $result = $builder->where('foo', '=', 'bar');`
	`391`	`+ $this->assertEquals($result, $builder);`
	`392`	`+ }`
	`393`	`+`
	`394`	`+`
`386`	`395`	`protected function mockConnectionForModel($model, $database)`
`387`	`396`	`{`
`388`	`397`	`$grammarClass = 'Illuminate\Database\Query\Grammars\\'.$database.'Grammar';`