Issue #3311202 by Grimreaper: Fix PHPMND, PHPCS Fixer

i18n_sso.install

@@ -37,14 +37,14 @@ function i18n_sso_schema() : array {
       'token' => [
         'description' => 'The token used to connect user. Deleted after usage.',
         'type' => 'varchar',
-        'length' => 255,
+        'length' => (int) 255,
         'not null' => TRUE,
         'default' => '',
       ],
       'user_ip' => [
         'description' => 'The IP the token has been generated for.',
         'type' => 'varchar',
-        'length' => 63,
+        'length' => (int) 63,
         'not null' => TRUE,
         'default' => '',
       ],

src/Controller/TokenController.php

@@ -13,8 +13,6 @@ use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Allow to manage token.
- *
- * @package Drupal\i18n_sso\Controller
  */
 class TokenController extends ControllerBase {
 
@@ -48,7 +46,7 @@ class TokenController extends ControllerBase {
   /**
    * {@inheritdoc}
    */
-  public static function create(ContainerInterface $container) : self {
+  public static function create(ContainerInterface $container): self {
     return new self(
       $container->get('i18n_sso.token'),
       $container->get('request_stack')
@@ -118,7 +116,7 @@ class TokenController extends ControllerBase {
     if (!empty($uid)) {
       /** @var \Drupal\user\UserInterface $user */
       $user = $this->entityTypeManager()->getStorage('user')->load($uid);
-      user_login_finalize($user);
+      \user_login_finalize($user);
       $data = [];
       $data['success'] = TRUE;
       $data['message'] = $this->t('You have been successfully logged in. Please wait for the page to refresh.');

src/EventSubscriber/SsoAllowOrigin.php

@@ -37,7 +37,7 @@ class SsoAllowOrigin implements EventSubscriberInterface {
    * @param \Symfony\Component\HttpKernel\Event\ResponseEvent $event
    *   The event.
    */
-  public function onRespond(ResponseEvent $event) : void {
+  public function onRespond(ResponseEvent $event): void {
     /** @var array $allowedDomains */
     $allowedDomains = $this->configFactory
       ->getEditable('language.negotiation')
@@ -52,9 +52,9 @@ class SsoAllowOrigin implements EventSubscriberInterface {
       return;
     }
 
-    $domain = str_replace('http://', '', $origin);
-    $domain = str_replace('https://', '', $domain);
-    if (in_array($domain, $allowedDomains)) {
+    $domain = \str_replace('http://', '', $origin);
+    $domain = \str_replace('https://', '', $domain);
+    if (\in_array($domain, $allowedDomains, TRUE)) {
       $response->headers->set('Access-Control-Allow-Origin', $origin);
       $response->headers->set('Access-Control-Allow-Headers', 'Accept,Origin,Content-Type,Cookie');
       $response->headers->set('Access-Control-Allow-Credentials', 'true');

src/Service/Token.php

@@ -15,12 +15,12 @@ class Token {
   /**
    * The table used to store the tokens.
    */
-  const TOKEN_TABLE = 'i18n_sso_tokens';
+  public const TOKEN_TABLE = 'i18n_sso_tokens';
 
   /**
    * The token lifetime.
    */
-  const TOKEN_LIFETIME = 60 * 10;
+  public const TOKEN_LIFETIME = 60 * 10;
 
   /**
    * The database connection.
@@ -64,13 +64,13 @@ class Token {
     $token = $this->connection->select(self::TOKEN_TABLE)
       ->fields(self::TOKEN_TABLE, ['token'])
       ->condition('user_ip', $user_ip, 'LIKE')
-      ->condition('uid', strval($uid), '=')
-      ->condition('expire', strval($this->datetime->getRequestTime()), '>');
+      ->condition('uid', (string) $uid, '=')
+      ->condition('expire', (string) ($this->datetime->getRequestTime()), '>');
     /** @var \Drupal\Core\Database\StatementInterface $result */
-    $result = $token->range(0, 1)->execute();
-    /** @var object $fetchedObject */
-    $fetchedObject = $result->fetchObject();
-    return $fetchedObject;
+    $result = $token->range(0, 1)
+      ->execute();
+    // @phpstan-ignore-next-line
+    return $result->fetchObject();
   }
 
   /**
@@ -91,7 +91,7 @@ class Token {
     $token['uid'] = $uid;
     $token['created'] = $this->datetime->getRequestTime();
     $sha1source = $token['created'] . $uid . $user_ip;
-    $token['token'] = sha1($sha1source);
+    $token['token'] = \sha1($sha1source);
     $token['user_ip'] = $user_ip;
     $token['expire'] = $this->datetime->getRequestTime() + self::TOKEN_LIFETIME;
     $this->connection
@@ -117,14 +117,13 @@ class Token {
       ->fields(self::TOKEN_TABLE, ['uid'])
       ->condition('user_ip', $user_ip, 'LIKE')
       ->condition('token', $token, 'LIKE')
-      ->condition('expire', strval($this->datetime->getRequestTime()), '>');
+      ->condition('expire', (string) ($this->datetime->getRequestTime()), '>');
     $result = $query->range(0, 1)->execute();
     if ($result) {
       return $result->fetchField();
     }
-    else {
-      return '';
-    }
+
+    return '';
   }
 
   /**
@@ -156,7 +155,7 @@ class Token {
    */
   public function deleteUserTokens($uid) {
     return $this->connection->delete(self::TOKEN_TABLE)
-      ->condition('uid', strval($uid), '=')
+      ->condition('uid', (string) $uid, '=')
       ->execute();
   }
 
@@ -168,7 +167,7 @@ class Token {
    */
   public function deleteExpiredTokens() {
     return $this->connection->delete(self::TOKEN_TABLE)
-      ->condition('expire', strval($this->datetime->getRequestTime()), '<')
+      ->condition('expire', (string) ($this->datetime->getRequestTime()), '<')
       ->execute();
   }