From a47d8c49b2da7155b8b3680c0b7bb4a009029211 Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Fri, 18 Aug 2017 11:55:01 +0900
Subject: [PATCH] Issue #2896507 by heddn, maxocub: Update FieldPluginBase with
 a default processFieldValues() and getFieldFormatterMap()

---
 .../src/Plugin/migrate/field/DateField.php     |  9 ---------
 .../src/Plugin/migrate/field/d6/DateField.php  |  9 ---------
 .../Plugin/migrate/cckfield/d7/ImageField.php  |  7 -------
 .../Plugin/migrate/field/FieldPluginBase.php   | 18 ++++++++++++++++++
 .../src/Plugin/migrate/field/NodeReference.php |  7 -------
 .../src/Plugin/migrate/field/UserReference.php |  7 -------
 .../Plugin/migrate/cckfield/D6FileField.php    |  5 -----
 .../cckfield/D6NoCoreVersionSpecified.php      |  5 -----
 .../Plugin/migrate/cckfield/d6/FileField.php   |  7 -------
 .../src/Plugin/migrate/field/D6FileField.php   | 17 +----------------
 .../migrate/field/D6NoCoreVersionSpecified.php | 12 ------------
 .../migrate/cckfield/TaxonomyTermReference.php |  7 -------
 12 files changed, 19 insertions(+), 91 deletions(-)

diff --git a/core/modules/datetime/src/Plugin/migrate/field/DateField.php b/core/modules/datetime/src/Plugin/migrate/field/DateField.php
index 3a61a7846ad5..0dd56c9acf29 100644
--- a/core/modules/datetime/src/Plugin/migrate/field/DateField.php
+++ b/core/modules/datetime/src/Plugin/migrate/field/DateField.php
@@ -30,15 +30,6 @@ public function getFieldWidgetMap() {
     ];
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getFieldFormatterMap() {
-    // See d6_field_formatter_settings.yml, d7_field_formatter_settings.yml and
-    // FieldPluginBase::processFieldFormatter().
-    return [];
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/datetime/src/Plugin/migrate/field/d6/DateField.php b/core/modules/datetime/src/Plugin/migrate/field/d6/DateField.php
index a2429f6a01b2..c4e7b4981d3d 100644
--- a/core/modules/datetime/src/Plugin/migrate/field/d6/DateField.php
+++ b/core/modules/datetime/src/Plugin/migrate/field/d6/DateField.php
@@ -35,15 +35,6 @@ public function getFieldWidgetMap() {
     ];
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getFieldFormatterMap() {
-    // See d6_field_formatter_settings.yml and
-    // FieldPluginBase::processFieldFormatter().
-    return [];
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php b/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
index ad24ae24f1e6..2b34a80c47d1 100644
--- a/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
+++ b/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
@@ -13,13 +13,6 @@
  */
 class ImageField extends CckFieldPluginBase {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getFieldFormatterMap() {
-    return [];
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/field/FieldPluginBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/field/FieldPluginBase.php
index 852c6ca6ff4b..027276c339f3 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/field/FieldPluginBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/field/FieldPluginBase.php
@@ -45,6 +45,13 @@ public function processFieldWidget(MigrationInterface $migration) {
     $migration->mergeProcessOfProperty('options/type', $process);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getFieldFormatterMap() {
+    return [];
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -66,6 +73,17 @@ public function processFieldFormatter(MigrationInterface $migration) {
     $migration->mergeProcessOfProperty('options/type', $process);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function processFieldValues(MigrationInterface $migration, $field_name, $data) {
+    $process = [
+      'plugin' => 'get',
+      'source' => $field_name,
+    ];
+    $migration->mergeProcessOfProperty($field_name, $process);
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php b/core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php
index 2f6f0992b385..1579afadc594 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php
@@ -15,13 +15,6 @@
  */
 class NodeReference extends FieldPluginBase {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getFieldFormatterMap() {
-    return [];
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/field/UserReference.php b/core/modules/migrate_drupal/src/Plugin/migrate/field/UserReference.php
index 4f1a6036eed2..11df8ec24383 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/field/UserReference.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/field/UserReference.php
@@ -15,13 +15,6 @@
  */
 class UserReference extends FieldPluginBase {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getFieldFormatterMap() {
-    return [];
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6FileField.php b/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6FileField.php
index 529907a35f0e..3f397592f1d9 100644
--- a/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6FileField.php
+++ b/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6FileField.php
@@ -16,11 +16,6 @@
  */
 class D6FileField extends CckFieldPluginBase {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getFieldFormatterMap() {}
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6NoCoreVersionSpecified.php b/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6NoCoreVersionSpecified.php
index 16967db97d88..74dfd3bcd74a 100644
--- a/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6NoCoreVersionSpecified.php
+++ b/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6NoCoreVersionSpecified.php
@@ -12,11 +12,6 @@
  */
 class D6NoCoreVersionSpecified extends CckFieldPluginBase {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getFieldFormatterMap() {}
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/migrate_drupal/tests/modules/migrate_field_plugin_manager_test/src/Plugin/migrate/cckfield/d6/FileField.php b/core/modules/migrate_drupal/tests/modules/migrate_field_plugin_manager_test/src/Plugin/migrate/cckfield/d6/FileField.php
index 903c7e87ee43..2ba83cbc1ef4 100644
--- a/core/modules/migrate_drupal/tests/modules/migrate_field_plugin_manager_test/src/Plugin/migrate/cckfield/d6/FileField.php
+++ b/core/modules/migrate_drupal/tests/modules/migrate_field_plugin_manager_test/src/Plugin/migrate/cckfield/d6/FileField.php
@@ -13,13 +13,6 @@
  */
 class FileField extends CckFieldPluginBase {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getFieldFormatterMap() {
-    return [];
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/migrate_drupal/tests/modules/migrate_field_plugin_manager_test/src/Plugin/migrate/field/D6FileField.php b/core/modules/migrate_drupal/tests/modules/migrate_field_plugin_manager_test/src/Plugin/migrate/field/D6FileField.php
index 08ca88cfa015..acb9d9cd7eb7 100644
--- a/core/modules/migrate_drupal/tests/modules/migrate_field_plugin_manager_test/src/Plugin/migrate/field/D6FileField.php
+++ b/core/modules/migrate_drupal/tests/modules/migrate_field_plugin_manager_test/src/Plugin/migrate/field/D6FileField.php
@@ -3,7 +3,6 @@
 namespace Drupal\migrate_field_plugin_manager_test\Plugin\migrate\field;
 
 use Drupal\migrate_drupal\Plugin\migrate\field\FieldPluginBase;
-use Drupal\migrate\Plugin\MigrationInterface;
 
 /**
  * @MigrateField(
@@ -14,18 +13,4 @@
  *   }
  * )
  */
-class D6FileField extends FieldPluginBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFieldFormatterMap() {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function processFieldValues(MigrationInterface $migration, $field_name, $data) {}
-
-}
+class D6FileField extends FieldPluginBase {}
diff --git a/core/modules/migrate_drupal/tests/modules/migrate_field_plugin_manager_test/src/Plugin/migrate/field/D6NoCoreVersionSpecified.php b/core/modules/migrate_drupal/tests/modules/migrate_field_plugin_manager_test/src/Plugin/migrate/field/D6NoCoreVersionSpecified.php
index 224388b1468b..39f109b6972c 100644
--- a/core/modules/migrate_drupal/tests/modules/migrate_field_plugin_manager_test/src/Plugin/migrate/field/D6NoCoreVersionSpecified.php
+++ b/core/modules/migrate_drupal/tests/modules/migrate_field_plugin_manager_test/src/Plugin/migrate/field/D6NoCoreVersionSpecified.php
@@ -3,7 +3,6 @@
 namespace Drupal\migrate_field_plugin_manager_test\Plugin\migrate\field;
 
 use Drupal\migrate_drupal\Plugin\migrate\field\FieldPluginBase;
-use Drupal\migrate\Plugin\MigrationInterface;
 
 /**
  * @MigrateField(
@@ -12,16 +11,5 @@
  */
 class D6NoCoreVersionSpecified extends FieldPluginBase {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getFieldFormatterMap() {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function processFieldValues(MigrationInterface $migration, $field_name, $data) {}
 
 }
diff --git a/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php b/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
index 2d4e719d36e2..886eb8413f3c 100644
--- a/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
@@ -16,13 +16,6 @@
  */
 class TaxonomyTermReference extends CckFieldPluginBase {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getFieldFormatterMap() {
-    return [];
-  }
-
   /**
    * {@inheritdoc}
    */
-- 
GitLab