mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-21 16:51:34 +02:00
Code Issues Releases Wiki Activity

Remove deprecated code from beta 16 (#2705)

Browse Source
This commit is contained in:
Alexander Skvortsov
2021-03-19 14:13:50 -04:00
committed by GitHub
parent dd2712d5c8
commit 897e778800
40 changed files with 59 additions and 689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework/core/src/Http/AccessToken.php
View File

@@ -67,20 +67,12 @@ class AccessToken extends AbstractModel
* Generate an access token for the specified user.
*
* @param int $userId
* @param int $lifetime Does nothing. Deprecated in beta 16, removed in beta 17
* @return static
*/
public static function generate($userId, $lifetime = null)
public static function generate($userId)
{
if (! is_null($lifetime)) {
trigger_error('Parameter $lifetime is deprecated in beta 16, will be removed in beta 17', E_USER_DEPRECATED);
}
if (static::class === self::class) {
trigger_error('Use of AccessToken::generate() is deprecated in beta 16. Use SessionAccessToken::generate() or RememberAccessToken::generate()', E_USER_DEPRECATED);
$token = new SessionAccessToken;
$token->type = 'session';
throw new \Exception('Use of AccessToken::generate() is not allowed: use the `generate` method on one of the subclasses.');
} else {
$token = new static;
$token->type = static::$type;

24
framework/core/src/Http/Rememberer.php
View File

@@ -32,37 +32,17 @@ class Rememberer
/**
* Sets the remember cookie on a response.
* @param ResponseInterface $response
* @param RememberAccessToken $token The remember token to set on the response. Use of non-remember token is deprecated in beta 16, removed eta 17.
* @param RememberAccessToken $token The remember token to set on the response.
* @return ResponseInterface
*/
public function remember(ResponseInterface $response, AccessToken $token)
public function remember(ResponseInterface $response, RememberAccessToken $token)
{
if (! ($token instanceof RememberAccessToken)) {
trigger_error('Parameter $token of type AccessToken is deprecated in beta 16, must be instance of RememberAccessToken in beta 17', E_USER_DEPRECATED);
$token->type = 'session_remember';
$token->save();
}
return FigResponseCookies::set(
$response,
$this->cookie->make(self::COOKIE_NAME, $token->token, RememberAccessToken::rememberCookieLifeTime())
);
}
/**
* @param ResponseInterface $response
* @param $userId
* @return ResponseInterface
* @deprecated beta 16, removed beta 17. Use remember() with a token
*/
public function rememberUser(ResponseInterface $response, $userId)
{
$token = RememberAccessToken::generate($userId);
return $this->remember($response, $token);
}
public function forget(ResponseInterface $response)
{
return FigResponseCookies::set(

14
framework/core/src/Http/SessionAuthenticator.php
View File

@@ -15,20 +15,10 @@ class SessionAuthenticator
{
/**
* @param Session $session
* @param AccessToken|int $token Token or user ID. Use of User ID is deprecated in beta 16, will be removed in beta 17
* @param AccessToken $token
*/
public function logIn(Session $session, $token)
public function logIn(Session $session, AccessToken $token)
{
// Backwards compatibility with $userId as parameter
// Remove in beta 17
if (! ($token instanceof AccessToken)) {
$userId = $token;
trigger_error('Parameter $userId is deprecated in beta 16, will be replaced by $token in beta 17', E_USER_DEPRECATED);
$token = SessionAccessToken::generate($userId);
}
$session->regenerate(true);
$session->put('access_token', $token->token);
}