mirror of
https://github.com/flarum/core.git
synced 2025-08-02 06:30:53 +02:00
Extract new Flarum\User namespace
This commit is contained in:
@@ -11,9 +11,9 @@
|
||||
|
||||
namespace Flarum\Http;
|
||||
|
||||
use Flarum\Core\AuthToken;
|
||||
use Flarum\Core\EmailToken;
|
||||
use Flarum\Core\PasswordToken;
|
||||
use Flarum\User\AuthToken;
|
||||
use Flarum\User\EmailToken;
|
||||
use Flarum\User\PasswordToken;
|
||||
use Flarum\Foundation\AbstractServer as BaseAbstractServer;
|
||||
use Flarum\Foundation\Application;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
|
@@ -18,7 +18,7 @@ use Flarum\Database\AbstractModel;
|
||||
* @property int $user_id
|
||||
* @property int $last_activity
|
||||
* @property int $lifetime
|
||||
* @property \Flarum\Core\User|null $user
|
||||
* @property \Flarum\User\User|null $user
|
||||
*/
|
||||
class AccessToken extends AbstractModel
|
||||
{
|
||||
@@ -67,6 +67,6 @@ class AccessToken extends AbstractModel
|
||||
*/
|
||||
public function user()
|
||||
{
|
||||
return $this->belongsTo('Flarum\Core\User');
|
||||
return $this->belongsTo('Flarum\User\User');
|
||||
}
|
||||
}
|
||||
|
@@ -12,7 +12,7 @@
|
||||
namespace Flarum\Http\Middleware;
|
||||
|
||||
use Flarum\Api\ApiKey;
|
||||
use Flarum\Core\User;
|
||||
use Flarum\User\User;
|
||||
use Flarum\Http\AccessToken;
|
||||
use Psr\Http\Message\ResponseInterface as Response;
|
||||
use Psr\Http\Message\ServerRequestInterface as Request;
|
||||
|
@@ -11,8 +11,8 @@
|
||||
|
||||
namespace Flarum\Http\Middleware;
|
||||
|
||||
use Flarum\Core\Guest;
|
||||
use Flarum\Core\User;
|
||||
use Flarum\User\Guest;
|
||||
use Flarum\User\User;
|
||||
use Psr\Http\Message\ResponseInterface as Response;
|
||||
use Psr\Http\Message\ServerRequestInterface as Request;
|
||||
use Symfony\Component\HttpFoundation\Session\SessionInterface;
|
||||
|
Reference in New Issue
Block a user