diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2023-04-17 08:30:21 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-04-17 08:30:21 +0200 |
| commit | f3760f138dcbaf7a2190336a0378cf1b2190c9f5 (patch) | |
| tree | 6fac8fbf9efd7aa74a8e3970ab70ccf85287b2cd /app/Models/Context.php | |
| parent | 41fa4e746df8c2e2399ed753b4994ca85cb21358 (diff) | |
Complete PHPStan Level 6 (#5305)
* Complete PHPStan Level 6
Fix https://github.com/FreshRSS/FreshRSS/issues/4112
And initiate PHPStan Level 7
* PHPStan Level 6 for tests
* Use phpstan/phpstan-phpunit
* Update to PHPStan version 1.10
* Fix mixed bug
* Fix mixed return bug
* Fix paginator bug
* Fix FreshRSS_UserConfiguration
* A couple more Minz_Configuration bug fixes
* A few trivial PHPStan Level 7 fixes
* A few more simple PHPStan Level 7
* More files passing PHPStan Level 7
Add interface to replace removed class from https://github.com/FreshRSS/FreshRSS/pull/5251
* A few more PHPStan Level 7 preparations
* A few last details
Diffstat (limited to 'app/Models/Context.php')
| -rw-r--r-- | app/Models/Context.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/Models/Context.php b/app/Models/Context.php index b2631291a..03006cbbf 100644 --- a/app/Models/Context.php +++ b/app/Models/Context.php @@ -110,10 +110,9 @@ final class FreshRSS_Context { /** * Initialize the context for the current user. - * @return FreshRSS_UserConfiguration|false * @throws Minz_ConfigurationParamException */ - public static function initUser(string $username = '', bool $userMustExist = true) { + public static function initUser(string $username = '', bool $userMustExist = true): ?FreshRSS_UserConfiguration { FreshRSS_Context::$user_conf = null; if (!isset($_SESSION)) { Minz_Session::init('FreshRSS'); @@ -145,7 +144,7 @@ final class FreshRSS_Context { Minz_Session::unlock(); if (FreshRSS_Context::$user_conf == null) { - return false; + return null; } FreshRSS_Context::$search = new FreshRSS_BooleanSearch(''); @@ -249,8 +248,8 @@ final class FreshRSS_Context { /** * Return the current get as a string or an array. * - * If $array is true, the first item of the returned value is 'f' or 'c' and - * the second is the id. + * If $array is true, the first item of the returned value is 'f' or 'c' or 't' and the second is the id. + * @phpstan-return ($asArray is true ? array{'c'|'f'|'t',bool|int} : string) * @return string|array{string,bool|int} */ public static function currentGet(bool $asArray = false) { |