From 4c3deb055bedfbbda7047b6a99f1ae7e77217742 Mon Sep 17 00:00:00 2001
From: Maksim Spirkov <63721828+mspirkov@users.noreply.github.com>
Date: Tue, 14 Oct 2025 12:41:30 +0300
Subject: [PATCH] Fix #20599: Fix `@return` annotation for
 `ConditionInterface::fromArrayDefinition()`

---
 framework/CHANGELOG.md                         | 1 +
 framework/db/conditions/ConditionInterface.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 0519798124..f4cc168b1b 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -50,6 +50,7 @@ Yii Framework 2 Change Log
 - Bug #20585: Fix `@return` annotation for `CompositeUrlRule::createRules()` (mspirkov)
 - Bug #20587: Fix `@var` annotation for `yii\rbac\Item::$ruleName` (mspirkov)
 - Bug #20589: Fix `@var` annotations for `yii\rbac\DbManager` properties (mspirkov)
+- Bug #20599: Fix `@return` annotation for `ConditionInterface::fromArrayDefinition()` (mspirkov)
 - Enh #20591: Add PHPStan/Psalm annotations for `yii\rbac\BaseManager::getItems()` (mspirkov)
 - Bug #20594: Fix `@return` annotation for `Instance::get()` (mspirkov)
 - Bug #20595: Fix `@return` annotation for `BaseHtml::getAttributeValue()` (mspirkov)
diff --git a/framework/db/conditions/ConditionInterface.php b/framework/db/conditions/ConditionInterface.php
index fc8146940c..930d9b5a17 100644
--- a/framework/db/conditions/ConditionInterface.php
+++ b/framework/db/conditions/ConditionInterface.php
@@ -26,7 +26,7 @@ interface ConditionInterface extends ExpressionInterface
      * @param string $operator operator in uppercase.
      * @param array $operands array of corresponding operands
      *
-     * @return $this
+     * @return static
      * @throws InvalidParamException if input parameters are not suitable for this condition
      */
     public static function fromArrayDefinition($operator, $operands);