Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: true
matrix:
php: [8.4, 8.3, 8.2]
laravel: ['10.*', '11.*', '12.*']
laravel: ["10.*", "11.*", "12.*"]
dependency-version: [prefer-lowest, prefer-stable]
include:
- laravel: 10.*
Expand All @@ -26,10 +26,10 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.composer/cache/files
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
Expand Down
8 changes: 4 additions & 4 deletions src/MustVerifyNewEmail.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ trait MustVerifyNewEmail
* to the new email address.
*
* @param string $email
* @param callable $withMailable
* @param callable|null $withMailable
* @return \Illuminate\Database\Eloquent\Model|null
*/
public function newEmail(string $email, callable $withMailable = null): ?Model
public function newEmail(string $email, ?callable $withMailable = null): ?Model
{
if ($this->getEmailForVerification() === $email && $this->hasVerifiedEmail()) {
return null;
Expand Down Expand Up @@ -81,10 +81,10 @@ public function clearPendingEmail()
* Sends the VerifyNewEmail Mailable to the new email address.
*
* @param \Illuminate\Database\Eloquent\Model $pendingUserEmail
* @param callable $withMailable
* @param callable|null $withMailable
* @return mixed
*/
public function sendPendingEmailVerificationMail(Model $pendingUserEmail, callable $withMailable = null)
public function sendPendingEmailVerificationMail(Model $pendingUserEmail, ?callable $withMailable = null)
{
$mailableClass = config('verify-new-email.mailable_for_first_verification');

Expand Down