Add generics for all controllers (#20675)

Author: mspirkov

build/controllers/ClassmapController.php

@@ -7,6 +7,7 @@
 
 namespace yii\build\controllers;
 
+use yii\console\Application;
 use yii\console\Controller;
 use yii\console\Exception;
 use yii\helpers\FileHelper;
@@ -16,6 +17,8 @@
  *
  * @author Qiang Xue <[email protected]>
  * @since 2.0
+ *
+ * @extends Controller<Application>
  */
 class ClassmapController extends Controller
 {

build/controllers/DevController.php

@@ -9,6 +9,7 @@
 
 use Yii;
 use yii\base\InvalidParamException;
+use yii\console\Application;
 use yii\console\Controller;
 use yii\console\ExitCode;
 use yii\helpers\Console;
@@ -22,6 +23,8 @@
  *
  * @author Carsten Brandt <[email protected]>
  * @since 2.0
+ *
+ * @extends Controller<Application>
  */
 class DevController extends Controller
 {

build/controllers/MimeTypeController.php

@@ -9,6 +9,7 @@
 namespace yii\build\controllers;
 
 use Yii;
+use yii\console\Application;
 use yii\console\Controller;
 use yii\helpers\Console;
 use yii\helpers\VarDumper;
@@ -24,6 +25,8 @@
  *
  * @author Carsten Brandt <[email protected]>
  * @since 2.0
+ *
+ * @extends Controller<Application>
  */
 class MimeTypeController extends Controller
 {

build/controllers/PhpDocController.php

@@ -11,6 +11,7 @@
 use Yii;
 use yii\base\Model;
 use yii\base\Module;
+use yii\console\Application;
 use yii\console\Controller as ConsoleController;
 use yii\db\QueryBuilder;
 use yii\helpers\Console;
@@ -27,6 +28,8 @@
  * @author Carsten Brandt <[email protected]>
  * @author Alexander Makarov <[email protected]>
  * @since 2.0
+ *
+ * @extends ConsoleController<Application>
  */
 class PhpDocController extends ConsoleController
 {

build/controllers/ReleaseController.php

@@ -10,6 +10,7 @@
 
 use Yii;
 use yii\base\Exception;
+use yii\console\Application;
 use yii\console\Controller;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Console;
@@ -40,6 +41,8 @@
  *
  * @author Carsten Brandt <[email protected]>
  * @since 2.0
+ *
+ * @extends Controller<Application>
  */
 class ReleaseController extends Controller
 {

build/controllers/TranslationController.php

@@ -8,6 +8,7 @@
 namespace yii\build\controllers;
 
 use DirectoryIterator;
+use yii\console\Application;
 use yii\console\Controller;
 use yii\helpers\Html;
 
@@ -17,6 +18,8 @@
  * build translation "../docs/guide" "../docs/guide-ru" "Russian guide translation report" > report_guide_ru.html
  *
  * @author Alexander Makarov <[email protected]>
+ *
+ * @extends Controller<Application>
  */
 class TranslationController extends Controller
 {

build/controllers/Utf8Controller.php

@@ -8,6 +8,7 @@
 
 namespace yii\build\controllers;
 
+use yii\console\Application;
 use yii\console\Controller;
 use yii\helpers\Console;
 use yii\helpers\FileHelper;
@@ -16,6 +17,8 @@
  * Check files for broken UTF8 and non-printable characters.
  *
  * @author Carsten Brandt <[email protected]>
+ *
+ * @extends Controller<Application>
  */
 class Utf8Controller extends Controller
 {

framework/CHANGELOG.md

@@ -83,6 +83,7 @@ Yii Framework 2 Change Log
 - Bug #20666: Add missing generics in `yii\base`, `yii\console`, `yii\filters` and `yii\web` namespaces (mspirkov)
 - Bug #20673: Sanitize `null` bytes before `quoteValue()` on PHP 8.5+ in SQLite (terabytesoftw)
 - Bug #20671: Fix PHPDoc annotations in `yii\base`, `yii\console`, `yii\web` and `yii\widgets` namespaces (mspirkov)
+- Bug #20675: Add generics for all controllers (mspirkov)
 
 
 2.0.53 June 27, 2025

framework/base/ActionFilter.php

@@ -71,8 +71,8 @@ public function detach()
     /**
      * @param ActionEvent $event
      *
-     * @phpstan-param ActionEvent<Action<Controller>> $event
-     * @psalm-param ActionEvent<Action<Controller>> $event
+     * @phpstan-param ActionEvent<Action<Controller<Module>>> $event
+     * @psalm-param ActionEvent<Action<Controller<Module>>> $event
      */
     public function beforeFilter($event)
     {
@@ -93,8 +93,8 @@ public function beforeFilter($event)
     /**
      * @param ActionEvent $event
      *
-     * @phpstan-param ActionEvent<Action<Controller>> $event
-     * @psalm-param ActionEvent<Action<Controller>> $event
+     * @phpstan-param ActionEvent<Action<Controller<Module>>> $event
+     * @psalm-param ActionEvent<Action<Controller<Module>>> $event
      */
     public function afterFilter($event)
     {
@@ -108,8 +108,8 @@ public function afterFilter($event)
      * @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<Module>> $action
+     * @psalm-param Action<Controller<Module>> $action
      */
     public function beforeAction($action)
     {
@@ -123,8 +123,8 @@ public function beforeAction($action)
      * @param mixed $result the action execution result
      * @return mixed the processed action result.
      *
-     * @phpstan-param Action<Controller> $action
-     * @psalm-param Action<Controller> $action
+     * @phpstan-param Action<Controller<Module>> $action
+     * @psalm-param Action<Controller<Module>> $action
      */
     public function afterAction($action, $result)
     {
@@ -137,8 +137,8 @@ public function afterAction($action, $result)
      * @return string
      * @since 2.0.7
      *
-     * @phpstan-param Action<Controller> $action
-     * @psalm-param Action<Controller> $action
+     * @phpstan-param Action<Controller<Module>> $action
+     * @psalm-param Action<Controller<Module>> $action
      */
     protected function getActionId($action)
     {
@@ -160,8 +160,8 @@ protected function getActionId($action)
      * @param Action $action the action being filtered
      * @return bool whether the filter is active for the given action.
      *
-     * @phpstan-param Action<Controller> $action
-     * @psalm-param Action<Controller> $action
+     * @phpstan-param Action<Controller<Module>> $action
+     * @psalm-param Action<Controller<Module>> $action
      */
     protected function isActive($action)
     {

framework/base/Application.php

@@ -114,6 +114,9 @@ abstract class Application extends Module
     public $sourceLanguage = 'en-US';
     /**
      * @var Controller|null the currently active controller instance
+     *
+     * @phpstan-var Controller<Module>|null
+     * @psalm-var Controller<Module>|null
      */
     public $controller;
     /**
@@ -128,8 +131,8 @@ abstract class Application extends Module
     /**
      * @var Action|null the requested Action. If null, it means the request cannot be resolved into an action.
      *
-     * @phpstan-var Action<covariant Controller>|null
-     * @psalm-var Action<covariant Controller>|null
+     * @phpstan-var Action<covariant Controller<Module>>|null
+     * @psalm-var Action<covariant Controller<Module>>|null
      */
     public $requestedAction;
     /**