From 576512eecfe86381d3743fe4522a2b58155f5c13 Mon Sep 17 00:00:00 2001
From: Jay Shah <602425+jshah4517@users.noreply.github.com>
Date: Wed, 20 Nov 2024 17:17:50 +0000
Subject: [PATCH 1/2] chore: remove goldspecdigital/laravel-eloquent-uuid

---
 composer.json         | 3 +--
 src/Model/Channel.php | 5 ++---
 src/Model/Member.php  | 5 ++---
 src/Model/Message.php | 5 ++---
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index 8ee815a..3a02181 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,6 @@
     "require": {
         "php": "^8.1",
         "ext-json": "*",
-        "goldspecdigital/laravel-eloquent-uuid": "^10.0",
         "illuminate/broadcasting": "^10.0",
         "illuminate/database": "^10.0",
         "illuminate/http": "^10.0",
@@ -22,7 +21,7 @@
         "graham-campbell/testbench": "^6.0",
         "nunomaduro/larastan": "2.9.8",
         "phpstan/phpstan-mockery": "1.1.2",
-        "phpunit/phpunit": "^11.2",
+        "phpunit/phpunit": "^10.0",
         "rregeer/phpunit-coverage-check": "^0.3.1",
         "supportpal/coding-standard": "0.4.4"
     },
diff --git a/src/Model/Channel.php b/src/Model/Channel.php
index e71e46d..5801934 100644
--- a/src/Model/Channel.php
+++ b/src/Model/Channel.php
@@ -3,7 +3,7 @@
 namespace SupportPal\Pollcast\Model;
 
 use Database\Factories\ChannelFactory;
-use GoldSpecDigital\LaravelEloquentUUID\Database\Eloquent\Uuid;
+use Illuminate\Database\Eloquent\Concerns\HasUlids;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -14,8 +14,7 @@
  */
 class Channel extends Model
 {
-    use Uuid;
-    use HasFactory;
+    use HasFactory, HasUlids;
 
     /** @var string */
     protected $table = 'pollcast_channel';
diff --git a/src/Model/Member.php b/src/Model/Member.php
index c18e8ef..8cf944e 100644
--- a/src/Model/Member.php
+++ b/src/Model/Member.php
@@ -3,7 +3,7 @@
 namespace SupportPal\Pollcast\Model;
 
 use Database\Factories\MemberFactory;
-use GoldSpecDigital\LaravelEloquentUUID\Database\Eloquent\Uuid;
+use Illuminate\Database\Eloquent\Concerns\HasUlids;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -17,8 +17,7 @@
  */
 class Member extends Model
 {
-    use Uuid;
-    use HasFactory;
+    use HasFactory, HasUlids;
 
     /** @var string */
     protected $table = 'pollcast_channel_members';
diff --git a/src/Model/Message.php b/src/Model/Message.php
index e3651fc..ddb92cd 100644
--- a/src/Model/Message.php
+++ b/src/Model/Message.php
@@ -3,7 +3,7 @@
 namespace SupportPal\Pollcast\Model;
 
 use Database\Factories\MessageFactory;
-use GoldSpecDigital\LaravelEloquentUUID\Database\Eloquent\Uuid;
+use Illuminate\Database\Eloquent\Concerns\HasUlids;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -18,8 +18,7 @@
  */
 class Message extends Model
 {
-    use Uuid;
-    use HasFactory;
+    use HasFactory, HasUlids;
 
     /** @var string */
     protected $table = 'pollcast_message_queue';

From 65372c6a68c8b39626eaaf3cec4233641108aafe Mon Sep 17 00:00:00 2001
From: Jay Shah <602425+jshah4517@users.noreply.github.com>
Date: Wed, 20 Nov 2024 17:29:03 +0000
Subject: [PATCH 2/2] update

---
 src/Model/Channel.php | 4 ++--
 src/Model/Member.php  | 4 ++--
 src/Model/Message.php | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Model/Channel.php b/src/Model/Channel.php
index 5801934..95c9b9c 100644
--- a/src/Model/Channel.php
+++ b/src/Model/Channel.php
@@ -3,7 +3,7 @@
 namespace SupportPal\Pollcast\Model;
 
 use Database\Factories\ChannelFactory;
-use Illuminate\Database\Eloquent\Concerns\HasUlids;
+use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -14,7 +14,7 @@
  */
 class Channel extends Model
 {
-    use HasFactory, HasUlids;
+    use HasFactory, HasUuids;
 
     /** @var string */
     protected $table = 'pollcast_channel';
diff --git a/src/Model/Member.php b/src/Model/Member.php
index 8cf944e..0f7221b 100644
--- a/src/Model/Member.php
+++ b/src/Model/Member.php
@@ -3,7 +3,7 @@
 namespace SupportPal\Pollcast\Model;
 
 use Database\Factories\MemberFactory;
-use Illuminate\Database\Eloquent\Concerns\HasUlids;
+use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -17,7 +17,7 @@
  */
 class Member extends Model
 {
-    use HasFactory, HasUlids;
+    use HasFactory, HasUuids;
 
     /** @var string */
     protected $table = 'pollcast_channel_members';
diff --git a/src/Model/Message.php b/src/Model/Message.php
index ddb92cd..aca6c0e 100644
--- a/src/Model/Message.php
+++ b/src/Model/Message.php
@@ -3,7 +3,7 @@
 namespace SupportPal\Pollcast\Model;
 
 use Database\Factories\MessageFactory;
-use Illuminate\Database\Eloquent\Concerns\HasUlids;
+use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -18,7 +18,7 @@
  */
 class Message extends Model
 {
-    use HasFactory, HasUlids;
+    use HasFactory, HasUuids;
 
     /** @var string */
     protected $table = 'pollcast_message_queue';
@@ -64,7 +64,7 @@ public function member(): BelongsTo
 
     public function setUuid(): self
     {
-        $this->{$this->getKeyName()} = $this->generateUuid();
+        $this->{$this->getKeyName()} = $this->newUniqueId();
 
         return $this;
     }