PHP 8.1 support (more strict function param)

src/Provider/SeptemberFirstProvider.php

@@ -4,16 +4,16 @@ declare(strict_types=1);
 
 namespace Sept\OAuth2\Client\Provider;
 
-use League\OAuth2\Client\Provider\AbstractProvider;
+use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
+use League\OAuth2\Client\Provider\GenericProvider;
 use League\OAuth2\Client\Token\AccessToken;
 use League\OAuth2\Client\Tool\BearerAuthorizationTrait;
-use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use Psr\Http\Message\ResponseInterface;
 
 /**
  * Провайдер данных Первого сентября
  */
-class SeptemberFirstProvider extends AbstractProvider
+class SeptemberFirstProvider extends GenericProvider
 {
     use BearerAuthorizationTrait;
 
@@ -28,48 +28,41 @@ class SeptemberFirstProvider extends AbstractProvider
     const API_BASE = 'https://api.1sept.ru';
 
     /**
-     * @var string Версия API
+     * @var array Разрешения (scopes) по умолчанию
      */
-    const API_VERSION = '2.0';
+    const SCOPES_DEFAULT = ['profile'];
 
     /**
-     * @inheritDoc
+     * @var string Разделитель перечня запрашиваемых разрешений
      */
-    public function getBaseAuthorizationUrl(): string
-    {
-        return static::AUTH_BASE.'/oauth/authorize';
-    }
+    const SCOPES_SEPARATOR = ' ';
 
     /**
-     * @inheritDoc
+     * @var string Путь авторизации
      */
-    public function getBaseAccessTokenUrl(array $params): string
-    {
-        return static::API_BASE.'/oauth/access_token';
-    }
+    const AUTHORIZE_PATH = '/oauth/authorize';
 
     /**
-     * @inheritDoc
+     * @var string Путь получения токена
      */
-    public function getResourceOwnerDetailsUrl(AccessToken $token): string
-    {
-        return static::API_BASE.'/'.static::API_VERSION.'/userinfo';
-    }
+    const ACCESS_TOKEN_PATH = '/oauth/access_token';
 
     /**
-     * @inheritDoc
+     * @var string Путь получения данных пользователя
      */
-    public function getDefaultScopes(): array
-    {
-        return ['profile'];
-    }
+    const USERINFO_PATH = '/2.0/userinfo';
 
-    /**
-     * @inheritDoc
-     */
-    protected function getScopeSeparator(): string
+    public function __construct(array $options = [], array $collaborators = [])
     {
-        return ' ';
+        $defaultOptions = [
+            'urlAuthorize' => static::AUTH_BASE.static::AUTHORIZE_PATH,
+            'urlAccessToken' => static::API_BASE.static::ACCESS_TOKEN_PATH,
+            'urlResourceOwnerDetails' => static::API_BASE.static::USERINFO_PATH,
+            'scopes' => static::SCOPES_DEFAULT,
+            'scopeSeparator' => static::SCOPES_SEPARATOR,
+        ];
+
+        parent::__construct(array_merge($defaultOptions, $options), $collaborators);
     }
 
     /**
@@ -77,8 +70,8 @@ class SeptemberFirstProvider extends AbstractProvider
      */
     protected function checkResponse(ResponseInterface $response, $data): void
     {
-        if (!empty($data['error'])) {
-            throw new IdentityProviderException($data['error'].': '.$data['message'], null, $response);
+        if (! empty($data['error'])) {
+            throw new IdentityProviderException($data['error'].': '.$data['message'], 0, $response);
         }
     }