Refactoring the model and relationship classes

Author: florianJacques

src/Eloquent/Model.php

@@ -773,26 +773,47 @@ public function refresh()
     }
 
     /**
-     * Determine if two models have the same ID and belong to the same table.
+     * Get a serialized attribute from the model.
      *
-     * @param  \Illuminate\Database\Eloquent\Model|null  $model
-     * @return bool
+     * @param  string  $key
+     * @return mixed
      */
-    public function is($model)
+    public function getSerializedAttribute($key)
     {
-        $modelKey = $model?->getKey();
-        $currentKey = $this->getKey();
+        $value = $this->getAttribute($key);
 
-        if ($modelKey instanceof \MongoDB\BSON\ObjectId) {
-            $modelKey = (string) $modelKey;
+        // Convert ObjectID to string.
+        if ($value instanceof ObjectID) {
+            return (string) $value;
         }
 
-        if ($currentKey instanceof \MongoDB\BSON\ObjectId) {
-            $currentKey = (string) $currentKey;
+        if ($value instanceof Binary) {
+            return (string) $value->getData();
         }
 
+        return $value;
+    }
+
+    /**
+     * Get the serialized value of the model's primary key.
+     *
+     * @return mixed
+     */
+    public function getSerializedKey()
+    {
+        return $this->getSerializedAttribute($this->getKeyName());
+    }
+
+    /**
+     * Determine if two models have the same ID and belong to the same table.
+     *
+     * @param  \Illuminate\Database\Eloquent\Model|null  $model
+     * @return bool
+     */
+    public function is($model)
+    {
         return ! is_null($model) &&
-            $currentKey === $modelKey &&
+            $this->getSerializedKey() === $model->getSerializedKey() &&
             $this->getTable() === $model->getTable() &&
             $this->getConnectionName() === $model->getConnectionName();
     }

src/Relations/BelongsToMany.php

@@ -11,6 +11,8 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany as EloquentBelongsToMany;
 use Illuminate\Support\Arr;
+use MongoDB\BSON\Binary;
+use MongoDB\BSON\ObjectId;
 
 use function array_diff;
 use function array_map;
@@ -304,7 +306,7 @@ public function attach($id, array $attributes = [], $touch = true)
 
         // Attach the new ids to the parent model.
         if ($this->parent instanceof \MongoDB\Laravel\Eloquent\Model) {
-            if ($id instanceof \MongoDB\BSON\ObjectId) {
+            if ($id instanceof ObjectId) {
                 $id = [$id];
             } else {
                 $id = (array) $id;
@@ -340,7 +342,7 @@ public function detach($ids = [], $touch = true)
         // If associated IDs were passed to the method we will only delete those
         // associations, otherwise all of the association ties will be broken.
         // We'll return the numbers of affected rows when we do the deletes.
-        if ($ids instanceof \MongoDB\BSON\ObjectId) {
+        if ($ids instanceof ObjectId) {
             $ids = [$ids];
         } else {
             $ids = (array) $ids;
@@ -388,10 +390,14 @@ protected function buildDictionary(Collection $results)
             foreach ($result->$foreign as $item) {
 
                 //Prevent if id is non keyable
-                if ($item instanceof \MongoDB\BSON\ObjectId) {
+                if ($item instanceof ObjectId) {
                     $item = (string) $item;
                 }
 
+                if ($item instanceof Binary) {
+                    $item =  (string) $item->getData();
+                }
+
                 $dictionary[$item][] = $result;
             }
         }