Adapt to rename Query::$join (#475)

vjik · web-flow · commit d090b4ca86be · 2025-10-17T22:48:27.000+03:00
* Adapt to rename `Query::$join`

* fix
diff --git a/src/ActiveQuery.php b/src/ActiveQuery.php
@@ -242,7 +242,7 @@ public function populate(array $rows): array
             return [];
         }
 
-        if (!empty($this->join) && $this->indexBy === null) {
+        if (!empty($this->joins) && $this->indexBy === null) {
             $rows = $this->removeDuplicatedRows($rows);
         }
 
@@ -415,9 +415,9 @@ public function resetJoinWith(): void
      */
     public function buildJoinWith(): void
     {
-        $join = $this->join;
+        $joins = $this->joins;
 
-        $this->join = [];
+        $this->joins = [];
 
         $model = $this->getModel();
 
@@ -447,30 +447,30 @@ public function buildJoinWith(): void
          */
         $uniqueJoins = [];
 
-        foreach ($this->join as $j) {
-            $uniqueJoins[serialize($j)] = $j;
+        foreach ($this->joins as $join) {
+            $uniqueJoins[serialize($join)] = $join;
         }
-        $this->join = array_values($uniqueJoins);
+        $this->joins = array_values($uniqueJoins);
 
         /**
          * @link https://github.com/yiisoft/yii2/issues/16092
          */
         $uniqueJoinsByTableName = [];
 
-        foreach ($this->join as $config) {
-            $tableName = serialize($config[1]);
+        foreach ($this->joins as $join) {
+            $tableName = serialize($join[1]);
             if (!array_key_exists($tableName, $uniqueJoinsByTableName)) {
-                $uniqueJoinsByTableName[$tableName] = $config;
+                $uniqueJoinsByTableName[$tableName] = $join;
             }
         }
 
-        $this->join = array_values($uniqueJoinsByTableName);
+        $this->joins = array_values($uniqueJoinsByTableName);
 
-        if (!empty($join)) {
+        if (!empty($joins)) {
             /**
              * Append explicit join to {@see joinWith()} {@link https://github.com/yiisoft/yii2/issues/2880}
              */
-            $this->join = empty($this->join) ? $join : array_merge($this->join, $join);
+            $this->joins = empty($this->joins) ? $joins : array_merge($this->joins, $joins);
         }
     }
 
@@ -683,7 +683,7 @@ private function joinWithRelation(ActiveQueryInterface $parent, ActiveQueryInter
 
         if (!empty($child->getJoins())) {
             foreach ($child->getJoins() as $join) {
-                $this->join[] = $join;
+                $this->joins[] = $join;
             }
         }
 
@@ -869,7 +869,7 @@ private function createInstance(): static
             ->distinct($this->distinct)
             ->from($this->from)
             ->groupBy($this->groupBy)
-            ->setJoins($this->join)
+            ->setJoins($this->joins)
             ->having($this->having)
             ->setUnions($this->union)
             ->params($this->params)
diff --git a/src/ActiveRelationTrait.php b/src/ActiveRelationTrait.php
@@ -493,7 +493,7 @@ private function indexBuckets(array $buckets, Closure|string $indexBy): array
      */
     private function prefixKeyColumns(array $columnNames): array
     {
-        if (!empty($this->join) || !empty($this->joinWith)) {
+        if (!empty($this->joins) || !empty($this->joinWith)) {
             if (empty($this->from)) {
                 $alias = $this->getModel()->tableName();
             } else {

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ private function indexBuckets(array $buckets, Closure\|string $indexBy): array`
`493`	`493`	`*/`
`494`	`494`	`private function prefixKeyColumns(array $columnNames): array`
`495`	`495`	`{`
`496`		`- if (!empty($this->join) \|\| !empty($this->joinWith)) {`
	`496`	`+ if (!empty($this->joins) \|\| !empty($this->joinWith)) {`
`497`	`497`	`if (empty($this->from)) {`
`498`	`498`	`$alias = $this->getModel()->tableName();`
`499`	`499`	`} else {`