Update tests. Fix overwrite where condition.

Author: lav45

src/ActiveQuery.php

@@ -218,7 +218,7 @@ public function prepare(QueryBuilderInterface $builder): QueryInterface
             }
 
             $query = $this->createInstance();
-            $this->where($where);
+            $this->setWhere($where);
         }
 
         if (!empty($this->on)) {
@@ -919,7 +919,7 @@ protected function findByCondition(mixed $condition): static
             $condition = $arInstance->filterCondition($condition, $aliases);
         }
 
-        return $this->where($condition);
+        return $this->setWhere($condition);
     }
 
     public function findBySql(string $sql, array $params = []): static

tests/ActiveQueryFindTest.php

@@ -47,11 +47,11 @@ public function testFindExists(): void
 
         $customerQuery = new ActiveQuery(Customer::class);
 
-        $this->assertTrue($customerQuery->where(['[[id]]' => 2])->exists());
-        $this->assertTrue($customerQuery->where(['[[id]]' => 2])->select('[[name]]')->exists());
+        $this->assertTrue((clone $customerQuery)->where(['[[id]]' => 2])->exists());
+        $this->assertTrue((clone $customerQuery)->where(['[[id]]' => 2])->select('[[name]]')->exists());
 
-        $this->assertFalse($customerQuery->where(['[[id]]' => 42])->exists());
-        $this->assertFalse($customerQuery->where(['[[id]]' => 42])->select('[[name]]')->exists());
+        $this->assertFalse((clone $customerQuery)->where(['[[id]]' => 42])->exists());
+        $this->assertFalse((clone $customerQuery)->where(['[[id]]' => 42])->select('[[name]]')->exists());
     }
 
     public function testFindColumn(): void
@@ -191,12 +191,12 @@ public function testFindOneByColumnName(): void
         $customer = new ActiveQuery(Customer::class);
         $customerQuery = new CustomerQuery(Customer::class);
 
-        $arClass = $customer->findOne(['id' => 1]);
+        $arClass = (clone $customer)->findOne(['id' => 1]);
         $this->assertEquals(1, $arClass->getId());
 
         $customerQuery->joinWithProfile = true;
 
-        $arClass = $customer->findOne(['customer.id' => 1]);
+        $arClass = (clone $customer)->findOne(['customer.id' => 1]);
         $this->assertEquals(1, $arClass->getId());
 
         $customerQuery->joinWithProfile = false;
@@ -223,33 +223,33 @@ public function testFind(): void
 
         /** find by a single primary key */
         $customerQuery = new ActiveQuery(Customer::class);
-        $customer = $customerQuery->findOne(2);
+        $customer = (clone $customerQuery)->findOne(2);
         $this->assertInstanceOf(Customer::class, $customer);
         $this->assertEquals('user2', $customer->getName());
 
-        $customer = $customerQuery->findOne(5);
+        $customer = (clone $customerQuery)->findOne(5);
         $this->assertNull($customer);
 
         $customerQuery = new ActiveQuery(Customer::class);
-        $customer = $customerQuery->findOne(['id' => [5, 6, 1]]);
+        $customer = (clone $customerQuery)->findOne(['id' => [5, 6, 1]]);
         $this->assertInstanceOf(Customer::class, $customer);
 
-        $customer = $customerQuery->where(['id' => [5, 6, 1]])->one();
+        $customer = (clone $customerQuery)->where(['id' => [5, 6, 1]])->one();
         $this->assertNotNull($customer);
 
         /** find by column values */
         $customerQuery = new ActiveQuery(Customer::class);
-        $customer = $customerQuery->findOne(['id' => 2, 'name' => 'user2']);
+        $customer = (clone $customerQuery)->findOne(['id' => 2, 'name' => 'user2']);
         $this->assertInstanceOf(Customer::class, $customer);
         $this->assertEquals('user2', $customer->getName());
 
-        $customer = $customerQuery->findOne(['id' => 2, 'name' => 'user1']);
+        $customer = (clone $customerQuery)->findOne(['id' => 2, 'name' => 'user1']);
         $this->assertNull($customer);
 
-        $customer = $customerQuery->findOne(['id' => 5]);
+        $customer = (clone $customerQuery)->findOne(['id' => 5]);
         $this->assertNull($customer);
 
-        $customer = $customerQuery->findOne(['name' => 'user5']);
+        $customer = (clone $customerQuery)->findOne(['name' => 'user5']);
         $this->assertNull($customer);
 
         /** find by column */
@@ -379,10 +379,10 @@ public function testFindCount(): void
 
         $customerQuery = new ActiveQuery(Customer::class);
         $this->assertEquals(3, $customerQuery->count());
-        $this->assertEquals(1, $customerQuery->where(['id' => 1])->count());
-        $this->assertEquals(2, $customerQuery->where(['id' => [1, 2]])->count());
-        $this->assertEquals(2, $customerQuery->where(['id' => [1, 2]])->offset(1)->count());
-        $this->assertEquals(2, $customerQuery->where(['id' => [1, 2]])->offset(2)->count());
+        $this->assertEquals(1, (clone $customerQuery)->where(['id' => 1])->count());
+        $this->assertEquals(2, (clone $customerQuery)->where(['id' => [1, 2]])->count());
+        $this->assertEquals(2, (clone $customerQuery)->where(['id' => [1, 2]])->offset(1)->count());
+        $this->assertEquals(2, (clone $customerQuery)->where(['id' => [1, 2]])->offset(2)->count());
 
         $customerQuery = new ActiveQuery(Customer::class);
         $this->assertEquals(3, $customerQuery->limit(1)->count());
@@ -450,32 +450,32 @@ public function testFindComplexCondition(): void
 
         $this->assertEquals(
             2,
-            $customerQuery->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->count()
+            (clone $customerQuery)->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->count()
         );
 
         $this->assertCount(
             2,
-            $customerQuery->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->all()
+            (clone $customerQuery)->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->all()
         );
 
         $this->assertEquals(
             2,
-            $customerQuery->where(['name' => ['user1', 'user2']])->count()
+            (clone $customerQuery)->where(['name' => ['user1', 'user2']])->count()
         );
 
         $this->assertCount(
             2,
-            $customerQuery->where(['name' => ['user1', 'user2']])->all()
+            (clone $customerQuery)->where(['name' => ['user1', 'user2']])->all()
         );
 
         $this->assertEquals(
             1,
-            $customerQuery->where(['AND', ['name' => ['user2', 'user3']], ['BETWEEN', 'status', 2, 4]])->count()
+            (clone $customerQuery)->where(['AND', ['name' => ['user2', 'user3']], ['BETWEEN', 'status', 2, 4]])->count()
         );
 
         $this->assertCount(
             1,
-            $customerQuery->where(['AND', ['name' => ['user2', 'user3']], ['BETWEEN', 'status', 2, 4]])->all()
+            (clone $customerQuery)->where(['AND', ['name' => ['user2', 'user3']], ['BETWEEN', 'status', 2, 4]])->all()
         );
     }
 
@@ -485,11 +485,11 @@ public function testFindNullValues(): void
 
         $customerQuery = new ActiveQuery(Customer::class);
 
-        $customer = $customerQuery->findOne(2);
+        $customer = (clone $customerQuery)->findOne(2);
         $customer->setName(null);
         $customer->save();
 
-        $result = $customerQuery->where(['name' => null])->all();
+        $result = (clone $customerQuery)->where(['name' => null])->all();
         $this->assertCount(1, $result);
         $this->assertEquals(2, reset($result)->getPrimaryKey());
     }
@@ -649,16 +649,16 @@ public function testFindEmptyInCondition(): void
         $this->checkFixture($this->db(), 'customer');
 
         $customerQuery = new ActiveQuery(Customer::class);
-        $customers = $customerQuery->where(['id' => [1]])->all();
+        $customers = (clone $customerQuery)->where(['id' => [1]])->all();
         $this->assertCount(1, $customers);
 
-        $customers = $customerQuery->where(['id' => []])->all();
+        $customers = (clone $customerQuery)->where(['id' => []])->all();
         $this->assertCount(0, $customers);
 
-        $customers = $customerQuery->where(['IN', 'id', [1]])->all();
+        $customers = (clone $customerQuery)->where(['IN', 'id', [1]])->all();
         $this->assertCount(1, $customers);
 
-        $customers = $customerQuery->where(['IN', 'id', []])->all();
+        $customers = (clone $customerQuery)->where(['IN', 'id', []])->all();
         $this->assertCount(0, $customers);
     }
 
@@ -667,15 +667,15 @@ public function testFindEagerIndexBy(): void
         $this->checkFixture($this->db(), 'order');
 
         $orderQuery = new ActiveQuery(Order::class);
-        $order = $orderQuery->with('itemsIndexed')->where(['id' => 1])->one();
+        $order = (clone $orderQuery)->with('itemsIndexed')->where(['id' => 1])->one();
         $this->assertTrue($order->isRelationPopulated('itemsIndexed'));
 
         $items = $order->getItemsIndexed();
         $this->assertCount(2, $items);
         $this->assertTrue(isset($items[1]));
         $this->assertTrue(isset($items[2]));
 
-        $order = $orderQuery->with('itemsIndexed')->where(['id' => 2])->one();
+        $order = (clone $orderQuery)->with('itemsIndexed')->where(['id' => 2])->one();
         $this->assertTrue($order->isRelationPopulated('itemsIndexed'));
 
         $items = $order->getItemsIndexed();

tests/ActiveQueryTest.php

@@ -425,7 +425,6 @@ public function testDeeplyNestedTableRelation(): void
         $customerQuery = new ActiveQuery(Customer::class);
 
         $customers = $customerQuery->findOne(1);
-        $this->assertNotNull($customerQuery);
 
         $items = $customers->getOrderItems();