2c2
< index 1a4f64d292..8821944d40 100644
---
> index 5ada988d1b..232c880ceb 100644
5,8c5,8
< @@ -30,3 +30,11 @@ services:
<    plugin.manager.migration:
<      class: Drupal\migrate\Plugin\MigrationPluginManager
<      arguments: ['@module_handler', '@cache.discovery_migration', '@language_manager']
---
> @@ -36,3 +36,11 @@ services:
>    migrate.stub:
>      class: Drupal\migrate\MigrateStub
>      arguments: ['@plugin.manager.migration']
15c15
< +      - { name: 'event_subscriber }
---
> +      - { name: 'event_subscriber' }
21c21
< @@ -181,4 +181,19 @@
---
> @@ -181,4 +181,19 @@ final class MigrateEvents {
443c443
< index b0f2fa8a1a..b50fb234a2 100644
---
> index c3a0506419..b50fb234a2 100644
618,620c618,620
< -    $manager = \Drupal::entityManager();
< -    foreach ($manager->getDefinitions() as $id => $definition) {
< -      $manager->getStorage($id)->resetCache();
---
> -    $entity_type_manager = \Drupal::entityTypeManager();
> -    foreach ($entity_type_manager->getDefinitions() as $id => $definition) {
> -      $entity_type_manager->getStorage($id)->resetCache();
646c646
< index d14e54a427..d7cda89fa8 100644
---
> index 4d80feeaa7..37540f673b 100644
658c658
< @@ -52,10 +54,11 @@ class MigrateExecutableMemoryExceededTest extends MigrateTestCase {
---
> @@ -52,10 +54,9 @@ class MigrateExecutableMemoryExceededTest extends MigrateTestCase {
662c662
< -    $this->message = $this->getMock('Drupal\migrate\MigrateMessageInterface');
---
> -    $this->message = $this->createMock('Drupal\migrate\MigrateMessageInterface');
664c664,665
<      $this->executable = new TestMigrateExecutable($this->migration, $this->message);
---
> -    $this->executable = new TestMigrateExecutable($this->migration, $this->message);
> -    $this->executable->setStringTranslation($this->getStringTranslationStub());
666d666
<      $this->executable->setStringTranslation($this->getStringTranslationStub());
671c671
< @@ -74,22 +77,21 @@ protected function setUp() {
---
> @@ -74,26 +75,23 @@ protected function setUp() {
684c684,686
<          ->with($this->stringContains('reclaiming memory'));
---
> -        ->with($this->callback(function ($subject) {
> -            return mb_stripos((string) $subject, 'reclaiming memory') !== FALSE;
> -        }));
685a688
> +        ->with($this->stringContains('reclaiming memory'));
688c691,694
<          ->with($this->stringContains($message));
---
> -        ->with($this->callback(function ($subject) use ($message) {
> -            return mb_stripos((string) $subject, $message) !== FALSE;
> -        }));
> +        ->with($this->stringContains($message));
692c698,700
< +      $this->executable->getMemoryManager()->getMessage()->expects($this->never())
---
> +      $this->executable->getMemoryManager()
> +        ->getMessage()
> +        ->expects($this->never())