Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions build/controllers/PhpDocController.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use Yii;
use yii\base\Model;
use yii\base\Module;
use yii\console\Controller;
use yii\console\Controller as ConsoleController;
use yii\db\QueryBuilder;
use yii\helpers\Console;
use yii\helpers\FileHelper;
Expand All @@ -27,7 +27,7 @@
* @author Alexander Makarov <[email protected]>
* @since 2.0
*/
class PhpDocController extends Controller
class PhpDocController extends ConsoleController
{
/**
* Manually added PHPDoc properties that do not need to be removed or changed.
Expand All @@ -40,6 +40,10 @@ class PhpDocController extends Controller
'response',
'view',
],
ConsoleController::class => [
'request',
'response',
],
Model::class => [
'errors',
],
Expand Down
2 changes: 2 additions & 0 deletions framework/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ Yii Framework 2 Change Log
- Bug #20485: Fix error `Cannot unset string offsets` in `yii\di\Instance:ensure(['__class' => ...], 'some\class\name')` (max-s-lab)
- Enh #20505: `ArrayDataProvider` key handling with flexible path support (fetus-hina)
- Bug #20508: Fix PHPDoc, add PHPStan/Psalm annotations for `yii\web\CookieCollection::getIterator`. Add missing `@property` annotation in `yii\base\Model` (max-s-lab)
- Enh #20514: Add `@property` annotations for `yii\console\Controller` (max-s-lab)


2.0.53 June 27, 2025
--------------------
Expand Down
2 changes: 2 additions & 0 deletions framework/console/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
* where `<route>` is a route to a controller action and the params will be populated as properties of a command.
* See [[options()]] for details.
*
* @property Request $request The request object.
* @property Response $response The response object.
* @property-read string $help The help information for this controller.
* @property-read string $helpSummary The one-line short summary describing this controller.
* @property-read array $passedOptionValues The properties corresponding to the passed options.
Expand Down
Loading