Merge pull request #53 from travisaustin/master

Fixed bug when using custom UUID column and casting

Author: michaeldyrynda

src/GeneratesUuid.php

@@ -61,7 +61,7 @@ public static function bootGeneratesUuid()
                 $uuid = $uuid->fromString(strtolower($model->attributes[$model->uuidColumn()]));
             }
 
-            $model->attributes[$model->uuidColumn()] = $model->hasCast('uuid') ? $uuid->getBytes() : $uuid->toString();
+            $model->attributes[$model->uuidColumn()] = $model->hasCast($model->uuidColumn(), 'uuid') ? $uuid->getBytes() : $uuid->toString();
         });
     }
 

tests/Feature/UuidTest.php

@@ -9,6 +9,7 @@
 use Illuminate\Events\Dispatcher;
 use Tests\Fixtures\CustomUuidPost;
 use Illuminate\Container\Container;
+use Tests\Fixtures\CustomCastUuidPost;
 use Illuminate\Database\Capsule\Manager;
 
 class UuidTest extends TestCase
@@ -68,6 +69,14 @@ public function you_can_generate_a_uuid_without_casting()
         $this->assertNotNull($post->uuid);
     }
 
+    /** @test */
+    public function you_can_generate_a_uuid_with_casting_and_a_custom_field_name()
+    {
+        $post = CustomCastUuidPost::create(['title' => 'test post']);
+
+        $this->assertNotNull($post->custom_uuid);
+    }
+    
     /** @test */
     public function you_can_specify_a_uuid_without_casting()
     {

tests/Fixtures/CustomCastUuidPost.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Fixtures;
+
+class CustomCastUuidPost extends Model
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $casts = ['custom_uuid' => 'uuid'];
+    
+    public function uuidColumn()
+    {
+        return 'custom_uuid';
+    }
+}