Updated Drupal to 8.6. This goes with the following updates because it's possible...

[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 7b21eff351883e200ee9ff01c8a629bc0c701ded..6dd8795305a7cd56546fc9e97b8c8263f4a92571 100644 (file)
--- a/web/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php
@@ -6,7 +6,6 @@ use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\Query\QueryInterface;
 use Drupal\migrate\Plugin\migrate\process\DedupeEntity;
-use Drupal\Component\Utility\Unicode;
 
 /**
  * @coversDefaultClass \Drupal\migrate\Plugin\migrate\process\DedupeEntity
@@ -18,7 +17,7 @@ class DedupeEntityTest extends MigrateProcessTestCase {
   /**
    * The mock entity query.
    *
-   * @var \Drupal\Core\Entity\Query\QueryInterface|\Drupal\Core\Entity\Query\QueryFactory
+   * @var \Drupal\Core\Entity\Query\QueryInterface
    */
   protected $entityQuery;
 
@@ -77,7 +76,7 @@ class DedupeEntityTest extends MigrateProcessTestCase {
     $this->entityQueryExpects($count);
     $value = $this->randomMachineName(32);
     $actual = $plugin->transform($value, $this->migrateExecutable, $this->row, 'testproperty');
-    $expected = Unicode::substr($value, $start, $length);
+    $expected = mb_substr($value, $start, $length);
     $expected .= $count ? $postfix . $count : '';
     $this->assertSame($expected, $actual);
   }
@@ -198,7 +197,7 @@ class DedupeEntityTest extends MigrateProcessTestCase {
 
     // Entity 'forums' is pre-existing, entity 'test_vocab' was migrated.
     $this->idMap
-      ->method('lookupSourceID')
+      ->method('lookupSourceId')
       ->will($this->returnValueMap([
         [['test_field' => 'forums'], FALSE],
         [['test_field' => 'test_vocab'], ['source_id' => 42]],