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

[8.x] Add hasVerifiedEmail scope #35217

Closed
wants to merge 2 commits into from
Closed

[8.x] Add hasVerifiedEmail scope #35217

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30442e6
[8.x] Add hasVerifiedEmail scope
iamgergo Nov 13, 2020
b3ba740
remove scope from contract
iamgergo Nov 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/Illuminate/Auth/MustVerifyEmail.php
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
namespace Illuminate\Auth;

use Illuminate\Auth\Notifications\VerifyEmail;
use Illuminate\Database\Eloquent\Builder;

trait MustVerifyEmail
{
Expand Down Expand Up @@ -47,4 +48,15 @@ public function getEmailForVerification()
{
return $this->email;
}

/**
* Scope a query to only include users with verified email.
*
* @param \Illuminate\Database\Eloquent\Builder $query
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeHasVerifiedEmail(Builder $query)
{
return $query->whereNotNull('email_verified_at');
}
}
10 changes: 10 additions & 0 deletions src/Illuminate/Contracts/Auth/MustVerifyEmail.php
View file
Open in desktop
Expand Up @@ -2,6 +2,8 @@

namespace Illuminate\Contracts\Auth;

use Illuminate\Database\Eloquent\Builder;

interface MustVerifyEmail
{
/**
Expand Down Expand Up @@ -31,4 +33,12 @@ public function sendEmailVerificationNotification();
* @return string
*/
public function getEmailForVerification();

/**
* Scope a query to only include users with verified email.
*
* @param \Illuminate\Database\Eloquent\Builder $query
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeHasVerifiedEmail(Builder $query);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a breaking change for any class that implements this interface.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also don't think this needs to be added to the interface since this is leaking Eloquent into the auth component.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I was hesitating about that. I remove that from the interface.

}