php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-12-14 10:20:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add generics for all controllers (#20675)

Browse Source
This commit is contained in:
Maksim Spirkov
2025-11-03 12:59:23 +03:00
committed by GitHub
parent 0998ac6cb1
commit 7dd3dede14
36 changed files with 216 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
framework/base/Module.php
View File

@@ -545,7 +545,10 @@ class Module extends ServiceLocator
{
$parts = $this->createController($route);
if (is_array($parts)) {
/** @var Controller $controller */
/**
* @var Controller $controller
* @phpstan-var Controller<$this> $controller
*/
list($controller, $actionID) = $parts;
$oldController = Yii::$app->controller;
Yii::$app->controller = $controller;
@@ -579,9 +582,12 @@ class Module extends ServiceLocator
* part of the route which will be treated as the action ID. Otherwise, `false` will be returned.
*
* @param string $route the route consisting of module, controller and action IDs.
* @return array|bool If the controller is created successfully, it will be returned together
* @return array|false If the controller is created successfully, it will be returned together
* with the requested action ID. Otherwise `false` will be returned.
* @throws InvalidConfigException if the controller class and its file do not match.
*
* @phpstan-return array{Controller<$this>, string}|false
* @psalm-return array{Controller<$this>, string}|false
*/
public function createController($route)
{
@@ -638,6 +644,9 @@ class Module extends ServiceLocator
* @return Controller|null the newly created controller instance, or `null` if the controller ID is invalid.
* @throws InvalidConfigException if the controller class and its file name do not match.
* This exception is only thrown when in debug mode.
*
* @phpstan-return Controller<$this>|null
* @psalm-return Controller<$this>|null
*/
public function createControllerByID($id)
{
@@ -718,8 +727,8 @@ class Module extends ServiceLocator
* @param Action $action the action to be executed.
* @return bool whether the action should continue to be executed.
*
* @phpstan-param Action<Controller> $action
* @psalm-param Action<Controller> $action
* @phpstan-param Action<Controller<$this>> $action
* @psalm-param Action<Controller<$this>> $action
*/
public function beforeAction($action)
{
@@ -749,8 +758,8 @@ class Module extends ServiceLocator
* @param mixed $result the action return result.
* @return mixed the processed action result.
*
* @phpstan-param Action<Controller> $action
* @psalm-param Action<Controller> $action
* @phpstan-param Action<Controller<$this>> $action
* @psalm-param Action<Controller<$this>> $action
*/
public function afterAction($action, $result)
{