mirror of
https://github.com/flarum/core.git
synced 2025-10-27 05:31:29 +01:00
Laravel components v8 (#2576)
- update actions ci - include json for 4 spaces tab - provide output int for process code exit - adhere to parent type hint of builder - mailer instance now needs a name, multiple can be instantiated - getOriginal now uses mutators in the model - Temporarily loosen MailableInterface requirements. This avoids an immediate BC break for classes in extensions that implement this interface. - Temporarily provide (and autoload) old symfony translator interface - make queue exception handler compatible with the contract of L8 - Update phpunit schema for newer version - Update phpunit assert calls for newer version
This commit is contained in:
@@ -14,7 +14,7 @@ use Flarum\Mail\Job\SendRawEmailJob;
|
||||
use Flarum\Settings\SettingsRepositoryInterface;
|
||||
use Flarum\User\Event\Registered;
|
||||
use Illuminate\Contracts\Queue\Queue;
|
||||
use Symfony\Component\Translation\TranslatorInterface;
|
||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||
|
||||
class AccountActivationMailer
|
||||
{
|
||||
|
||||
@@ -49,7 +49,7 @@ class AvatarUploader
|
||||
*/
|
||||
protected function removeFileAfterSave(User $user)
|
||||
{
|
||||
$avatarPath = $user->getOriginal('avatar_url');
|
||||
$avatarPath = $user->getRawOriginal('avatar_url');
|
||||
|
||||
$user->afterSave(function () use ($avatarPath) {
|
||||
if ($this->uploadDir->has($avatarPath)) {
|
||||
|
||||
@@ -18,7 +18,7 @@ use Illuminate\Contracts\Queue\Queue;
|
||||
use Illuminate\Contracts\Validation\Factory;
|
||||
use Illuminate\Database\Eloquent\ModelNotFoundException;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
use Symfony\Component\Translation\TranslatorInterface;
|
||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||
|
||||
class RequestPasswordResetHandler
|
||||
{
|
||||
|
||||
@@ -14,7 +14,7 @@ use Flarum\Mail\Job\SendRawEmailJob;
|
||||
use Flarum\Settings\SettingsRepositoryInterface;
|
||||
use Flarum\User\Event\EmailChangeRequested;
|
||||
use Illuminate\Contracts\Queue\Queue;
|
||||
use Symfony\Component\Translation\TranslatorInterface;
|
||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||
|
||||
class EmailConfirmationMailer
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user