Fixes for Laravel 5.2

Author: jenssegers

src/Jenssegers/Mongodb/Eloquent/Collection.php

@@ -322,6 +322,16 @@ public function setAttribute($key, $value)
         parent::setAttribute($key, $value);
     }
 
+    /**
+     * Get the casts array.
+     *
+     * @return array
+     */
+    public function getCasts()
+    {
+        return $this->casts;
+    }
+
     /**
      * Convert the model's attributes to an array.
      *
@@ -372,6 +382,7 @@ protected function originalIsNumericallyEquivalent($key)
         {
             $current = $current instanceof MongoDate ? $this->asDateTime($current) : $current;
             $original = $original instanceof MongoDate ? $this->asDateTime($original) : $original;
+
             return $current == $original;
         }
 

src/Jenssegers/Mongodb/Model.php

@@ -85,6 +85,7 @@ class Builder extends BaseBuilder {
      */
     public function __construct(Connection $connection, Processor $processor)
     {
+        $this->grammar = new Grammar;
         $this->connection = $connection;
         $this->processor = $processor;
     }

src/Jenssegers/Mongodb/Query/Builder.php

@@ -0,0 +1,8 @@
+<?php namespace Jenssegers\Mongodb\Query;
+
+use Illuminate\Database\Query\Grammars\Grammar as BaseGrammar;
+
+class Grammar extends BaseGrammar
+{
+
+}

src/Jenssegers/Mongodb/Query/Grammar.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()
     {
@@ -321,7 +321,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 {
 
@@ -104,7 +103,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)
         {
@@ -121,7 +120,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()
     {
@@ -212,7 +211,7 @@ public function createMany(array $records)
      */
     protected function getIdsArrayFrom($ids)
     {
-        if ($ids instanceof Collection)
+        if ($ids instanceof \Illuminate\Support\Collection)
         {
             $ids = $ids->all();
         }
@@ -237,7 +236,9 @@ protected function getEmbedded()
         // Get raw attributes to skip relations and accessors.
         $attributes = $this->parent->getAttributes();
 
-        return isset($attributes[$this->localKey]) ? $attributes[$this->localKey] : null;
+        $embedded = isset($attributes[$this->localKey]) ? (array) $attributes[$this->localKey] : [];
+
+        return $embedded;
     }
 
     /**
@@ -248,6 +249,7 @@ protected function getEmbedded()
      */
     protected function setEmbedded($records)
     {
+        // Assign models to parent attributes array.
         $attributes = $this->parent->getAttributes();
 
         $attributes[$this->localKey] = $records;
@@ -256,7 +258,7 @@ protected function setEmbedded($records)
         $this->parent->setRawAttributes($attributes);
 
         // Set the relation on the parent.
-        return $this->parent->setRelation($this->relation, $this->getResults());
+        return $this->parent->setRelation($this->relation, $records === null ? null : $this->getResults());
     }
 
     /**
@@ -280,7 +282,7 @@ protected function getForeignKeyValue($id)
      * Convert an array of records to a Collection.
      *
      * @param  array  $records
-     * @return \Jenssegers\Mongodb\Eloquent\Collection
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     protected function toCollection(array $records = [])
     {