From e5966e575af96c96b530284eb360095f460d5828 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 12 Nov 2021 21:14:21 +0300 Subject: use nullable types for some class properties instead of phpdoc hints --- classes/config.php | 6 ++---- classes/db.php | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/classes/config.php b/classes/config.php index e71f314..2fec4e0 100644 --- a/classes/config.php +++ b/classes/config.php @@ -26,8 +26,7 @@ class Config { Config::SESSION_NAME => [ "epube_sid", Config::T_STRING ], ]; - /** @var Config|null */ - private static $instance; + private static ?Config $instance = null; /** @var array> */ private array $params = []; @@ -35,8 +34,7 @@ class Config { /** @var array */ private array $version = []; - /** @var Db_Migrations|null */ - private $migrations; + private Db_Migrations $migrations; public static function get_instance() : Config { if (self::$instance == null) diff --git a/classes/db.php b/classes/db.php index d815095..42422b2 100644 --- a/classes/db.php +++ b/classes/db.php @@ -1,7 +1,6 @@