diff options
| author | 2023-04-17 08:30:21 +0200 | |
|---|---|---|
| committer | 2023-04-17 08:30:21 +0200 | |
| commit | f3760f138dcbaf7a2190336a0378cf1b2190c9f5 (patch) | |
| tree | 6fac8fbf9efd7aa74a8e3970ab70ccf85287b2cd /lib/Minz/Dispatcher.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 'lib/Minz/Dispatcher.php')
| -rw-r--r-- | lib/Minz/Dispatcher.php | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/lib/Minz/Dispatcher.php b/lib/Minz/Dispatcher.php index 128207025..abc7efe21 100644 --- a/lib/Minz/Dispatcher.php +++ b/lib/Minz/Dispatcher.php @@ -87,19 +87,21 @@ class Minz_Dispatcher { $controller_name = 'FreshRSS_' . $base_name . '_Controller'; } - if (!class_exists ($controller_name)) { + if (!class_exists($controller_name)) { throw new Minz_ControllerNotExistException ( Minz_Exception::ERROR ); } - $this->controller = new $controller_name (); + $controller = new $controller_name(); - if (! ($this->controller instanceof Minz_ActionController)) { + if (!($controller instanceof Minz_ActionController)) { throw new Minz_ControllerNotActionControllerException ( $controller_name, Minz_Exception::ERROR ); } + + $this->controller = $controller; } /** @@ -108,20 +110,15 @@ class Minz_Dispatcher { * @throws Minz_ActionException if the action cannot be executed on the controller */ private function launchAction(string $action_name): void { - if (!is_callable (array ( - $this->controller, - $action_name - ))) { + $call = [$this->controller, $action_name]; + if (!is_callable($call)) { throw new Minz_ActionException ( - get_class ($this->controller), + get_class($this->controller), $action_name, Minz_Exception::ERROR ); } - call_user_func (array ( - $this->controller, - $action_name - )); + call_user_func($call); } /** @@ -140,9 +137,9 @@ class Minz_Dispatcher { * Return if a controller is registered. * * @param string $base_name the base name of the controller. - * @return boolean true if the controller has been registered, false else. + * @return bool true if the controller has been registered, false else. */ - public static function isRegistered(string $base_name) { + public static function isRegistered(string $base_name): bool { return isset(self::$registrations[$base_name]); } |
