only in patch2: unchanged: --- a/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTest.php +++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTest.php @@ -56,7 +56,7 @@ public function testComments() { $this->assertIdentical('The first comment.', $comment->getSubject()); $this->assertIdentical('The first comment body.', $comment->comment_body->value); $this->assertIdentical('filtered_html', $comment->comment_body->format); - $this->assertIdentical('0', $comment->pid->target_id); + $this->assertIdentical(NULL, $comment->pid->target_id); $this->assertIdentical('1', $comment->getCommentedEntityId()); $this->assertIdentical('node', $comment->getCommentedEntityTypeId()); $this->assertIdentical('en', $comment->language()->getId()); @@ -68,7 +68,7 @@ public function testComments() { $comment = $comment_storage->load(3); $this->assertIdentical('The second comment.', $comment->subject->value); - $this->assertIdentical('0', $comment->pid->target_id); + $this->assertIdentical(NULL, $comment->pid->target_id); } } only in patch2: unchanged: --- a/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php +++ b/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php @@ -66,7 +66,7 @@ protected function setUp() { // Use Classy theme for testing markup output. \Drupal::service('theme_handler')->install(['classy']); \Drupal::service('theme_handler')->setDefault('classy'); - + $this->installEntitySchema('entity_test'); // Grant the 'view test entity' permission. $this->installConfig(array('user')); Role::load(RoleInterface::ANONYMOUS_ID) only in patch2: unchanged: --- a/core/modules/migrate/src/MigrateExecutable.php +++ b/core/modules/migrate/src/MigrateExecutable.php @@ -378,6 +378,7 @@ public function processRow(Row $row, array $process = NULL, $value = NULL) { $new_value[] = $plugin->transform($scalar_value, $this, $row, $destination); } catch (MigrateSkipProcessException $e) { + $new_value[] = NULL; $break = TRUE; } } @@ -391,6 +392,7 @@ public function processRow(Row $row, array $process = NULL, $value = NULL) { $value = $plugin->transform($value, $this, $row, $destination); } catch (MigrateSkipProcessException $e) { + $value = NULL; break; } $multiple = $multiple || $plugin->multiple();