Upgrade project to PHP 8.3, add PHPStan, upgrade almost every dependency (#36)

* start updating to PHP 8.3

* taking off!

Co-authored-by: ErickSkrauch <erickskrauch@yandex.ru>
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

* dropped this

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

* migrate to symfonymailer

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

* this is so stupid 😭

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

* ah, free, at last.

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

* oh, Gabriel.

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

* now dawns thy reckoning.

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

* and thy gore shall GLISTEN before the temples of man.

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

* creature of steel.

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

* my gratitude upon thee for my freedom.

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

* but the crimes thy kind has committed against humanity

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

* Upgrade PHP-CS-Fixer and do fix the codebase

* First review round (maybe I have broken something)

* are NOT forgotten.

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

* Enable parallel PHP-CS-Fixer runner

* PHPStan level 1

* PHPStan level 2

* PHPStan level 3

* PHPStan level 4

* PHPStan level 5

* Levels 6 and 7 takes too much effort. Generate a baseline and fix them eventually

* Resolve TODO's related to the php-mock

* Drastically reduce baseline size with the Rector

* More code modernization with help of the Rector

* Update GitLab CI

---------

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
Co-authored-by: ErickSkrauch <erickskrauch@yandex.ru>

api/modules/session/models/HasJoinedForm.php

@@ -14,14 +14,11 @@ use yii\base\Model;
 
 class HasJoinedForm extends Model {
 
-    /**
-     * @var HasJoinedInterface
-     */
-    private $protocol;
-
-    public function __construct(HasJoinedInterface $protocol, array $config = []) {
+    public function __construct(
+        private readonly HasJoinedInterface $protocol,
+        array $config = [],
+    ) {
         parent::__construct($config);
-        $this->protocol = $protocol;
     }
 
     /**

api/modules/session/models/JoinForm.php

@@ -9,7 +9,6 @@ use api\modules\session\models\protocols\JoinInterface;
 use api\modules\session\Module as Session;
 use api\modules\session\validators\RequiredValidator;
 use api\rbac\Permissions as P;
-use Closure;
 use common\helpers\StringHelper;
 use common\models\Account;
 use Ramsey\Uuid\Uuid;
@@ -20,35 +19,32 @@ use yii\web\UnauthorizedHttpException;
 
 class JoinForm extends Model {
 
-    public $accessToken;
+    public mixed $accessToken = null;
 
-    public $selectedProfile;
+    public mixed $selectedProfile = null;
 
-    public $serverId;
+    public mixed $serverId = null;
 
     /**
      * @var Account|null
      */
-    private $account;
+    private ?Account $account = null;
 
-    /**
-     * @var JoinInterface
-     */
-    private $protocol;
-
-    public function __construct(JoinInterface $protocol, array $config = []) {
+    public function __construct(
+        private readonly JoinInterface $protocol,
+        array $config = [],
+    ) {
         parent::__construct($config);
-        $this->protocol = $protocol;
-        $this->accessToken = $protocol->getAccessToken();
-        $this->selectedProfile = $protocol->getSelectedProfile();
-        $this->serverId = $protocol->getServerId();
+        $this->accessToken = $this->protocol->getAccessToken();
+        $this->selectedProfile = $this->protocol->getSelectedProfile();
+        $this->serverId = $this->protocol->getServerId();
     }
 
     public function rules(): array {
         return [
             [['accessToken', 'serverId'], RequiredValidator::class],
-            [['accessToken', 'selectedProfile'], Closure::fromCallable([$this, 'validateUuid'])],
-            [['accessToken'], Closure::fromCallable([$this, 'validateAccessToken'])],
+            [['accessToken', 'selectedProfile'], $this->validateUuid(...)],
+            [['accessToken'], $this->validateAccessToken(...)],
         ];
     }
 
@@ -147,7 +143,7 @@ class JoinForm extends Model {
             throw new ForbiddenOperationException('Wrong selected_profile.');
         }
 
-        if (!$isUuid && mb_strtolower($account->username) !== mb_strtolower($selectedProfile)) {
+        if (!$isUuid && mb_strtolower($account->username) !== mb_strtolower((string)$selectedProfile)) {
             Session::error("User with access_token = '{$accessToken}' trying to join with identity = '{$selectedProfile}', but access_token issued to account with username = '{$account->username}'.");
             Yii::$app->statsd->inc('sessionserver.join.fail_username_mismatch');
 

api/modules/session/models/SessionModel.php

@@ -1,36 +1,35 @@
 <?php
+declare(strict_types=1);
+
 namespace api\modules\session\models;
 
 use common\models\Account;
 use Yii;
 
-class SessionModel {
+final readonly class SessionModel {
 
-    private const KEY_TIME = 120; // 2 min
+    private const int KEY_TIME = 120; // 2 min
 
-    public $username;
-
-    public $serverId;
-
-    public function __construct(string $username, string $serverId) {
-        $this->username = $username;
-        $this->serverId = $serverId;
+    public function __construct(
+        public string $username,
+        public string $serverId,
+    ) {
     }
 
     public static function find(string $username, string $serverId): ?self {
-        $key = static::buildKey($username, $serverId);
+        $key = self::buildKey($username, $serverId);
         $result = Yii::$app->redis->get($key);
         if (!$result) {
             return null;
         }
 
-        $data = json_decode($result, true);
+        $data = json_decode((string)$result, true);
 
-        return new static($data['username'], $data['serverId']);
+        return new self($data['username'], $data['serverId']);
     }
 
-    public function save() {
-        $key = static::buildKey($this->username, $this->serverId);
+    public function save(): mixed {
+        $key = self::buildKey($this->username, $this->serverId);
         $data = json_encode([
             'username' => $this->username,
             'serverId' => $this->serverId,
@@ -39,15 +38,15 @@ class SessionModel {
         return Yii::$app->redis->setex($key, self::KEY_TIME, $data);
     }
 
-    public function delete() {
-        return Yii::$app->redis->del(static::buildKey($this->username, $this->serverId));
+    public function delete(): mixed {
+        return Yii::$app->redis->del(self::buildKey($this->username, $this->serverId));
     }
 
     public function getAccount(): ?Account {
         return Account::findOne(['username' => $this->username]);
     }
 
-    protected static function buildKey($username, $serverId): string {
+    protected static function buildKey(string $username, string $serverId): string {
         return md5('minecraft:join-server:' . mb_strtolower($username) . ':' . $serverId);
     }
 

api/modules/session/models/protocols/BaseHasJoined.php

@@ -3,9 +3,9 @@ namespace api\modules\session\models\protocols;
 
 abstract class BaseHasJoined implements HasJoinedInterface {
 
-    private $username;
+    private readonly string $username;
 
-    private $serverId;
+    private readonly string $serverId;
 
     public function __construct(string $username, string $serverId) {
         $this->username = trim($username);
@@ -21,11 +21,7 @@ abstract class BaseHasJoined implements HasJoinedInterface {
     }
 
     public function validate(): bool {
-        return !$this->isEmpty($this->username) && !$this->isEmpty($this->serverId);
-    }
-
-    private function isEmpty($value): bool {
-        return $value === null || $value === '';
+        return $this->username !== '' && $this->serverId !== '';
     }
 
 }

api/modules/session/models/protocols/LegacyJoin.php

@@ -3,15 +3,15 @@ namespace api\modules\session\models\protocols;
 
 class LegacyJoin extends BaseJoin {
 
-    private $user;
+    private readonly string $user;
 
-    private $sessionId;
+    private string $sessionId;
 
-    private $serverId;
+    private readonly string $serverId;
 
     private $accessToken;
 
-    private $uuid;
+    private ?string $uuid = null;
 
     public function __construct(string $user, string $sessionId, string $serverId) {
         $this->user = trim($user);
@@ -46,7 +46,7 @@ class LegacyJoin extends BaseJoin {
      * Split by ':' to take into account authorization in modern launchers and login to an legacy version of the game.
      * The sessionId is passed on as "token:{accessToken}:{uuid}", so it needs to be processed
      */
-    private function parseSessionId(string $sessionId) {
+    private function parseSessionId(string $sessionId): void {
         $parts = explode(':', $sessionId);
         if (count($parts) === 3) {
             $this->accessToken = $parts[1];

api/modules/session/models/protocols/ModernJoin.php

@@ -3,11 +3,11 @@ namespace api\modules\session\models\protocols;
 
 class ModernJoin extends BaseJoin {
 
-    private $accessToken;
+    private readonly string $accessToken;
 
-    private $selectedProfile;
+    private readonly string $selectedProfile;
 
-    private $serverId;
+    private readonly string $serverId;
 
     public function __construct(string $accessToken, string $selectedProfile, string $serverId) {
         $this->accessToken = trim($accessToken);