Security update for Core, with self-updated composer

[yaffs-website] / web / core / modules / simpletest / src / TestBase.php

diff --git a/web/core/modules/simpletest/src/TestBase.php b/web/core/modules/simpletest/src/TestBase.php
index 8b33f4be06960f4382adbff57efdff999f171abc..260d1a34af170aa2a4ce0d96ad1c09f7161125ef 100644 (file)
--- a/web/core/modules/simpletest/src/TestBase.php
+++ b/web/core/modules/simpletest/src/TestBase.php
@@ -12,6 +12,7 @@ use Drupal\Core\StreamWrapper\PublicStream;
 use Drupal\Core\Test\TestDatabase;
 use Drupal\Core\Test\TestSetupTrait;
 use Drupal\Core\Utility\Error;
+use Drupal\Tests\AssertHelperTrait as BaseAssertHelperTrait;
 use Drupal\Tests\ConfigTestTrait;
 use Drupal\Tests\RandomGeneratorTrait;
 use Drupal\Tests\SessionTestTrait;
@@ -24,10 +25,10 @@ use Drupal\Tests\Traits\Core\GeneratePermutationsTrait;
  */
 abstract class TestBase {
 
+  use BaseAssertHelperTrait;
   use TestSetupTrait;
   use SessionTestTrait;
   use RandomGeneratorTrait;
-  use AssertHelperTrait;
   use GeneratePermutationsTrait;
   // For backwards compatibility switch the visbility of the methods to public.
   use ConfigTestTrait {
@@ -44,6 +45,8 @@ abstract class TestBase {
 
   /**
    * Time limit for the test.
+   *
+   * @var int
    */
   protected $timeLimit = 500;