Skip to content

chore: remove goldspecdigital/laravel-eloquent-uuid #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jshah4517 merged 2 commits into from
Nov 20, 2024
Merged

chore: remove goldspecdigital/laravel-eloquent-uuid #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
576512e
chore: remove goldspecdigital/laravel-eloquent-uuid
jshah4517 Nov 20, 2024
65372c6
update
jshah4517 Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down
5 changes: 2 additions & 3 deletions src/Model/Channel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace SupportPal\Pollcast\Model;

use Database\Factories\ChannelFactory;
use GoldSpecDigital\LaravelEloquentUUID\Database\Eloquent\Uuid;
use Illuminate\Database\Eloquent\Concerns\HasUuids;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
Expand All @@ -14,8 +14,7 @@
*/
class Channel extends Model
{
use Uuid;
use HasFactory;
use HasFactory, HasUuids;

/** @var string */
protected $table = 'pollcast_channel';
Expand Down
5 changes: 2 additions & 3 deletions src/Model/Member.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace SupportPal\Pollcast\Model;

use Database\Factories\MemberFactory;
use GoldSpecDigital\LaravelEloquentUUID\Database\Eloquent\Uuid;
use Illuminate\Database\Eloquent\Concerns\HasUuids;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
Expand All @@ -17,8 +17,7 @@
*/
class Member extends Model
{
use Uuid;
use HasFactory;
use HasFactory, HasUuids;

/** @var string */
protected $table = 'pollcast_channel_members';
Expand Down
7 changes: 3 additions & 4 deletions src/Model/Message.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace SupportPal\Pollcast\Model;

use Database\Factories\MessageFactory;
use GoldSpecDigital\LaravelEloquentUUID\Database\Eloquent\Uuid;
use Illuminate\Database\Eloquent\Concerns\HasUuids;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
Expand All @@ -18,8 +18,7 @@
*/
class Message extends Model
{
use Uuid;
use HasFactory;
use HasFactory, HasUuids;

/** @var string */
protected $table = 'pollcast_message_queue';
Expand Down Expand Up @@ -65,7 +64,7 @@ public function member(): BelongsTo

public function setUuid(): self
{
$this->{$this->getKeyName()} = $this->generateUuid();
$this->{$this->getKeyName()} = $this->newUniqueId();

return $this;
}
Expand Down