Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / user / src / Plugin / migrate / ProfileValues.php

diff --git a/web/core/modules/user/src/Plugin/migrate/ProfileValues.php b/web/core/modules/user/src/Plugin/migrate/ProfileValues.php
index b082d591af24a91d464b240267764cc1f195e913..8399436c033c1c91c29cc45093a2632bd479cbc6 100644 (file)
--- a/web/core/modules/user/src/Plugin/migrate/ProfileValues.php
+++ b/web/core/modules/user/src/Plugin/migrate/ProfileValues.php
@@ -3,6 +3,8 @@
 namespace Drupal\user\Plugin\migrate;
 
 use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\MigrateExecutable;
+use Drupal\migrate\MigrateSkipRowException;
 use Drupal\migrate\Plugin\Migration;
 
 /**
@@ -31,11 +33,28 @@ class ProfileValues extends Migration {
       $definition['idMap']['plugin'] = 'null';
       try {
         $profile_field_migration = $this->migrationPluginManager->createStubMigration($definition);
+        $migrate_executable = new MigrateExecutable($profile_field_migration);
         $source_plugin = $profile_field_migration->getSourcePlugin();
         $source_plugin->checkRequirements();
         foreach ($source_plugin as $row) {
           $name = $row->getSourceProperty('name');
-          $this->process[$name] = $name;
+          $fid = $row->getSourceProperty('fid');
+          // The user profile field name can be greater than 32 characters. Use
+          // the migrated profile field name in the process pipeline.
+          $configuration =
+            [
+              'migration' => 'user_profile_field',
+              'source_ids' => $fid,
+            ];
+          $plugin = $this->processPluginManager->createInstance('migration_lookup', $configuration, $profile_field_migration);
+          $new_value = $plugin->transform($fid, $migrate_executable, $row, 'tmp');
+          if (isset($new_value[1])) {
+            // Set the destination to the migrated profile field name.
+            $this->process[$new_value[1]] = $name;
+          }
+          else {
+            throw new MigrateSkipRowException("Can't migrate source field $name.");
+          }
         }
       }
       catch (RequirementsException $e) {