Security update for Core, with self-updated composer

[yaffs-website] / web / core / tests / Drupal / KernelTests / Core / Database / SelectComplexTest.php

diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php
index 34ca74c693be18253214cac5ba4c9fc4bd9d69d2..cd3ec4a163840efc7dc38efc195ccde240829bba 100644 (file)
--- a/web/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\KernelTests\Core\Database;
 
 use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Query\Condition;
 use Drupal\Core\Database\RowCountException;
 use Drupal\user\Entity\User;
 
@@ -312,7 +313,7 @@ class SelectComplexTest extends DatabaseTestBase {
     $query = db_select('test');
     $query->addField('test', 'job');
     $query->condition('name', 'Paul');
-    $query->condition(db_or()->condition('age', 26)->condition('age', 27));
+    $query->condition((new Condition('OR'))->condition('age', 26)->condition('age', 27));
 
     $job = $query->execute()->fetchField();
     $this->assertEqual($job, 'Songwriter', 'Correct data retrieved.');
@@ -395,7 +396,7 @@ class SelectComplexTest extends DatabaseTestBase {
   public function testJoinConditionObject() {
     // Same test as testDefaultJoin, but with a Condition object.
     $query = db_select('test_task', 't');
-    $join_cond = db_and()->where('t.pid = p.id');
+    $join_cond = (new Condition('AND'))->where('t.pid = p.id');
     $people_alias = $query->join('test', 'p', $join_cond);
     $name_field = $query->addField($people_alias, 'name', 'name');
     $query->addField('t', 'task', 'task');
@@ -418,7 +419,7 @@ class SelectComplexTest extends DatabaseTestBase {
     // Test a condition object that creates placeholders.
     $t1_name = 'John';
     $t2_name = 'George';
-    $join_cond = db_and()
+    $join_cond = (new Condition('AND'))
       ->condition('t1.name', $t1_name)
       ->condition('t2.name', $t2_name);
     $query = db_select('test', 't1');