From e86086d56b2164a7e8a7a967518a755853e8777f Mon Sep 17 00:00:00 2001
From: Maksim Spirkov <63721828+mspirkov@users.noreply.github.com>
Date: Fri, 10 Oct 2025 23:01:20 +0300
Subject: [PATCH] Fix #20587: Fix `@var` annotation for
 `yii\rbac\Item::$ruleName`

---
 framework/CHANGELOG.md  | 1 +
 framework/rbac/Item.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 20a7f34792..efeb0d77e7 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -47,6 +47,7 @@ Yii Framework 2 Change Log
 - Bug #20576: Fix `@var` annotation for `StringValidator::$length` (mspirkov)
 - Enh #20579: Add PHPStan/Psalm annotations for `HeaderCollection::get` (mspirkov)
 - Bug #20583: Fix return value in `Request::getServerPort` (mspirkov)
+- Bug #20587: Fix `@var` annotation for `yii\rbac\Item::$ruleName` (mspirkov)
 - Bug #20589: Fix `@var` annotations for `yii\rbac\DbManager` properties (mspirkov)
 
 
diff --git a/framework/rbac/Item.php b/framework/rbac/Item.php
index 36abdbe412..319ea6c745 100644
--- a/framework/rbac/Item.php
+++ b/framework/rbac/Item.php
@@ -33,7 +33,7 @@ class Item extends BaseObject
      */
     public $description;
     /**
-     * @var string name of the rule associated with this item
+     * @var string|null name of the rule associated with this item
      */
     public $ruleName;
     /**