Embedded relations now return regular Eloquent collections

Author: jenssegers

README.md

@@ -94,6 +94,8 @@ class User extends Eloquent {
 }
 ```
 
+Embedded relations now return an `Illuminate\Database\Eloquent\Collection` rather than a custom Collection class. If you were using one of the special methods that were available, convert them to Collection operations.
+
 Configuration
 -------------
 
@@ -558,6 +560,8 @@ Supported relations are:
  - hasMany
  - belongsTo
  - belongsToMany
+ - embedsOne
+ - embedsMany
 
 Example:
 
@@ -611,6 +615,8 @@ Other relations are not yet supported, but may be added in the future. Read more
 
 If you want to embed models, rather than referencing them, you can use the `embedsMany` relation. This relation is similar to the `hasMany` relation, but embeds the models inside the parent object.
 
+**REMEMBER**: these relations return Eloquent collections, they don't return query builder objects!
+
 ```php
 use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 

src/Jenssegers/Mongodb/Eloquent/Collection.php

@@ -10,7 +10,7 @@ class EmbedsMany extends EmbedsOneOrMany
     /**
      * Get the results of the relationship.
      *
-     * @return \Jenssegers\Mongodb\Eloquent\Collection
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function getResults()
     {
@@ -319,8 +319,7 @@ protected function setEmbedded($models)
      */
     public function __call($method, $parameters)
     {
-        // Collection methods
-        if (method_exists('Jenssegers\Mongodb\Eloquent\Collection', $method)) {
+        if (method_exists('Illuminate\Database\Eloquent\Collection', $method)) {
             return call_user_func_array([$this->getResults(), $method], $parameters);
         }
 

src/Jenssegers/Mongodb/Relations/EmbedsMany.php

@@ -1,10 +1,9 @@
 <?php namespace Jenssegers\Mongodb\Relations;
 
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection as BaseCollection;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
-use Jenssegers\Mongodb\Eloquent\Collection;
 
 abstract class EmbedsOneOrMany extends Relation
 {
@@ -101,7 +100,7 @@ public function initRelation(array $models, $relation)
      * @param  string  $relation
      * @return array
      */
-    public function match(array $models, BaseCollection $results, $relation)
+    public function match(array $models, Collection $results, $relation)
     {
         foreach ($models as $model) {
             $results = $model->$relation()->getResults();
@@ -117,7 +116,7 @@ public function match(array $models, BaseCollection $results, $relation)
     /**
      * Shorthand to get the results of the relationship.
      *
-     * @return \Jenssegers\Mongodb\Eloquent\Collection
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function get()
     {

src/Jenssegers/Mongodb/Relations/EmbedsOneOrMany.php

@@ -424,70 +424,19 @@ public function testEmbedsManyCollectionMethods()
 
         $this->assertEquals(['Paris', 'Bruges', 'Brussels', 'Ghent'], $user->addresses()->lists('city')->all());
         $this->assertEquals(['Bruges', 'Brussels', 'Ghent', 'Paris'], $user->addresses()->sortBy('city')->lists('city')->all());
-        $this->assertEquals(['Bruges', 'Brussels', 'Ghent', 'Paris'], $user->addresses()->orderBy('city')->lists('city')->all());
-        $this->assertEquals(['Paris', 'Ghent', 'Brussels', 'Bruges'], $user->addresses()->orderBy('city', 'desc')->lists('city')->all());
-
         $this->assertEquals([], $user->addresses()->where('city', 'New York')->lists('city')->all());
         $this->assertEquals(['Bruges', 'Brussels', 'Ghent'], $user->addresses()->where('country', 'Belgium')->lists('city')->all());
-        $this->assertEquals(['Ghent', 'Brussels', 'Bruges'], $user->addresses()->where('country', 'Belgium')->orderBy('city', 'desc')->lists('city')->all());
+        $this->assertEquals(['Bruges', 'Brussels', 'Ghent'], $user->addresses()->where('country', 'Belgium')->sortBy('city')->lists('city')->all());
 
-        $results = $user->addresses->get(0);
+        $results = $user->addresses->first();
         $this->assertInstanceOf('Address', $results);
 
-        $results = $user->addresses()->where('country', 'Belgium')->get();
-        $this->assertInstanceOf('Jenssegers\Mongodb\Eloquent\Collection', $results);
-        $this->assertEquals(3, $results->count());
-
-        $results = $user->addresses()->where('country', '!=', 'Belgium')->get();
-        $this->assertEquals(1, $results->count());
-
-        $results = $user->addresses()->where('visited', '>', 4)->get();
-        $this->assertEquals(2, $results->count());
-
-        $results = $user->addresses()->where('visited', '<', 7)->get();
-        $this->assertEquals(2, $results->count());
-
-        $results = $user->addresses()->where('visited', '<=', 7)->get();
-        $this->assertEquals(3, $results->count());
-
-        $results = $user->addresses()->where('visited', '>=', 7)->get();
-        $this->assertEquals(2, $results->count());
-
-        $results = $user->addresses()->where('visited', 'between', [4, 7])->get();
-        $this->assertEquals(2, $results->count());
-
-        $results = $user->addresses()->whereBetween('visited', [4, 7])->get();
-        $this->assertEquals(2, $results->count());
-
-        $results = $user->addresses()->whereNotBetween('visited', [4, 7])->get();
-        $this->assertEquals(2, $results->count());
-
-        $results = $user->addresses()->whereIn('visited', [7, 13])->get();
-        $this->assertEquals(2, $results->count());
-
-        $results = $user->addresses()->whereNotIn('visited', [7])->get();
-        $this->assertEquals(3, $results->count());
-
-        $results = $user->addresses()->whereNull('something')->get();
-        $this->assertEquals(4, $results->count());
-
-        $results = $user->addresses()->whereNotNull('visited')->get();
-        $this->assertEquals(4, $results->count());
-
-        $results = $user->addresses()->offset(1)->get();
+        $results = $user->addresses()->where('country', 'Belgium');
+        $this->assertInstanceOf('Illuminate\Database\Eloquent\Collection', $results);
         $this->assertEquals(3, $results->count());
 
-        $results = $user->addresses()->skip(1)->get();
-        $this->assertEquals(3, $results->count());
-
-        $results = $user->addresses()->limit(2)->get();
+        $results = $user->addresses()->whereIn('visited', [7, 13]);
         $this->assertEquals(2, $results->count());
-
-        $result = $user->addresses()->latest()->first();
-        $this->assertEquals('Ghent', $result->city);
-
-        $result = $user->addresses()->oldest()->first();
-        $this->assertEquals('Bruges', $result->city);
     }
 
     public function testEmbedsOne()