Merge branch 'patch-1'

Author: michaeldyrynda

.travis.yml

@@ -7,9 +7,11 @@ cache:
 matrix:
   include:
     - php: 7.2
-      env: ILLUMINATE_VERSION=6.*
+      env: ILLUMINATE_VERSION=7.*
     - php: 7.3
-      env: ILLUMINATE_VERSION=6.*
+      env: ILLUMINATE_VERSION=7.*
+    - php: 7.4
+      env: ILLUMINATE_VERSION=7.*
 
 before_install: travis_retry composer require "illuminate/database:${ILLUMINATE_VERSION}" "illuminate/events:${ILLUMINATE_VERSION}" --no-update -v
 

README.md

@@ -1,5 +1,5 @@
 # Laravel Model UUIDs
-## v5.0.0
+## v6.0.0
 
 [![Build Status](https://travis-ci.org/michaeldyrynda/laravel-model-uuid.svg?branch=master)](https://travis-ci.org/michaeldyrynda/laravel-model-uuid)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/michaeldyrynda/laravel-model-uuid/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/michaeldyrynda/laravel-model-uuid/?branch=master)
@@ -105,14 +105,17 @@ If you use the suggested [laravel-efficient-uuid](https://github.com/michaeldyry
 
 namespace App;
 
-use Illuminate\Database\Eloquent\Model;
+use Dyrynda\Database\Support\Casts\EfficientUuid;
 use Dyrynda\Database\Support\GeneratesUuid;
+use Illuminate\Database\Eloquent\Model;
 
 class Post extends Model
 {
     use GeneratesUuid;
 
-    protected $casts = ['uuid' => 'uuid'];
+    protected $casts = [
+        'uuid' => EfficientUuid::class,
+    ];
 }
 ```
 

composer.json

@@ -16,10 +16,10 @@
         }
     ],
     "require": {
-        "php": "^7.2",
-        "illuminate/database": "^6.0",
-        "illuminate/events": "^6.0",
-        "illuminate/support": "^6.0",
+        "php": "^7.2.5",
+        "illuminate/database": "^6.0|^7.0",
+        "illuminate/events": "^6.0|^7.0",
+        "illuminate/support": "^6.0|^7.0",
         "ramsey/uuid": "~3.7",
         "moontoast/math": "^1.1"
     },

src/GeneratesUuid.php

@@ -2,11 +2,11 @@
 
 namespace Dyrynda\Database\Support;
 
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Database\Eloquent\Builder;
+use Ramsey\Uuid\Uuid;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
-use Ramsey\Uuid\Uuid;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Contracts\Support\Arrayable;
 
 /**
  * UUID generation trait.
@@ -56,14 +56,16 @@ abstract public function hasCast($key, $types = null);
     public static function bootGeneratesUuid(): void
     {
         static::creating(function ($model) {
-            /* @var \Illuminate\Database\Eloquent\Model|static $model */
-            $uuid = $model->resolveUuid();
             foreach ($model->uuidColumns() as $item) {
+                /* @var \Illuminate\Database\Eloquent\Model|static $model */
+                $uuid = $model->resolveUuid();
+
                 if (isset($model->attributes[$item]) && ! is_null($model->attributes[$item])) {
                     /* @var \Ramsey\Uuid\Uuid $uuid */
                     $uuid = $uuid->fromString(strtolower($model->attributes[$item]));
                 }
-                $model->attributes[$item] = $model->hasCast($item, 'uuid') ? $uuid->getBytes() : $uuid->toString();
+
+                $model->{$item} = strtolower($uuid->toString());
             }
         });
     }
@@ -131,11 +133,9 @@ public function scopeWhereUuid($query, $uuid, $uuidColumn = null): Builder
             ? $uuidColumn
             : $this->uuidColumns()[0];
 
-        if ($this->hasCast($uuidColumn)) {
-            $uuid = $this->bytesFromUuid($uuid);
-        }
-
-        return $query->whereIn($uuidColumn, Arr::wrap($uuid));
+        return $query->whereIn($uuidColumn, array_map(function ($uuid) {
+            return strtolower($uuid);
+        }, Arr::wrap($uuid)));
     }
 
     /**
@@ -156,20 +156,4 @@ protected function bytesFromUuid($uuid): array
 
         return Arr::wrap($this->resolveUuid()->fromString($uuid)->getBytes());
     }
-
-    /**
-     * Cast an attribute to a native PHP type.
-     *
-     * @param  string  $key
-     * @param  mixed  $value
-     * @return mixed
-     */
-    protected function castAttribute($key, $value)
-    {
-        if (in_array($key, $this->uuidColumns()) && ! empty($value)) {
-            return $this->resolveUuid()->fromBytes($value)->toString();
-        }
-
-        return parent::castAttribute($key, $value);
-    }
 }

tests/Feature/UuidTest.php

@@ -2,16 +2,16 @@
 
 namespace Tests\Feature;
 
-use Illuminate\Container\Container;
-use Illuminate\Database\Capsule\Manager;
-use Illuminate\Events\Dispatcher;
+use Tests\Fixtures\Post;
+use Tests\Fixtures\UncastPost;
 use PHPUnit\Framework\TestCase;
-use Tests\Fixtures\CustomCastUuidPost;
+use Tests\Fixtures\OrderedPost;
+use Illuminate\Events\Dispatcher;
 use Tests\Fixtures\CustomUuidPost;
+use Illuminate\Container\Container;
 use Tests\Fixtures\MultipleUuidPost;
-use Tests\Fixtures\OrderedPost;
-use Tests\Fixtures\Post;
-use Tests\Fixtures\UncastPost;
+use Tests\Fixtures\CustomCastUuidPost;
+use Illuminate\Database\Capsule\Manager;
 
 class UuidTest extends TestCase
 {