Security update for Core, with self-updated composer

[yaffs-website] / web / core / modules / migrate / tests / src / Unit / process / DedupeEntityTest.php

diff --git a/web/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php b/web/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php
index a5daa7203207b57bd124bbc12fe46b8b910b24d5..7b21eff351883e200ee9ff01c8a629bc0c701ded 100644 (file)
--- a/web/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php
@@ -2,9 +2,6 @@
 
 namespace Drupal\Tests\migrate\Unit\process;
 
-@trigger_error('The ' . __NAMESPACE__ . '\DedupeEntityTest is deprecated in
-Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use ' . __NAMESPACE__ . '\MakeUniqueEntityFieldTest', E_USER_DEPRECATED);
-
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\Query\QueryInterface;
@@ -14,14 +11,14 @@ use Drupal\Component\Utility\Unicode;
 /**
  * @coversDefaultClass \Drupal\migrate\Plugin\migrate\process\DedupeEntity
  * @group migrate
+ * @group legacy
  */
 class DedupeEntityTest extends MigrateProcessTestCase {
 
   /**
    * The mock entity query.
    *
-   * @var \Drupal\Core\Entity\Query\QueryInterface
-   * @var \Drupal\Core\Entity\Query\QueryFactory
+   * @var \Drupal\Core\Entity\Query\QueryInterface|\Drupal\Core\Entity\Query\QueryFactory
    */
   protected $entityQuery;
 
@@ -168,7 +165,9 @@ class DedupeEntityTest extends MigrateProcessTestCase {
       ->will($this->returnValue($this->entityQuery));
     $this->entityQuery->expects($this->exactly($count + 1))
       ->method('execute')
-      ->will($this->returnCallback(function () use (&$count) { return $count--;}));
+      ->will($this->returnCallback(function () use (&$count) {
+        return $count--;
+      }));
   }
 
   /**