mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-18 18:26:07 +02:00
Code Issues Releases Wiki Activity

Combine URL generator classes into one

Browse Source
This commit is contained in:
Franz Liedke
2017-06-25 23:33:02 +02:00
parent f824dcfb53
commit b72407440d
19 changed files with 104 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/User/Command/RequestPasswordResetHandler.php
View File

@@ -11,7 +11,7 @@
namespace Flarum\User\Command;
use Flarum\Forum\UrlGenerator;
use Flarum\Http\UrlGenerator;
use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\PasswordToken;
use Flarum\User\UserRepository;
@@ -107,7 +107,7 @@ class RequestPasswordResetHandler
$data = [
'{username}' => $user->username,
'{url}' => $this->url->toRoute('resetPassword', ['token' => $token->id]),
'{url}' => $this->url->to('forum')->route('resetPassword', ['token' => $token->id]),
'{forum}' => $this->settings->get('forum_title'),
];

4
src/User/EmailConfirmationMailer.php
View File

@@ -11,7 +11,7 @@
namespace Flarum\User;
use Flarum\Forum\UrlGenerator;
use Flarum\Http\UrlGenerator;
use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\Event\EmailChangeRequested;
use Flarum\User\Event\Registered;
@@ -128,7 +128,7 @@ class EmailConfirmationMailer
return [
'{username}' => $user->username,
'{url}' => $this->url->toRoute('confirmEmail', ['token' => $token->id]),
'{url}' => $this->url->to('forum')->route('confirmEmail', ['token' => $token->id]),
'{forum}' => $this->settings->get('forum_title')
];
}

4
src/User/User.php
View File

@@ -325,9 +325,9 @@ class User extends AbstractModel
*/
public function getAvatarUrlAttribute()
{
$urlGenerator = app('Flarum\Forum\UrlGenerator');
$urlGenerator = app('Flarum\Http\UrlGenerator');
return $this->avatar_path ? $urlGenerator->toPath('assets/avatars/'.$this->avatar_path) : null;
return $this->avatar_path ? $urlGenerator->to('forum')->path('assets/avatars/'.$this->avatar_path) : null;
}
/**