diff --git a/system/Model.php b/system/Model.php index 307d66a52cb6..2c9230a90ca0 100644 --- a/system/Model.php +++ b/system/Model.php @@ -146,9 +146,7 @@ class Model extends BaseModel public function __construct(?ConnectionInterface $db = null, ?ValidationInterface $validation = null) { - /** - * @var BaseConnection|null $db - */ + /** @var BaseConnection $db */ $db ??= Database::connect($this->DBGroup); $this->db = $db; diff --git a/utils/phpstan-baseline/loader.neon b/utils/phpstan-baseline/loader.neon index b277717823bf..91d2bdc61339 100644 --- a/utils/phpstan-baseline/loader.neon +++ b/utils/phpstan-baseline/loader.neon @@ -1,4 +1,4 @@ -# total 2116 errors +# total 2117 errors includes: - argument.type.neon diff --git a/utils/phpstan-baseline/return.type.neon b/utils/phpstan-baseline/return.type.neon index 40b214c3fce9..b181bcabebd9 100644 --- a/utils/phpstan-baseline/return.type.neon +++ b/utils/phpstan-baseline/return.type.neon @@ -1,7 +1,12 @@ -# total 1 error +# total 2 errors parameters: ignoreErrors: + - + message: '#^Method CodeIgniter\\Database\\BaseBuilder\:\:cleanClone\(\) should return \$this\(CodeIgniter\\Database\\BaseBuilder\) but returns static\(CodeIgniter\\Database\\BaseBuilder\)\.$#' + count: 1 + path: ../../system/Database/BaseBuilder.php + - message: '#^Method CodeIgniter\\Router\\Router\:\:getRouteAttributes\(\) should return array\{class\: list\, method\: list\\} but returns array\{class\: list\, method\: list\\}\.$#' count: 1