fixing tests.

taylorotwell · taylorotwell · commit 3004f39a1d2f · 2014-04-11T09:11:00.000-05:00
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -405,7 +405,7 @@ public function newFromBuilder($attributes = array())
 	 * @param  string  $connection
 	 * @return \Illuminate\Database\Eloquent\Collection
 	 */
-	public static function hydrate(array $items, $connection = null)
+	public static function hydrate(array $items = array(), $connection = null)
 	{
 		$collection = with($instance = new static)->newCollection();
 
diff --git a/tests/Database/DatabaseEloquentModelTest.php b/tests/Database/DatabaseEloquentModelTest.php
@@ -69,7 +69,6 @@ public function testHydrateCreatesCollectionOfModels()
 	public function testHydrateRawMakesRawQuery()
 	{
 		$collection = EloquentModelHydrateRawStub::hydrateRaw('SELECT ?', array('foo'));
-
 		$this->assertEquals('hydrated', $collection);
 	}
 
@@ -894,11 +893,11 @@ public function newQuery($excludeDeleted = true)
 }
 
 class EloquentModelHydrateRawStub extends Illuminate\Database\Eloquent\Model {
-	public static function hydrate () { return 'hydrated'; }
+	public static function hydrate(array $items = array(), $connection = null) { return 'hydrated'; }
 	public function getConnection()
 	{
 		$mock = m::mock('Illuminate\Database\Connection');
-		$mock->shouldReceive('select')->once()->with('SELECT ?', array('foo'));
+		$mock->shouldReceive('select')->once()->with('SELECT ?', array('foo'))->andReturn(array());
 		return $mock;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ public function newFromBuilder($attributes = array())`
`405`	`405`	`* @param string $connection`
`406`	`406`	`* @return \Illuminate\Database\Eloquent\Collection`
`407`	`407`	`*/`
`408`		`- public static function hydrate(array $items, $connection = null)`
	`408`	`+ public static function hydrate(array $items = array(), $connection = null)`
`409`	`409`	`{`
`410`	`410`	`$collection = with($instance = new static)->newCollection();`
`411`	`411`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ public function testHydrateCreatesCollectionOfModels()`
`69`	`69`	`public function testHydrateRawMakesRawQuery()`
`70`	`70`	`{`
`71`	`71`	`$collection = EloquentModelHydrateRawStub::hydrateRaw('SELECT ?', array('foo'));`
`72`		`-`
`73`	`72`	`$this->assertEquals('hydrated', $collection);`
`74`	`73`	`}`
`75`	`74`
`@@ -894,11 +893,11 @@ public function newQuery($excludeDeleted = true)`
`894`	`893`	`}`
`895`	`894`
`896`	`895`	`class EloquentModelHydrateRawStub extends Illuminate\Database\Eloquent\Model {`
`897`		`- public static function hydrate () { return 'hydrated'; }`
	`896`	`+ public static function hydrate(array $items = array(), $connection = null) { return 'hydrated'; }`
`898`	`897`	`public function getConnection()`
`899`	`898`	`{`
`900`	`899`	`$mock = m::mock('Illuminate\Database\Connection');`
`901`		`- $mock->shouldReceive('select')->once()->with('SELECT ?', array('foo'));`
	`900`	`+ $mock->shouldReceive('select')->once()->with('SELECT ?', array('foo'))->andReturn(array());`
`902`	`901`	`return $mock;`
`903`	`902`	`}`
`904`	`903`	`}`