Merge branch '4.1'

taylorotwell · taylorotwell · commit 902974def400 · 2014-02-27T22:51:36.000-06:00
diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php
@@ -599,7 +599,9 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
 		}
 		else
 		{
-			$this->query->where($column, $operator, $value, $boolean);
+			return call_user_func_array(
+				array($this->query, 'where'), array_slice(func_get_args(), 0, func_num_args())
+			);
 		}
 
 		return $this;
diff --git a/src/Illuminate/Http/Request.php b/src/Illuminate/Http/Request.php
@@ -29,6 +29,16 @@ public function instance()
 		return $this;
 	}
 
+	/**
+	 * Get the request method.
+	 *
+	 * @return string
+	 */
+	public function method()
+	{
+		return $this->getMethod();
+	}
+
 	/**
 	 * Get the root URL for the application.
 	 *
diff --git a/tests/Database/DatabaseEloquentBuilderTest.php b/tests/Database/DatabaseEloquentBuilderTest.php
@@ -347,7 +347,7 @@ public function testQueryScopes()
 	{
 		$builder = $this->getBuilder();
 		$builder->getQuery()->shouldReceive('from');
-		$builder->getQuery()->shouldReceive('where')->once()->with('foo', 'bar', null, 'and');
+		$builder->getQuery()->shouldReceive('where')->once()->with('foo', 'bar');
 		$builder->setModel($model = new EloquentBuilderTestScopeStub);
 		$result = $builder->approved();
 

Original file line number	Diff line number	Diff line change
`@@ -599,7 +599,9 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'`
`599`	`599`	`}`
`600`	`600`	`else`
`601`	`601`	`{`
`602`		`- $this->query->where($column, $operator, $value, $boolean);`
	`602`	`+ return call_user_func_array(`
	`603`	`+ array($this->query, 'where'), array_slice(func_get_args(), 0, func_num_args())`
	`604`	`+ );`
`603`	`605`	`}`
`604`	`606`
`605`	`607`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ public function testQueryScopes()`
`347`	`347`	`{`
`348`	`348`	`$builder = $this->getBuilder();`
`349`	`349`	`$builder->getQuery()->shouldReceive('from');`
`350`		`- $builder->getQuery()->shouldReceive('where')->once()->with('foo', 'bar', null, 'and');`
	`350`	`+ $builder->getQuery()->shouldReceive('where')->once()->with('foo', 'bar');`
`351`	`351`	`$builder->setModel($model = new EloquentBuilderTestScopeStub);`
`352`	`352`	`$result = $builder->approved();`
`353`	`353`