type hint all the things

.github/workflows/ci.yaml

@@ -5,7 +5,7 @@ name: CI
 jobs:
   php-cs-fixer:
     name: PHP-CS-Fixer
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@master
       - name: PHP-CS-Fixer
@@ -15,7 +15,7 @@ jobs:
 
   phpstan:
     name: PHPStan Static Analysis
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v2
@@ -23,10 +23,10 @@ jobs:
       - uses: php-actions/phpstan@v1
         with:
           error_format: github
-          args: --level 5 src
+          args: --level 6 src
 
   phpunit:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     name: Unit tests
 
     services:

composer.json

@@ -7,7 +7,9 @@
 	"koraktor/steam-condenser": "^1.3",
 	"guzzlehttp/guzzle": "^6.5",
 	"doctrine/dbal": "^2.12",
-        "ext-pdo": "*"
+	"ext-pdo": "*",
+	"ext-json": "*",
+	"ext-apcu": "*"
   },
   "autoload": {
 	"files": [

src/Container.php

@@ -24,17 +24,17 @@ use flight\net\Response;
 use RandomLib\Generator;
 
 class Container {
-    private $connection;
+    private Connection $connection;
-    private $generator;
+    private Generator $generator;
-    private $baseUrl;
+    private string $baseUrl;
-    private $parserPath;
+    private string $parserPath;
-    private $storeRoot;
+    private string $storeRoot;
-    private $storeUrl;
+    private string $storeUrl;
-    private $apiRoot;
+    private string $apiRoot;
-    private $editKey;
+    private string $editKey;
-    private $request;
+    private Request $request;
-    private $response;
+    private Response $response;
-    private $uploadKey;
+    private string $uploadKey;
 
     public function __construct(
         Request $request,

src/Controllers/AuthController.php

@@ -13,20 +13,10 @@ use flight\net\Response;
 use SteamId;
 
 class AuthController extends BaseController {
-    /**
+    private UserProvider $userProvider;
-     * @var UserProvider
+    private AuthProvider $authProvider;
-     */
+    private string $host;
-    private $userProvider;
+    private string $apiRoot;
-
-    /**
-     * @var AuthProvider
-     */
-    private $authProvider;
-
-    /** @var string */
-    private $host;
-
-    private $apiRoot;
 
     public function __construct(
         Request $request,
@@ -43,11 +33,11 @@ class AuthController extends BaseController {
         $this->apiRoot = $apiRoot;
     }
 
-    public function token() {
+    public function token(): void {
         echo $this->authProvider->generateToken();
     }
 
-    public function get($token) {
+    public function get(string $token): void {
         $userData = $this->authProvider->getUser($token);
         Flight::json([
             'token' => $token,
@@ -57,14 +47,14 @@ class AuthController extends BaseController {
         ]);
     }
 
-    public function login($token) {
+    public function login(string $token): void {
         $_SESSION['return'] = $this->query('return', 'https://' . $this->host);
         $steam = new SteamLogin();
         $url = $steam->url($this->apiRoot . '/auth/handle/' . urlencode($token), $this->apiRoot);
         Flight::redirect(str_replace('&', '&', $url)); // headers make no sense
     }
 
-    public function logout($token) {
+    public function logout(string $token): void {
         $this->authProvider->logout($token);
         Flight::json([
             'token' => $token,
@@ -74,7 +64,7 @@ class AuthController extends BaseController {
         ]);
     }
 
-    public function handle($token) {
+    public function handle(string $token): void {
         $return = $_SESSION['return'] ?? 'https://' . $this->host;
         unset($_SESSION['return']);
         $steam = new SteamLogin();

src/Controllers/BaseController.php

@@ -8,32 +8,48 @@ use flight\net\Request;
 use flight\net\Response;
 
 class BaseController {
-    private $request;
+    private Request $request;
-    private $response;
+    private Response $response;
 
     public function __construct(Request $request, Response $response) {
         $this->request = $request;
         $this->response = $response;
     }
 
-    protected function query($name, $default) {
+    /**
+     * @return string[]|string
+     */
+    protected function query(string $name, string $default) {
         return $this->request->query[$name] ?? $default;
     }
 
-    protected function file($name) {
+    /**
+     * @return string[]|null
+     */
+    protected function file(string $name): ?array {
         return $this->request->files[$name];
     }
 
-    protected function post($name, $default = null) {
+    protected function post(string $name, string $default): string {
         return $this->request->data[$name] ?? $default;
     }
 
-    protected function json($data, $code = 200, $encode = true, $charset = 'utf-8', $option = 0) {
+    /**
+     * @param mixed $data
+     *
+     * @throws \Exception
+     */
+    protected function json(
+        $data,
+        int $code = 200,
+        bool $encode = true,
+        string $charset = 'utf-8',
+        int $option = 0
+    ): void {
         $json = ($encode) ? json_encode($data, $option) : $data;
 
-        $this->response
+        $this->response->status($code);
-            ->status($code)
+        $this->response->header('Content-Type', 'application/json; charset=' . $charset)
-            ->header('Content-Type', 'application/json; charset=' . $charset)
             ->write($json)
             ->send();
     }

src/Controllers/DemoController.php

@@ -14,17 +14,11 @@ use flight\net\Request;
 use flight\net\Response;
 
 class DemoController extends BaseController {
-    /** @var DemoProvider */
+    private DemoProvider $demoProvider;
-    private $demoProvider;
+    private ChatProvider $chatProvider;
-
+    private DemoListProvider $demoListProvider;
-    /** @var ChatProvider */
+    private string $editKey;
-    private $chatProvider;
+    private DemoStore $store;
-
-    private $demoListProvider;
-
-    private $editKey;
-
-    private $store;
 
     public function __construct(
         Request $request,
@@ -43,14 +37,14 @@ class DemoController extends BaseController {
         $this->editKey = $editKey;
     }
 
-    /**
+    public function get(string $id): void {
-     * @param string $id
-     */
-    public function get($id) {
         $this->json($this->demoProvider->get(\intval($id, 10)));
     }
 
-    protected function getFilter() {
+    /**
+     * @return array<mixed>
+     */
+    protected function getFilter(): array {
         $map = $this->query('map', '');
         $players = $this->query('players', '');
         $type = $this->query('type', '');
@@ -110,29 +104,29 @@ class DemoController extends BaseController {
         return $filter;
     }
 
-    public function listDemos() {
+    public function listDemos(): void {
-        $page = $this->query('page', 1);
+        $page = (int) $this->query('page', '1');
         $order = 'ASC' === $this->query('order', 'DESC') ? 'ASC' : 'DESC';
         $this->json($this->demoListProvider->listDemos((int) $page, $this->getFilter(), $order));
     }
 
-    public function listProfile($steamId) {
+    public function listProfile(string $steamId): void {
-        $page = $this->query('page', 1);
+        $page = (int) $this->query('page', '1');
         $where = $this->getFilter();
         $where['players'][] = $steamId;
         $this->json($this->demoListProvider->listProfile((int) $page, $where));
     }
 
-    public function listUploads($steamId) {
+    public function listUploads(string $steamId): void {
-        $page = $this->query('page', 1);
+        $page = (int) $this->query('page', '1');
         $this->json($this->demoListProvider->listUploads($steamId, (int) $page, $this->getFilter()));
     }
 
-    public function chat($demoId) {
+    public function chat(string $demoId): void {
         $this->json($this->chatProvider->getChat((int) $demoId));
     }
 
-    public function setDemoUrl($id) {
+    public function setDemoUrl(string $id): void {
         $hash = (string) $this->post('hash', '');
         $backend = (string) $this->post('backend', '');
         $path = (string) $this->post('path', '');

src/Controllers/InfoController.php

@@ -10,19 +10,18 @@ use flight\net\Request;
 use flight\net\Response;
 
 class InfoController extends BaseController {
-    /** @var InfoProvider */
+    private InfoProvider $infoProvider;
-    private $infoProvider;
 
     public function __construct(Request $request, Response $response, InfoProvider $infoProvider) {
         parent::__construct($request, $response);
         $this->infoProvider = $infoProvider;
     }
 
-    public function listMaps() {
+    public function listMaps(): void {
         Flight::json($this->infoProvider->listMaps());
     }
 
-    public function stats() {
+    public function stats(): void {
         Flight::json($this->infoProvider->getStats());
     }
 }

src/Controllers/UploadController.php

@@ -4,22 +4,19 @@ declare(strict_types=1);
 
 namespace Demostf\API\Controllers;
 
-use Demostf\API\Error\InvalidKeyException;
 use Demostf\API\Providers\UploadProvider;
-use Exception;
-use Flight;
 use flight\net\Request;
 use flight\net\Response;
 
 class UploadController extends BaseController {
-    private $uploadProvider;
+    private UploadProvider $uploadProvider;
 
     public function __construct(Request $request, Response $response, UploadProvider $uploadProvider) {
         parent::__construct($request, $response);
         $this->uploadProvider = $uploadProvider;
     }
 
-    public function upload() {
+    public function upload(): void {
         $key = (string) $this->post('key', '');
         $red = (string) $this->post('red', 'RED');
         $blu = (string) $this->post('blu', 'BLU');

src/Controllers/UserController.php

@@ -12,17 +12,14 @@ use flight\net\Response;
 use InvalidArgumentException;
 
 class UserController extends BaseController {
-    /**
+    private UserProvider $userProvider;
-     * @var UserProvider
-     */
-    private $userProvider;
 
     public function __construct(Request $request, Response $response, UserProvider $userProvider) {
         parent::__construct($request, $response);
         $this->userProvider = $userProvider;
     }
 
-    public function get($steamId) {
+    public function get(string $steamId): void {
         if (!is_numeric($steamId)) {
             try {
                 $steamId = Parser::convertSteamIdToCommunityId($steamId);
@@ -36,7 +33,7 @@ class UserController extends BaseController {
         Flight::json($this->userProvider->get($steamId));
     }
 
-    public function search() {
+    public function search(): void {
         $query = $this->query('query', '');
         Flight::json($this->userProvider->search($query));
     }

src/Data/DemoPlayer.php

@@ -7,26 +7,16 @@ namespace Demostf\API\Data;
 use JsonSerializable;
 
 class DemoPlayer implements JsonSerializable {
-    /** @var int */
+    private int $id;
-    private $id;
+    private int $userId;
-    /** @var int */
+    private string $name;
-    private $userId;
+    private string $team;
-    /** @var string */
+    private string $class;
-    private $name;
+    private string $steamId;
-    /** @var string */
+    private string $avatar;
-    private $team;
+    private int $kills;
-    /** @var string */
+    private int $assists;
-    private $class;
+    private int $deaths;
-    /** @var string */
-    private $steamId;
-    /** @var string */
-    private $avatar;
-    /** @var int */
-    private $kills;
-    /** @var int */
-    private $assists;
-    /** @var int */
-    private $deaths;
 
     public function __construct(int $id, int $userId, string $name, string $team, string $class, string $steamId, string $avatar, int $kills, int $assists, int $deaths) {
         $this->id = $id;
@@ -81,7 +71,12 @@ class DemoPlayer implements JsonSerializable {
         return $this->deaths;
     }
 
-    public static function fromRow($row): self {
+    /**
+     * @param mixed[] $row
+     *
+     * @return DemoPlayer
+     */
+    public static function fromRow(array $row): self {
         return new self(
             $row['id'],
             $row['user_id'],

src/Data/Kill.php

@@ -5,17 +5,12 @@ declare(strict_types=1);
 namespace Demostf\API\Data;
 
 class Kill {
-    private $id;
+    private int $id;
-
+    private int $demoId;
-    private $demoId;
+    private int $attackerId;
-
+    private int $assisterId;
-    private $attackerId;
+    private int $victimId;
-
+    private string $weapon;
-    private $assisterId;
-
-    private $victimId;
-
-    private $weapon;
 
     public function __construct(int $id, int $demoId, int $attackerId, int $assisterId, int $victimId, string $weapon) {
         $this->id = $id;

src/Data/ParsedDemo.php

@@ -7,16 +7,14 @@ namespace Demostf\API\Data;
 use Demostf\API\Demo\ChatMessage;
 
 class ParsedDemo {
-    /** @var int */
+    private int $redScore;
-    private $redScore;
+    private int $blueScore;
-    /** @var int */
-    private $blueScore;
     /** @var ChatMessage[] */
-    private $chat;
+    private array $chat;
     /** @var ParsedPlayer[] */
-    private $players;
+    private array $players;
     /** @var ParsedKill[] */
-    private $kills;
+    private array $kills;
 
     /**
      * ParsedDemo constructor.

src/Data/ParsedKill.php

@@ -5,13 +5,10 @@ declare(strict_types=1);
 namespace Demostf\API\Data;
 
 class ParsedKill {
-    private $attackerDemoId;
+    private int $attackerDemoId;
-
+    private int $assisterDemoId;
-    private $assisterDemoId;
+    private int $victimDemoId;
-
+    private string $weapon;
-    private $victimDemoId;
-
-    private $weapon;
 
     public function __construct(int $attackerDemoId, int $assisterDemoId, int $victimDemoId, string $weapon) {
         $this->attackerDemoId = $attackerDemoId;

src/Data/ParsedPlayer.php

@@ -5,16 +5,11 @@ declare(strict_types=1);
 namespace Demostf\API\Data;
 
 class ParsedPlayer {
-    /** @var string */
+    private string $name;
-    private $name;
+    private int $demoUserId;
-    /** @var int */
+    private string $steamId;
-    private $demoUserId;
+    private string $team;
-    /** @var string */
+    private string $class;
-    private $steamId;
-    /** @var string */
-    private $team;
-    /** @var string` */
-    private $class;
 
     public function __construct(string $name, int $demoUserId, string $steamId, string $team, string $class) {
         $this->name = $name;

src/Data/Player.php

@@ -5,26 +5,13 @@ declare(strict_types=1);
 namespace Demostf\API\Data;
 
 class Player {
-    /** @var int */
+    private int $id;
-    private $id;
+    private int $demoId;
-
+    private int $demoUserId;
-    /** @var int */
+    private int $userId;
-    private $demoId;
+    private string $name;
-
+    private string $team;
-    /** @var int */
+    private string $class;
-    private $demoUserId;
-
-    /** @var int */
-    private $userId;
-
-    /** @var string */
-    private $name;
-
-    /** @var string */
-    private $team;
-
-    /** @var string */
-    private $class;
 
     public function __construct(int $id, int $demoId, int $demoUserId, int $userId, string $name, string $team, string $class) {
         $this->id = $id;

src/Data/SteamUser.php

@@ -40,6 +40,11 @@ class SteamUser implements JsonSerializable {
         ];
     }
 
+    /**
+     * @param mixed[] $row
+     *
+     * @return SteamUser
+     */
     public static function fromRow(array $row): self {
         return new self(
             (int) $row['id'],

src/Data/StoredDemo.php

@@ -5,12 +5,9 @@ declare(strict_types=1);
 namespace Demostf\API\Data;
 
 class StoredDemo {
-    /** @var string */
+    private string $url;
-    private $url;
+    private string $backend;
-    /** @var string */
+    private string $path;
-    private $backend;
-    /** @var string */
-    private $path;
 
     public function __construct(string $url, string $backend, string $path) {
         $this->url = $url;

src/Data/Upload.php

@@ -5,16 +5,11 @@ declare(strict_types=1);
 namespace Demostf\API\Data;
 
 class Upload {
-    /** @var string */
+    private string $name;
-    private $name;
+    private string $red;
-    /** @var string */
+    private string $blue;
-    private $red;
+    private int $uploaderId;
-    /** @var string */
+    private string $hash;
-    private $blue;
-    /** @var int */
-    private $uploaderId;
-    /** @var string */
-    private $hash;
 
     public function __construct(string $name, string $red, string $blue, int $uploaderId, string $hash) {
         $this->name = $name;

src/Data/User.php

@@ -7,16 +7,11 @@ namespace Demostf\API\Data;
 use JsonSerializable;
 
 class User implements JsonSerializable {
-    /** @var int */
+    private int $id;
-    private $id;
+    private string $steamId;
-    /** @var string */
+    private string $name;
-    private $steamId;
+    private string $avatar;
-    /** @var string */
+    private string $token;
-    private $name;
-    /** @var string */
-    private $avatar;
-    /** @var string */
-    private $token;
 
     public function __construct(int $id, string $steamId, string $name, string $avatar, string $token) {
         $this->id = $id;
@@ -55,6 +50,11 @@ class User implements JsonSerializable {
         ];
     }
 
+    /**
+     * @param mixed[] $row
+     *
+     * @return User
+     */
     public static function fromRow(array $row): self {
         return new self(
             (int) $row['id'],

src/Demo/Demo.php

@@ -10,44 +10,26 @@ use Demostf\API\Data\User;
 use JsonSerializable;
 
 class Demo implements JsonSerializable {
-    /** @var int */
+    private int $id;
-    private $id;
+    private string $url;
-    /** @var string */
+    private string $name;
-    private $url;
+    private string $server;
-    /** @var string */
+    private float $duration;
-    private $name;
+    private string $nick;
-    /** @var string */
+    private string $map;
-    private $server;
+    private DateTime $time;
-    /** @var float */
+    private string $red;
-    private $duration;
+    private string $blue;
-    /** @var string */
+    private int $redScore;
-    private $nick;
+    private int $blueScore;
-    /** @var string */
+    private int $playerCount;
-    private $map;
+    private int $uploader;
-    /** @var DateTime */
+    private ?User $uploaderUser;
-    private $time;
-    /** @var string */
-    private $red;
-    /** @var string */
-    private $blue;
-    /** @var int */
-    private $redScore;
-    /** @var int */
-    private $blueScore;
-    /** @var int */
-    private $playerCount;
-    /** @var int */
-    private $uploader;
-    /** @var User|null */
-    private $uploaderUser;
     /** @var DemoPlayer[] */
-    private $players;
+    private array $players;
-    /** @var string */
+    private string $hash;
-    private $hash;
+    private string $backend;
-    /** @var string */
+    private string $path;
-    private $backend;
-    /** @var string */
-    private $path;
 
     public function __construct(
         int $id,
@@ -85,6 +67,7 @@ class Demo implements JsonSerializable {
         $this->hash = $hash;
         $this->backend = $backend;
         $this->path = $path;
+        $this->players = [];
     }
 
     public function getId(): int {
@@ -147,11 +130,16 @@ class Demo implements JsonSerializable {
         return $this->uploaderUser;
     }
 
-    public function setUploaderUser(User $uploaderUser) {
+    public function setUploaderUser(User $uploaderUser): void {
         $this->uploaderUser = $uploaderUser;
     }
 
-    public static function fromRow($row): self {
+    /**
+     * @param mixed[] $row
+     *
+     * @return Demo
+     */
+    public static function fromRow(array $row): self {
         return new self(
             (int) $row['id'],
             $row['url'],
@@ -180,7 +168,10 @@ class Demo implements JsonSerializable {
         return $this->players;
     }
 
-    public function setPlayers(array $players) {
+    /**
+     * @param DemoPlayer[] $players
+     */
+    public function setPlayers(array $players): void {
         $this->players = $players;
     }
 

src/Demo/DemoSaver.php

@@ -18,17 +18,12 @@ use Demostf\API\Providers\UserProvider;
 use Doctrine\DBAL\Connection;
 
 class DemoSaver {
-    /** @var KillProvider */
+    private KillProvider $killProvider;
-    private $killProvider;
+    private PlayerProvider $playerProvider;
-    /** @var PlayerProvider */
+    private ChatProvider $chatProvider;
-    private $playerProvider;
+    private UserProvider $userProvider;
-    /** @var ChatProvider */
+    private DemoProvider $demoProvider;
-    private $chatProvider;
+    private Connection $connection;
-    /** @var UserProvider */
-    private $userProvider;
-    /** @var DemoProvider */
-    private $demoProvider;
-    private $connection;
 
     public function __construct(
         KillProvider $killProvider,

src/Demo/DemoStore.php

@@ -40,7 +40,7 @@ class DemoStore {
         return 'https://' . $this->webRoot . $this->getPrefix($name) . $name;
     }
 
-    public function remove(Demo $demo) {
+    public function remove(Demo $demo): void {
         if (file_exists($demo->getPath())) {
             unlink($demo->getPath());
         }

src/Demo/Header.php

@@ -133,7 +133,12 @@ class Header {
         return $this->version;
     }
 
-    public static function fromArray(array $info) {
+    /**
+     * @param mixed[] $info
+     *
+     * @return Header
+     */
+    public static function fromArray(array $info): self {
         return new self(
             $info['type'],
             $info['version'],

src/Demo/Parser.php

@@ -44,6 +44,11 @@ class Parser {
         }
     }
 
+    /**
+     * @param mixed[] $data
+     *
+     * @throws Exception
+     */
     private function handleData(array $data): ParsedDemo {
         $intervalPerTick = $data['intervalPerTick'];
         $red = 0;

src/Demo/RawParser.php

@@ -22,6 +22,8 @@ class RawParser {
 
     /**
      * @throws Exception
+     *
+     * @return mixed[]|null
      */
     public function parse(string $path): ?array {
         try {

src/Providers/AuthProvider.php

@@ -23,7 +23,7 @@ class AuthProvider extends BaseProvider {
         return $this->generator->generateString(32, Generator::CHAR_ALNUM);
     }
 
-    public function setUser(string $token, SteamId $steamid, string $key) {
+    public function setUser(string $token, SteamId $steamid, string $key): void {
         apcu_store($token, [
             'name' => $steamid->getNickname(),
             'steamid' => $steamid->getSteamId64(),
@@ -31,14 +31,17 @@ class AuthProvider extends BaseProvider {
         ]);
     }
 
-    public function getUser(string $token) {
+    /**
+     * @return (string|null)[]
+     */
+    public function getUser(string $token): array {
         $found = true;
         $result = apcu_fetch($token, $found);
 
         return $found ? $result : ['name' => null, 'steamid' => null, 'key' => null];
     }
 
-    public function logout($token) {
+    public function logout(string $token): void {
         apcu_delete($token);
     }
 }

src/Providers/BaseProvider.php

@@ -8,10 +8,7 @@ use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Query\QueryBuilder;
 
 class BaseProvider {
-    /**
+    protected Connection $connection;
-     * @var Connection
-     */
-    protected $connection;
 
     /**
      * BaseProvider constructor.
@@ -27,13 +24,6 @@ class BaseProvider {
         $this->connection = $connection;
     }
 
-    protected function query(string $sql, array $params = []) {
-        $query = $this->connection->prepare($sql);
-        $query->execute($params);
-
-        return $query;
-    }
-
     /**
      * @return QueryBuilder
      */

src/Providers/ChatProvider.php

@@ -8,7 +8,10 @@ use Demostf\API\Demo\ChatMessage;
 use PDO;
 
 class ChatProvider extends BaseProvider {
-    public function getChat(int $demoId) {
+    /**
+     * @return ChatMessage[]
+     */
+    public function getChat(int $demoId): array {
         $query = $this->getQueryBuilder();
         $query->select('text', '"from"', 'time')
             ->from('chat')
@@ -26,7 +29,7 @@ class ChatProvider extends BaseProvider {
         }, $result->fetchAll());
     }
 
-    public function storeChatMessage(int $demoId, ChatMessage $message) {
+    public function storeChatMessage(int $demoId, ChatMessage $message): void {
         $query = $this->getQueryBuilder();
         $query->insert('chat')
             ->values([

src/Providers/DemoListProvider.php

@@ -10,6 +10,13 @@ use Doctrine\DBAL\Query\QueryBuilder;
 use PDO;
 
 class DemoListProvider extends BaseProvider {
+    /**
+     * @param mixed[] $where
+     *
+     * @throws \Doctrine\DBAL\Exception
+     *
+     * @return Demo[]
+     */
     public function listUploads(string $steamId, int $page, array $where = []) {
         $query = $this->getQueryBuilder();
         $query->select('id')
@@ -25,11 +32,19 @@ class DemoListProvider extends BaseProvider {
         return $this->listDemos($page, $where);
     }
 
-    public function listProfile(int $page, array $where = []) {
+    /**
+     * @param mixed[] $where
+     *
+     * @throws \Doctrine\DBAL\Exception
+     *
+     * @return Demo[]
+     */
+    public function listProfile(int $page, array $where = []): array {
         $query = $this->getQueryBuilder();
         $query->select('id')
             ->from('users')
-            ->where($query->expr()->in('steamid', $query->createNamedParameter($where['players'], Connection::PARAM_STR_ARRAY)));
+            ->where($query->expr()->in('steamid',
+                $query->createNamedParameter($where['players'], Connection::PARAM_STR_ARRAY)));
         unset($where['players']);
         $result = $query->execute();
         $userIds = $result->fetchAll(PDO::FETCH_COLUMN);
@@ -73,7 +88,10 @@ class DemoListProvider extends BaseProvider {
         return $this->formatList($query->execute()->fetchAll());
     }
 
-    private function addWhere(QueryBuilder $query, array $where = []) {
+    /**
+     * @param mixed[] $where
+     */
+    private function addWhere(QueryBuilder $query, array $where = []): void {
         if (isset($where['map'])) {
             $query->andWhere($query->expr()->orX(
                 $query->expr()->eq('clean_map_name(map)', $query->createNamedParameter($where['map'])),
@@ -103,9 +121,13 @@ class DemoListProvider extends BaseProvider {
     }
 
     /**
+     * @param mixed[] $where
+     *
+     * @throws \Doctrine\DBAL\Exception
+     *
      * @return Demo[]
      */
-    public function listDemos(int $page, array $where = [], string $order = 'DESC') {
+    public function listDemos(int $page, array $where = [], string $order = 'DESC'): array {
         if (isset($where['players']) and \is_array($where['players']) and \count($where['players']) > 0) {
             return $this->listProfile($page, $where);
         }
@@ -127,7 +149,12 @@ class DemoListProvider extends BaseProvider {
         return $this->formatList($demos);
     }
 
-    protected function formatList(array $rows) {
+    /**
+     * @param array[] $rows
+     *
+     * @return Demo[]
+     */
+    protected function formatList(array $rows): array {
         return array_map(function ($row) {
             return Demo::fromRow($row);
         }, $rows);

src/Providers/DemoProvider.php

@@ -13,7 +13,7 @@ use PDO;
 class DemoProvider extends BaseProvider {
     const VERSION = 4;
 
-    private $userProvider;
+    private UserProvider $userProvider;
 
     public function __construct(Connection $connection, UserProvider $userProvider) {
         parent::__construct($connection);
@@ -49,7 +49,7 @@ class DemoProvider extends BaseProvider {
 
         if ($fetchDetails) {
             $uploader = $this->userProvider->getById($demo->getUploader());
-            $playerQuery = $this->query($sql, [$demo->getId(), $demo->getId()]);
+            $playerQuery = $this->connection->executeQuery($sql, [$demo->getId(), $demo->getId()]);
             $players = $playerQuery->fetchAll(PDO::FETCH_ASSOC);
 
             $demo->setUploaderUser($uploader);
@@ -105,7 +105,7 @@ class DemoProvider extends BaseProvider {
         return (int) $this->connection->lastInsertId();
     }
 
-    public function setDemoUrl(int $id, string $backend, string $url, string $path) {
+    public function setDemoUrl(int $id, string $backend, string $url, string $path): void {
         $query = $this->getQueryBuilder();
         $query->update('demos')
             ->set('backend', $query->createNamedParameter($backend))

src/Providers/InfoProvider.php

@@ -7,7 +7,10 @@ namespace Demostf\API\Providers;
 use PDO;
 
 class InfoProvider extends BaseProvider {
-    public function listMaps() {
+    /**
+     * @return string[]
+     */
+    public function listMaps(): array {
         $query = $this->getQueryBuilder();
         $query->select('map', 'count')
             ->from('map_list');
@@ -24,7 +27,10 @@ class InfoProvider extends BaseProvider {
         return $query->execute()->fetch(PDO::FETCH_COLUMN);
     }
 
-    public function getStats() {
+    /**
+     * @return int[]
+     */
+    public function getStats(): array {
         $demoCount = $this->count('demos');
         $playerCount = $this->count('users');
 

src/Providers/UploadProvider.php

@@ -13,25 +13,16 @@ use Demostf\API\Demo\HeaderParser;
 use Demostf\API\Demo\Parser;
 use Demostf\API\Error\InvalidKeyException;
 use Doctrine\DBAL\Connection;
-use RandomLib\Generator;
 
 class UploadProvider extends BaseProvider {
-    /** @var Generator */
+    private HeaderParser $headerParser;
-    private $generator;
+    private Parser $parser;
-    /** @var HeaderParser */
+    private DemoStore $store;
-    private $headerParser;
+    private UserProvider $userProvider;
-    /** @var Parser */
+    private DemoProvider $demoProvider;
-    private $parser;
+    private DemoSaver $demoSaver;
-    /** @var DemoStore */
+    private string $baseUrl;
-    private $store;
+    private string $uploadKey;
-    /** @var UserProvider */
-    private $userProvider;
-    /** @var DemoProvider */
-    private $demoProvider;
-    /** @var DemoSaver */
-    private $demoSaver;
-    private $baseUrl;
-    private $uploadKey;
 
     public function __construct(
         Connection $db,
@@ -97,7 +88,7 @@ class UploadProvider extends BaseProvider {
         return 'STV available at: ' . $this->baseUrl . '/' . $id;
     }
 
-    public function validateHeader(int $size, Header $header) {
+    public function validateHeader(int $size, Header $header): ?string {
         if ($size < 1024) {
             return 'Demos needs to be at least 1KB is size';
         }
@@ -113,7 +104,7 @@ class UploadProvider extends BaseProvider {
         return null;
     }
 
-    public function validateParsed(Header $header, ParsedDemo $parsedDemo) {
+    public function validateParsed(Header $header, ParsedDemo $parsedDemo): ?string {
         $rounds = $parsedDemo->getRedScore() + $parsedDemo->getBlueScore();
         if (0 === $rounds && $header->getDuration() < (15 * 60)) {
             return 'Demos must be at least 5 minutes long';

src/Providers/UserProvider.php

@@ -171,7 +171,7 @@ class UserProvider extends BaseProvider {
         return $row ? User::fromRow($row) : null;
     }
 
-    public function getUserId(string $steamId) {
+    public function getUserId(string $steamId): int {
         $existing = $this->get($steamId);
         if ($existing) {
             return $existing->getId();

src/init.php

@@ -22,6 +22,7 @@ $connectionParams = [
 if ('pgsql' === $connectionParams['driver']) {
     $connectionParams['driver'] = 'pdo_pgsql';
 }
+/** @phpstan-ignore-next-line */
 $db = DriverManager::getConnection($connectionParams);
 $host = getenv('BASE_HOST') ?: '';
 $storeRoot = getenv('DEMO_ROOT') ?: '';