Merge pull request #40 from andrzejkupczyk/master

Prevent decoding the uuid when the model does not exist

Author: brendt

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 7.0
   - 7.1
   - 7.2
 

composer.json

@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^7.0",
+        "php": "^7.1",
         "illuminate/queue": "~5.5.28|~5.6.0",
         "ramsey/uuid": "^3.7"
     },

src/HasBinaryUuid.php

@@ -73,11 +73,19 @@ public static function decodeUuid(string $binaryUuid): string
 
     public function toArray()
     {
+        if (! $this->exists) {
+            return parent::toArray();
+        }
+
         return array_merge(parent::toArray(), [$this->getKeyName() => $this->uuid_text]);
     }
 
-    public function getUuidTextAttribute(): string
+    public function getUuidTextAttribute(): ?string
     {
+        if (! $this->exists) {
+            return null;
+        }
+
         return static::decodeUuid($this->{$this->getKeyName()});
     }
 

tests/Feature/HasBinaryUuidTest.php

@@ -155,4 +155,13 @@ public function it_serialises_the_model_correctly_with_json_encode()
         $this->assertContains($model->uuid_text, $json);
         $this->assertNotContains($model->uuid, $json);
     }
+
+    /** @test */
+    public function it_prevents_decoding_the_uuid_when_the_model_does_not_exist()
+    {
+        $model = new TestModel;
+
+        $this->assertEmpty($model->toArray());
+        $this->assertNull($model->uuid_text);
+    }
 }