move methods... remove tests that already have integration tests

Author: taylorotwell

src/Illuminate/Database/Eloquent/Builder.php

@@ -230,6 +230,37 @@ public function orWhere($column, $operator = null, $value = null)
         return $this->where($column, $operator, $value, 'or');
     }
 
+    /**
+     * Create a collection of models from plain arrays.
+     *
+     * @param  array  $items
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function hydrate(array $items)
+    {
+        $instance = $this->model->newInstance();
+
+        return $instance->newCollection(array_map(function ($item) use ($instance) {
+            return $instance->newFromBuilder($item);
+        }, $items));
+    }
+
+    /**
+     * Create a collection of models from a raw query.
+     *
+     * @param  string  $query
+     * @param  array  $bindings
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function fromQuery($query, $bindings = [])
+    {
+        $instance = $this->model->newInstance();
+
+        return $this->hydrate(
+            $instance->getConnection()->select($query, $bindings)
+        );
+    }
+
     /**
      * Find a model by its primary key.
      *

src/Illuminate/Database/Eloquent/Model.php

@@ -324,37 +324,6 @@ public static function onWriteConnection()
         return $instance->newQuery()->useWritePdo();
     }
 
-    /**
-     * Create a collection of models from plain arrays.
-     *
-     * @param  array  $items
-     * @param  string|null  $connection
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public static function hydrate(array $items, $connection = null)
-    {
-        $instance = (new static)->setConnection($connection);
-
-        return $instance->newCollection(array_map(function ($item) use ($instance) {
-            return $instance->newFromBuilder($item);
-        }, $items));
-    }
-
-    /**
-     * Create a collection of models from a raw query.
-     *
-     * @param  string  $query
-     * @param  array  $bindings
-     * @param  string|null  $connection
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public static function fromQuery($query, $bindings = [], $connection = null)
-    {
-        $instance = (new static)->setConnection($connection);
-
-        return static::hydrate($instance->getConnection()->select($query, $bindings), $connection);
-    }
-
     /**
      * Get all of the models from the database.
      *

tests/Database/DatabaseEloquentIntegrationTest.php

@@ -461,7 +461,7 @@ public function testBasicModelHydration()
         $user->setConnection('second_connection');
         $user->save();
 
-        $models = EloquentTestUser::fromQuery('SELECT * FROM users WHERE email = ?', ['[email protected]'], 'second_connection');
+        $models = EloquentTestUser::on('second_connection')->fromQuery('SELECT * FROM users WHERE email = ?', ['[email protected]']);
 
         $this->assertInstanceOf('Illuminate\Database\Eloquent\Collection', $models);
         $this->assertInstanceOf('Illuminate\Tests\Database\EloquentTestUser', $models[0]);

tests/Database/DatabaseEloquentModelTest.php

@@ -95,29 +95,6 @@ public function testNewInstanceReturnsNewInstanceWithAttributesSet()
         $this->assertEquals('taylor', $instance->name);
     }
 
-    public function testHydrateCreatesCollectionOfModels()
-    {
-        $data = [['name' => 'Taylor'], ['name' => 'Otwell']];
-        $collection = EloquentModelStub::hydrate($data, 'foo_connection');
-
-        $this->assertInstanceOf('Illuminate\Database\Eloquent\Collection', $collection);
-        $this->assertCount(2, $collection);
-        $this->assertInstanceOf('Illuminate\Tests\Database\EloquentModelStub', $collection[0]);
-        $this->assertInstanceOf('Illuminate\Tests\Database\EloquentModelStub', $collection[1]);
-        $this->assertEquals($collection[0]->getAttributes(), $collection[0]->getOriginal());
-        $this->assertEquals($collection[1]->getAttributes(), $collection[1]->getOriginal());
-        $this->assertEquals('Taylor', $collection[0]->name);
-        $this->assertEquals('Otwell', $collection[1]->name);
-        $this->assertEquals('foo_connection', $collection[0]->getConnectionName());
-        $this->assertEquals('foo_connection', $collection[1]->getConnectionName());
-    }
-
-    public function testHydrateRawMakesRawQuery()
-    {
-        $collection = EloquentModelHydrateRawStub::fromQuery('SELECT ?', ['foo']);
-        $this->assertEquals('hydrated', $collection);
-    }
-
     public function testCreateMethodSavesNewModel()
     {
         $_SERVER['__eloquent.saved'] = false;