Add Connection parameter to Closure

yiisoft · Jun 22, 2024 · 03e05ba · 03e05ba
1 parent a824e27
commit 03e05ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/ActiveQuery.php b/src/ActiveQuery.php
@@ -983,7 +983,7 @@ public function getARClassName(): string
         }
 
         if ($this->arClass instanceof Closure) {
-            return ($this->arClass)()::class;
+            return ($this->arClass)($this->db)::class;
         }
 
         return $this->arClass;
@@ -996,7 +996,7 @@ public function getARInstance(): ActiveRecordInterface
         }
 
         if ($this->arClass instanceof Closure) {
-            return ($this->arClass)();
+            return ($this->arClass)($this->db);
         }
 
         /** @psalm-var class-string<ActiveRecordInterface> $class */

diff --git a/src/ActiveQueryInterface.php b/src/ActiveQueryInterface.php
@@ -7,6 +7,7 @@
 use Closure;
 use ReflectionException;
 use Throwable;
+use Yiisoft\Db\Connection\ConnectionInterface;
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidArgumentException;
 use Yiisoft\Db\Exception\InvalidConfigException;
@@ -23,7 +24,7 @@
  *
  * A class implementing this interface should also use {@see ActiveQueryTrait} and {@see ActiveRelationTrait}.
  *
- * @psalm-type ARClass = class-string<ActiveRecordInterface>|ActiveRecordInterface|Closure():ActiveRecordInterface
+ * @psalm-type ARClass = class-string<ActiveRecordInterface>|ActiveRecordInterface|Closure(ConnectionInterface):ActiveRecordInterface
  */
 interface ActiveQueryInterface extends QueryInterface
 {