Merge branch '5.0' of github.com:laravel/framework into 5.0

taylorotwell · taylorotwell · commit 69ff8730678e · 2015-04-04T09:12:07.000-05:00
diff --git a/src/Illuminate/Support/Collection.php b/src/Illuminate/Support/Collection.php
@@ -408,7 +408,7 @@ public function merge($items)
 	 */
 	public function forPage($page, $perPage)
 	{
-		return new static(array_slice($this->items, ($page - 1) * $perPage, $perPage));
+		return $this->slice(($page - 1) * $perPage, $perPage);
 	}
 
 	/**
diff --git a/tests/Database/DatabaseEloquentModelTest.php b/tests/Database/DatabaseEloquentModelTest.php
@@ -759,7 +759,7 @@ public function testGlobalGuarded()
 	}
 
 
-	public function testUnguaredRunsCallbackWhileBeingUnguarded()
+	public function testUnguardedRunsCallbackWhileBeingUnguarded()
 	{
 		$model = Model::unguarded(function() {
 			return (new EloquentModelStub)->guard(['*'])->fill(['name' => 'Taylor']);
@@ -769,7 +769,7 @@ public function testUnguaredRunsCallbackWhileBeingUnguarded()
 	}
 
 
-	public function testUnguaredCallDoesNotChangeUnguardedState()
+	public function testUnguardedCallDoesNotChangeUnguardedState()
 	{
 		Model::unguard();
 		$model = Model::unguarded(function() {

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ public function merge($items)`
`408`	`408`	`*/`
`409`	`409`	`public function forPage($page, $perPage)`
`410`	`410`	`{`
`411`		`- return new static(array_slice($this->items, ($page - 1) * $perPage, $perPage));`
	`411`	`+ return $this->slice(($page - 1) * $perPage, $perPage);`
`412`	`412`	`}`
`413`	`413`
`414`	`414`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -759,7 +759,7 @@ public function testGlobalGuarded()`
`759`	`759`	`}`
`760`	`760`
`761`	`761`
`762`		`- public function testUnguaredRunsCallbackWhileBeingUnguarded()`
	`762`	`+ public function testUnguardedRunsCallbackWhileBeingUnguarded()`
`763`	`763`	`{`
`764`	`764`	`$model = Model::unguarded(function() {`
`765`	`765`	`return (new EloquentModelStub)->guard(['*'])->fill(['name' => 'Taylor']);`
`@@ -769,7 +769,7 @@ public function testUnguaredRunsCallbackWhileBeingUnguarded()`
`769`	`769`	`}`
`770`	`770`
`771`	`771`
`772`		`- public function testUnguaredCallDoesNotChangeUnguardedState()`
	`772`	`+ public function testUnguardedCallDoesNotChangeUnguardedState()`
`773`	`773`	`{`
`774`	`774`	`Model::unguard();`
`775`	`775`	`$model = Model::unguarded(function() {`