478c478
< index 278dd7c8a4..5b39e533fc 100644
---
> index 45cede0c80..ff8bfbc389 100644
519c519
< @@ -99,22 +92,17 @@ class MigrateExecutable implements MigrateExecutableInterface {
---
> @@ -99,20 +92,15 @@ class MigrateExecutable implements MigrateExecutableInterface {
521c521
<     * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
---
>     * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher
525,526d524
<     *
<     * @throws \Drupal\migrate\MigrateException
546c544,545
< @@ -136,6 +124,7 @@ protected function getSource() {
---
> @@ -133,7 +121,8 @@ protected function getSource() {
>    /**
549c548,549
<     * @return \Symfony\Component\EventDispatcher\EventDispatcherInterface
---
> -   * @return \Symfony\Contracts\EventDispatcher\EventDispatcherInterface
> +   * @return \Symfony\Component\EventDispatcher\EventDispatcherInterface
554c554
< @@ -144,6 +133,19 @@ protected function getEventDispatcher() {
---
> @@ -142,6 +131,19 @@ protected function getEventDispatcher() {
574c574
< @@ -455,121 +457,9 @@ protected function handleException(\Exception $exception, $save = TRUE) {
---
> @@ -460,118 +462,9 @@ protected function handleException(\Exception $exception, $save = TRUE) {
668,672c668,669
< -    // Entity storage can blow up with caches so clear them out.
< -    $entity_type_manager = \Drupal::entityTypeManager();
< -    foreach ($entity_type_manager->getDefinitions() as $id => $definition) {
< -      $entity_type_manager->getStorage($id)->resetCache();
< -    }
---
> -    // Entity storage can blow up with caches, so clear it out.
> -    \Drupal::service('entity.memory_cache')->deleteAll();
972c969
< index cea9e65328..0000000000
---
> index acf3e64c09..0000000000
975c972
< @@ -1,122 +0,0 @@
---
> @@ -1,126 +0,0 @@
1056,1061c1053
< -      $this->executable->message->expects($this->at(0))
< -        ->method('display')
< -        ->with($this->callback(function ($subject) {
< -            return mb_stripos((string) $subject, 'reclaiming memory') !== FALSE;
< -        }));
< -      $this->executable->message->expects($this->at(1))
---
> -      $this->executable->message->expects($this->exactly(2))
1063,1065c1055,1066
< -        ->with($this->callback(function ($subject) use ($message) {
< -            return mb_stripos((string) $subject, $message) !== FALSE;
< -        }));
---
> -        ->withConsecutive(
> -          [
> -            $this->callback(function ($subject) {
> -              return mb_stripos((string) $subject, 'reclaiming memory') !== FALSE;
> -            }),
> -          ],
> -          [
> -            $this->callback(function ($subject) use ($message) {
> -              return mb_stripos((string) $subject, $message) !== FALSE;
> -            }),
> -          ],
> -        );
1099c1100
< index fb7aaba071..a962b0045c 100644
---
> index b38e11c91e..8bccac12da 100644
1119c1120
<      $event_dispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
---
>      $event_dispatcher = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface');
1126c1127
< @@ -119,6 +127,9 @@ public function testImportWithValidRow() {
---
> @@ -123,6 +131,9 @@ public function testImportWithValidRow() {
1136c1137
< @@ -164,6 +175,9 @@ public function testImportWithValidRowWithoutDestinationId() {
---
> @@ -168,6 +179,9 @@ public function testImportWithValidRowWithoutDestinationId() {
1146c1147
< @@ -221,6 +235,9 @@ public function testImportWithValidRowNoDestinationValues() {
---
> @@ -225,6 +239,9 @@ public function testImportWithValidRowNoDestinationValues() {
1156c1157
< @@ -273,6 +290,9 @@ public function testImportWithValidRowWithDestinationMigrateException() {
---
> @@ -277,6 +294,9 @@ public function testImportWithValidRowWithDestinationMigrateException() {
1166c1167
< @@ -321,6 +341,9 @@ public function testImportWithValidRowWithProcesMigrateException() {
---
> @@ -325,6 +345,9 @@ public function testImportWithValidRowWithProcesMigrateException() {
1176c1177
< @@ -375,6 +398,9 @@ public function testImportWithValidRowWithException() {
---
> @@ -379,6 +402,9 @@ public function testImportWithValidRowWithException() {