Update to drupal-org-drupal 8.0.0-rc2. For more information, see https://www.drupal.org/node/2598668

core/modules/taxonomy/migration_templates/d6_term_node.yml

@@ -7,7 +7,14 @@ builder:
 source:
   plugin: d6_term_node
 process:
-  nid: nid
+  nid:
+    -
+      plugin: migration
+      migration: d6_node:*
+      source: nid
+    -
+      plugin: skip_on_empty
+      method: row
   type: type
   # The actual field name is dynamic and will be added by the builder.
 destination:

core/modules/taxonomy/migration_templates/d6_term_node_revision.yml

@@ -7,7 +7,14 @@ builder:
 source:
   plugin: d6_term_node_revision
 process:
-  vid: vid
+  vid:
+    -
+      plugin: migration
+      migration: d6_node:*
+      source: vid
+    -
+      plugin: skip_on_empty
+      method: row
   type: type
   # The actual field name is dynamic and will be added by the builder.
 destination:

core/modules/taxonomy/src/Plugin/migrate/builder/d6/TermNode.php

@@ -13,7 +13,6 @@ use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\MigrateMessage;
 use Drupal\migrate\MigrateTemplateStorage;
 use Drupal\migrate\Plugin\migrate\builder\BuilderBase;
-use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**

core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php

@@ -9,7 +9,6 @@ namespace Drupal\taxonomy\Plugin\views\argument;
 
 use Drupal\taxonomy\Entity\Term;
 use Drupal\views\Plugin\views\argument\ManyToOne;
-use Drupal\Component\Utility\SafeMarkup;
 
 /**
  * Allow taxonomy term ID(s) as argument.

core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php

@@ -11,7 +11,6 @@ use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
-use Drupal\taxonomy\Entity\Term;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**

core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php

@@ -17,8 +17,6 @@ use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase;
 use Drupal\node\NodeInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Drupal\taxonomy\Entity\Vocabulary;
 use Drupal\taxonomy\VocabularyStorageInterface;
 
 /**

core/modules/taxonomy/src/Plugin/views/argument_validator/TermName.php

@@ -8,8 +8,6 @@
 namespace Drupal\taxonomy\Plugin\views\argument_validator;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\views\ViewExecutable;
-use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\views\Plugin\views\argument_validator\Entity;
 

core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php

@@ -11,7 +11,6 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\views\Plugin\views\field\PrerenderList;
-use Drupal\taxonomy\Entity\Vocabulary;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\taxonomy\VocabularyStorageInterface;
 

core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php

@@ -8,7 +8,6 @@
 namespace Drupal\taxonomy\Plugin\views\filter;
 
 use Drupal\Core\Entity\Element\EntityAutocomplete;
-use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\taxonomy\Entity\Term;
 use Drupal\taxonomy\TermStorageInterface;
@@ -16,7 +15,6 @@ use Drupal\taxonomy\VocabularyStorageInterface;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\views\Plugin\views\filter\ManyToOne;
-use Drupal\Component\Utility\Tags;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**

core/modules/taxonomy/src/TermStorage.php

@@ -9,7 +9,6 @@ namespace Drupal\taxonomy;
 
 use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\Query\QueryInterface;
 
 /**
  * Defines a Controller class for taxonomy terms.

core/modules/taxonomy/src/Tests/EfqTest.php

@@ -7,8 +7,6 @@
 
 namespace Drupal\taxonomy\Tests;
 
-use Drupal\Core\Entity\Query\QueryFactory;
-
 /**
  * Verifies operation of a taxonomy-based Entity Query.
  *

core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTest.php

@@ -7,6 +7,9 @@
 
 namespace Drupal\taxonomy\Tests\Migrate\d6;
 
+use Drupal\migrate\Entity\Migration;
+use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\node\Entity\Node;
 
@@ -30,13 +33,14 @@ class MigrateTermNodeTest extends MigrateDrupal6TestBase {
     $this->installSchema('node', ['node_access']);
     $this->migrateContent();
     $this->migrateTaxonomy();
-    $this->executeMigrations(['d6_term_node:*']);
   }
 
   /**
    * Tests the Drupal 6 term-node association to Drupal 8 migration.
    */
   public function testTermNode() {
+    $this->executeMigrations(['d6_term_node:*']);
+
     $this->container->get('entity.manager')
       ->getStorage('node')
       ->resetCache([1, 2]);
@@ -51,4 +55,20 @@ class MigrateTermNodeTest extends MigrateDrupal6TestBase {
     $this->assertIdentical('3', $node->vocabulary_2_i_1_[1]->target_id);
   }
 
+  /**
+   * Tests that term associations are ignored when they belong to nodes which
+   * were not migrated.
+   */
+  public function testSkipNonExistentNode() {
+    // Node 2 is migrated by d6_node__story, but we need to pretend that it
+    // failed, so record that in the map table.
+    $this->mockFailure('d6_node__story', ['nid' => 2]);
+
+    // d6_term_node__2 should skip over node 2 (a.k.a. revision 3) because,
+    // according to the map table, it failed.
+    $migration = Migration::load('d6_term_node__2');
+    $this->executeMigration($migration);
+    $this->assertNull($migration->getIdMap()->lookupDestinationId(['vid' => 3])[0]);
+  }
+
 }

core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php

@@ -7,7 +7,6 @@
 
 namespace Drupal\taxonomy\Tests\Migrate\d6;
 
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\migrate\Entity\Migration;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;

core/modules/taxonomy/src/Tests/TermKernelTest.php

@@ -8,7 +8,6 @@
 namespace Drupal\taxonomy\Tests;
 
 use Drupal\taxonomy\Entity\Term;
-use Drupal\taxonomy\Tests\TaxonomyTestTrait;
 use Drupal\simpletest\KernelTestBase;
 
 /**

core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php

@@ -7,7 +7,6 @@
 
 namespace Drupal\taxonomy\Tests\Views;
 
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
 use Drupal\taxonomy\Entity\Term;
 use Drupal\taxonomy\Entity\Vocabulary;

core/modules/taxonomy/src/Tests/Views/TaxonomyRelationshipTest.php

@@ -9,7 +9,6 @@ namespace Drupal\taxonomy\Tests\Views;
 
 use Drupal\node\NodeInterface;
 use Drupal\taxonomy\TermInterface;
-use Drupal\views\Tests\ViewTestData;
 use Drupal\views\Views;
 
 /**

core/modules/taxonomy/src/Tests/Views/TaxonomyViewsFieldAccessTest.php

@@ -9,7 +9,6 @@ namespace Drupal\taxonomy\Tests\Views;
 
 use Drupal\taxonomy\Entity\Term;
 use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\user\Entity\User;
 use Drupal\views\Tests\Handler\FieldFieldAccessTestBase;
 
 /**

core/modules/taxonomy/src/Tests/VocabularyCrudTest.php

@@ -8,7 +8,6 @@
 namespace Drupal\taxonomy\Tests;
 
 use Drupal\Component\Utility\Unicode;
-use Drupal\field\Entity\FieldConfig;
 use Drupal\taxonomy\Entity\Vocabulary;
 
 /**

core/modules/taxonomy/src/VocabularyStorage.php

@@ -7,7 +7,6 @@
 
 namespace Drupal\taxonomy;
 
-use Drupal\Core\Cache\Cache;
 use Drupal\Core\Config\Entity\ConfigEntityStorage;
 
 /**

core/modules/taxonomy/taxonomy.js

@@ -5,7 +5,7 @@
 
 (function ($) {
 
-  "use strict";
+  'use strict';
 
   /**
    * Move a block in the blocks table from one region to another.