From 77a98134b83a9dfe44081641847ce2a842c05c24 Mon Sep 17 00:00:00 2001 From: wn_ Date: Mon, 1 Nov 2021 16:03:28 +0000 Subject: [PATCH] Address PHPStan warnings in 'classes/config.php'. ------ ----------------------------------------------------------------------- Line classes/config.php ------ ----------------------------------------------------------------------- 3 Constant Config::_ENVVAR_PREFIX is unused. 177 Constant Config::_DEFAULTS is unused. 237 Property Config::$schema_version is never read, only written. 352 Property Config::$migrations (Db_Migrations) in empty() is not falsy. ------ ----------------------------------------------------------------------- --- classes/config.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/classes/config.php b/classes/config.php index be4ecde36..53a31b61c 100644 --- a/classes/config.php +++ b/classes/config.php @@ -234,10 +234,9 @@ class Config { private static $instance; private $params = []; - private $schema_version = null; private $version = []; - /** @var Db_Migrations $migrations */ + /** @var Db_Migrations|null $migrations */ private $migrations; public static function get_instance() : Config { @@ -255,10 +254,10 @@ class Config { $ref = new ReflectionClass(get_class($this)); foreach ($ref->getConstants() as $const => $cvalue) { - if (isset($this::_DEFAULTS[$const])) { - $override = getenv($this::_ENVVAR_PREFIX . $const); + if (isset(self::_DEFAULTS[$const])) { + $override = getenv(self::_ENVVAR_PREFIX . $const); - list ($defval, $deftype) = $this::_DEFAULTS[$const]; + list ($defval, $deftype) = self::_DEFAULTS[$const]; $this->params[$cvalue] = [ self::cast_to($override !== false ? $override : $defval, $deftype), $deftype ]; } @@ -383,7 +382,7 @@ class Config { } private function _add(string $param, string $default, int $type_hint) { - $override = getenv($this::_ENVVAR_PREFIX . $param); + $override = getenv(self::_ENVVAR_PREFIX . $param); $this->params[$param] = [ self::cast_to($override !== false ? $override : $default, $type_hint), $type_hint ]; }