Merge pull request spatie#48 from d1am0nd/feature/toArray_conditionally_adds_key

[spatie#47] toArray on HasBinaryUuid conditionally adds model key

Author: brendt

src/HasBinaryUuid.php

@@ -77,7 +77,13 @@ public function toArray()
             return parent::toArray();
         }
 
-        return array_merge(parent::toArray(), [$this->getKeyName() => $this->uuid_text]);
+        $data = parent::toArray();
+
+        if (isset($data[$this->getKeyName()])) {
+            $data[$this->getKeyName()] = $this->uuid_text;
+        }
+
+        return $data;
     }
 
     public function getUuidTextAttribute(): ?string

tests/Feature/HasBinaryUuidTest.php

@@ -164,4 +164,14 @@ public function it_prevents_decoding_the_uuid_when_the_model_does_not_exist()
         $this->assertEmpty($model->toArray());
         $this->assertNull($model->uuid_text);
     }
+
+    /** @test */
+    public function it_prevents_decoding_model_key_when_it_is_not_included_in_attributes()
+    {
+        $model = TestModel::create();
+        $model->setRawAttributes(['test' => 'test']);
+        $array = $model->toArray();
+
+        $this->assertFalse(isset($array[$model->getKeyName()]));
+    }
 }