Skip to content
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

Jump to bottom

Move model to a trait #2580

Merged
merged 6 commits into from
Jul 8, 2024
+1,086 −887
Merged

Move model to a trait #2580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
855ff8e
Create DocumentModel trait to enable MongoDB on any 3rd party model c…
GromNaN Jul 4, 2024
c8d6c42
Use the trait for every test model
GromNaN Jul 5, 2024
ef12043
Update changelog
GromNaN Jul 5, 2024
114f918
Optimize Model::isDocumentModel
GromNaN Jul 8, 2024
16ff436
Refactor the User class to extend Laravel's User class
GromNaN Jul 8, 2024
8e24ed7
Model::isDocumentModel don't need to be extensible
GromNaN Jul 8, 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
8 changes: 6 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# Changelog
All notable changes to this project will be documented in this file.

## [4.5.0] - upcoming
## [4.6.0] - upcoming

* Add GridFS integration for Laravel File Storage by @GromNaN in [#2984](https://github.com/mongodb/laravel-mongodb/pull/2985)
* Add `DocumentTrait` to use any 3rd party model with MongoDB @GromNaN in [#2580](https://github.com/mongodb/laravel-mongodb/pull/2580)

## [4.5.0] - 2024-06-20

* Add GridFS integration for Laravel File Storage by @GromNaN in [#2985](https://github.com/mongodb/laravel-mongodb/pull/2985)

## [4.4.0] - 2024-05-31

Expand Down
4 changes: 2 additions & 2 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ parameters:

-
message: "#^Method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:push\\(\\) invoked with 3 parameters, 0 required\\.$#"
count: 2
count: 3
path: src/Relations/BelongsToMany.php

-
message: "#^Method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:push\\(\\) invoked with 3 parameters, 0 required\\.$#"
count: 2
count: 6
path: src/Relations/MorphToMany.php

-
Expand Down
23 changes: 7 additions & 16 deletions src/Auth/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,13 @@

namespace MongoDB\Laravel\Auth;

use Illuminate\Auth\Authenticatable;
use Illuminate\Auth\MustVerifyEmail;
use Illuminate\Auth\Passwords\CanResetPassword;
use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
use Illuminate\Foundation\Auth\Access\Authorizable;
use MongoDB\Laravel\Eloquent\Model;
use Illuminate\Foundation\Auth\User as BaseUser;
use MongoDB\Laravel\Eloquent\DocumentModel;

class User extends Model implements
AuthenticatableContract,
AuthorizableContract,
CanResetPasswordContract
class User extends BaseUser
{
use Authenticatable;
use Authorizable;
use CanResetPassword;
use MustVerifyEmail;
use DocumentModel;

protected $primaryKey = '_id';
protected $keyType = 'string';
}
Loading
Loading