Update to Drupal 8.1.0. For more information, see https://www.drupal.org/drupal-8.1.0-release-notes

core/modules/user/config/install/user.mail.yml

@@ -20,7 +20,7 @@ status_activated:
   body: "[user:display-name],\n\nYour account at [site:name] has been activated.\n\nYou may now log in by clicking this link or copying and pasting it into your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:account-name]\npassword: Your password\n\n--  [site:name] team"
   subject: 'Account details for [user:display-name] at [site:name] (approved)'
 status_blocked:
-  body: "[user:display-name],\n\nYour account on [site:account-name] has been blocked.\n\n--  [site:name] team"
+  body: "[user:display-name],\n\nYour account on [site:name] has been blocked.\n\n--  [site:name] team"
   subject: 'Account details for [user:display-name] at [site:name] (blocked)'
 status_canceled:
   body: "[user:display-name],\n\nYour account on [site:name] has been canceled.\n\n--  [site:name] team"

core/modules/user/config/schema/user.destination.schema.yml

@@ -1,9 +0,0 @@
-# Schema for the migrate destination plugin.
-
-migrate.destination.entity:user:
-  type: migrate_destination
-  label: 'User'
-  mapping:
-    md5_passwords:
-      type: boolean
-      label: 'Passwords'

core/modules/user/config/schema/user.source.schema.yml

@@ -1,47 +0,0 @@
-# Schema for the user module's migration source plugins.
-
-migrate.source.d6_user:
-  type: migrate_source_sql
-  label: 'Drupal 6 user'
-  mapping:
-    constants:
-      type: mapping
-      label: 'Constants'
-      mapping:
-        key:
-          type: string
-          label: 'User data key'
-        module:
-          type: string
-          label: 'Module name'
-
-migrate.source.d6_user_picture_file:
-  type: migrate_source_sql
-  label: 'Drupal 6 user picture display'
-  mapping:
-    constants:
-      type: mapping
-      label: 'Constant'
-      mapping:
-        is_public:
-          type: boolean
-          label: 'Public'
-
-migrate.source.d6_user_picture_instance:
-  type: migrate_source_sql
-  label: 'Drupal 6 user picture display'
-  mapping:
-    provider:
-      type: string
-      label: 'Provider'
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.profile_field:
-  type: migrate_source_sql
-  label: 'Profile field'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'

core/modules/user/migration_templates/d6_profile_values.yml

@@ -1,5 +1,6 @@
 id: d6_profile_values
 label: Profile values
+class: Drupal\user\Plugin\migrate\ProfileValues
 migration_tags:
   - Drupal 6
 builder:

core/modules/user/migration_templates/d6_user.yml

@@ -26,6 +26,7 @@ process:
     plugin: migration
     migration: d6_user_picture_file
     source: uid
+    no_stub: true
 destination:
   plugin: entity:user
   md5_passwords: true

core/modules/user/migration_templates/d7_user.yml

@@ -2,8 +2,7 @@ id: d7_user
 label: User accounts
 migration_tags:
   - Drupal 7
-builder:
-  plugin: d7_user
+class: Drupal\user\Plugin\migrate\User
 source:
   plugin: d7_user
 process:

core/modules/user/src/Access/LoginStatusCheck.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Access\LoginStatusCheck.
- */
-
 namespace Drupal\user\Access;
 
 use Drupal\Core\Access\AccessResult;

core/modules/user/src/Access/PermissionAccessCheck.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Access\PermissionAccessCheck.
- */
-
 namespace Drupal\user\Access;
 
 use Drupal\Core\Access\AccessResult;

core/modules/user/src/Access/RegisterAccessCheck.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Access\RegisterAccessCheck.
- */
-
 namespace Drupal\user\Access;
 
 use Drupal\Core\Access\AccessResult;

core/modules/user/src/Access/RoleAccessCheck.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Access\RoleAccessCheck.
- */
-
 namespace Drupal\user\Access;
 
 use Drupal\Core\Access\AccessResult;

core/modules/user/src/AccountForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\AccountForm.
- */
-
 namespace Drupal\user;
 
 use Drupal\Component\Utility\Crypt;
@@ -127,8 +122,9 @@ abstract class AccountForm extends ContentEntityForm {
       // To skip the current password field, the user must have logged in via a
       // one-time link and have the token in the URL. Store this in $form_state
       // so it persists even on subsequent Ajax requests.
-      if (!$form_state->get('user_pass_reset')) {
-        $user_pass_reset = isset($_SESSION['pass_reset_' . $account->id()]) && Crypt::hashEquals($_SESSION['pass_reset_' . $account->id()], \Drupal::request()->query->get('pass-reset-token'));
+      if (!$form_state->get('user_pass_reset') && ($token = $this->getRequest()->get('pass-reset-token'))) {
+        $session_key = 'pass_reset_' . $account->id();
+        $user_pass_reset = isset($_SESSION[$session_key]) && Crypt::hashEquals($_SESSION[$session_key], $token);
         $form_state->set('user_pass_reset', $user_pass_reset);
       }
 

core/modules/user/src/AccountSettingsForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\AccountSettingsForm.
- */
-
 namespace Drupal\user;
 
 use Drupal\Core\Form\ConfigFormBase;

core/modules/user/src/Authentication/Provider/Cookie.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Authentication\Provider\Cookie.
- */
-
 namespace Drupal\user\Authentication\Provider;
 
 use Drupal\Core\Authentication\AuthenticationProviderInterface;

core/modules/user/src/ContextProvider/CurrentUserContext.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\ContextProvider\CurrentUserContext.
- */
-
 namespace Drupal\user\ContextProvider;
 
 use Drupal\Core\Cache\CacheableMetadata;

core/modules/user/src/Controller/UserController.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Controller\UserController.
- */
-
 namespace Drupal\user\Controller;
 
 use Drupal\Component\Utility\Crypt;

core/modules/user/src/Entity/Role.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Entity\Role.
- */
-
 namespace Drupal\user\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBase;

core/modules/user/src/Entity/User.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Entity\User.
- */
-
 namespace Drupal\user\Entity;
 
 use Drupal\Core\Entity\ContentEntityBase;

core/modules/user/src/Entity/UserRouteProvider.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Entity\UserRouteProvider.
- */
-
 namespace Drupal\user\Entity;
 
 use Drupal\Core\Entity\EntityTypeInterface;

core/modules/user/src/EntityOwnerInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\EntityOwnerInterface.
- */
-
 namespace Drupal\user;
 
 /**

core/modules/user/src/EventSubscriber/AccessDeniedSubscriber.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\EventSubscriber\AccessDeniedSubscriber.
- */
-
 namespace Drupal\user\EventSubscriber;
 
 use Drupal\Core\Session\AccountInterface;
@@ -43,7 +38,7 @@ class AccessDeniedSubscriber implements EventSubscriberInterface {
    * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
    *   The URL generator.
    */
-  public function __construct(AccountInterface $account, URLGeneratorInterface $url_generator) {
+  public function __construct(AccountInterface $account, UrlGeneratorInterface $url_generator) {
     $this->account = $account;
     $this->setUrlGenerator($url_generator);
   }

core/modules/user/src/EventSubscriber/MaintenanceModeSubscriber.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\EventSubscriber\MaintenanceModeSubscriber.
- */
-
 namespace Drupal\user\EventSubscriber;
 
 use Drupal\Core\Routing\RouteMatch;

core/modules/user/src/EventSubscriber/UserRequestSubscriber.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\EventSubscriber\UserRequestSubscriber.
- */
-
 namespace Drupal\user\EventSubscriber;
 
 use Drupal\Core\Entity\EntityManagerInterface;

core/modules/user/src/Form/UserCancelForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Form\UserCancelForm.
- */
-
 namespace Drupal\user\Form;
 
 use Drupal\Core\Entity\ContentEntityConfirmFormBase;

core/modules/user/src/Form/UserLoginForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Form\UserLoginForm.
- */
-
 namespace Drupal\user\Form;
 
 use Drupal\Core\Flood\FloodInterface;

core/modules/user/src/Form/UserMultipleCancelConfirm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Form\UserMultipleCancelConfirm.
- */
-
 namespace Drupal\user\Form;
 
 use Drupal\Core\Entity\EntityManagerInterface;

core/modules/user/src/Form/UserPasswordForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Form\UserPasswordForm.
- */
-
 namespace Drupal\user\Form;
 
 use Drupal\Core\Form\FormBase;

core/modules/user/src/Form/UserPasswordResetForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Form\UserPasswordResetForm.
- */
-
 namespace Drupal\user\Form;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/user/src/Form/UserPermissionsForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Form\UserPermissionsForm.
- */
-
 namespace Drupal\user\Form;
 
 use Drupal\Core\Extension\ModuleHandlerInterface;

core/modules/user/src/Form/UserPermissionsRoleSpecificForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Form\UserPermissionsRoleSpecificForm.
- */
-
 namespace Drupal\user\Form;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/user/src/MigratePassword.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\MigratePassword.
- */
-
 namespace Drupal\user;
 
 use Drupal\Core\Password\PasswordInterface;

core/modules/user/src/PermissionHandler.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\PermissionHandler.
- */
-
 namespace Drupal\user;
 
 use Drupal\Component\Discovery\YamlDiscovery;
@@ -163,8 +158,8 @@ class PermissionHandler implements PermissionHandlerInterface {
 
               $callback_permission += array(
                 'description' => NULL,
+                'provider' => $provider,
               );
-              $callback_permission['provider'] = $provider;
 
               $all_callback_permissions[$name] = $callback_permission;
             }
@@ -182,7 +177,7 @@ class PermissionHandler implements PermissionHandlerInterface {
         }
         $permission['title'] = $this->t($permission['title']);
         $permission['description'] = isset($permission['description']) ? $this->t($permission['description']) : NULL;
-        $permission['provider'] = $provider;
+        $permission['provider'] = !empty($permission['provider']) ? $permission['provider'] : $provider;
       }
 
       $all_permissions += $permissions;

core/modules/user/src/PermissionHandlerInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\PermissionHandlerInterface.
- */
-
 namespace Drupal\user;
 
 /**

core/modules/user/src/Plugin/Action/AddRoleUser.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Action\AddRoleUser.
- */
-
 namespace Drupal\user\Plugin\Action;
 
 /**

core/modules/user/src/Plugin/Action/BlockUser.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Action\BlockUser.
- */
-
 namespace Drupal\user\Plugin\Action;
 
 use Drupal\Core\Action\ActionBase;

core/modules/user/src/Plugin/Action/CancelUser.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Action\CancelUser.
- */
-
 namespace Drupal\user\Plugin\Action;
 
 use Drupal\Core\Action\ActionBase;

core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Action\ChangeUserRoleBase.
- */
-
 namespace Drupal\user\Plugin\Action;
 
 use Drupal\Core\Action\ConfigurableActionBase;

core/modules/user/src/Plugin/Action/RemoveRoleUser.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Action\RemoveRoleUser.
- */
-
 namespace Drupal\user\Plugin\Action;
 
 /**

core/modules/user/src/Plugin/Action/UnblockUser.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Action\UnblockUser.
- */
-
 namespace Drupal\user\Plugin\Action;
 
 use Drupal\Core\Action\ActionBase;

core/modules/user/src/Plugin/Block/UserLoginBlock.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Block\UserLoginBlock.
- */
-
 namespace Drupal\user\Plugin\Block;
 
 use Drupal\Core\Access\AccessResult;

core/modules/user/src/Plugin/Condition/UserRole.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Condition\UserRole.
- */
-
 namespace Drupal\user\Plugin\Condition;
 
 use Drupal\Core\Condition\ConditionPluginBase;

core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\EntityReferenceSelection\UserSelection.
- */
-
 namespace Drupal\user\Plugin\EntityReferenceSelection;
 
 use Drupal\Core\Database\Connection;

core/modules/user/src/Plugin/Field/FieldFormatter/AuthorFormatter.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Field\FieldFormatter\AuthorFormatter.
- */
-
 namespace Drupal\user\Plugin\Field\FieldFormatter;
 
 use Drupal\Core\Access\AccessResult;

core/modules/user/src/Plugin/Field/FieldFormatter/UserNameFormatter.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Field\FieldFormatter\UserNameFormatter.
- */
-
 namespace Drupal\user\Plugin\Field\FieldFormatter;
 
 use Drupal\Core\Field\FieldDefinitionInterface;

core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUser.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\LanguageNegotiation\LanguageNegotiationUser.
- */
-
 namespace Drupal\user\Plugin\LanguageNegotiation;
 
 use Drupal\language\LanguageNegotiationMethodBase;

core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUserAdmin.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\LanguageNegotiation\LanguageNegotiationUserAdmin.
- */
-
 namespace Drupal\user\Plugin\LanguageNegotiation;
 
 use Drupal\Core\PathProcessor\PathProcessorManager;

core/modules/user/src/Plugin/Menu/LoginLogoutMenuLink.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Menu\LoginLogoutMenuLink.
- */
-
 namespace Drupal\user\Plugin\Menu;
 
 use Drupal\Core\Menu\MenuLinkDefault;

core/modules/user/src/Plugin/Search/UserSearch.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Search\UserSearch.
- */
-
 namespace Drupal\user\Plugin\Search;
 
 use Drupal\Core\Access\AccessResult;

core/modules/user/src/Plugin/Validation/Constraint/ProtectedUserFieldConstraint.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Validation\Constraint\ProtectedUserFieldConstraint.
- */
-
 namespace Drupal\user\Plugin\Validation\Constraint;
 
 use Symfony\Component\Validator\Constraint;

core/modules/user/src/Plugin/Validation/Constraint/ProtectedUserFieldConstraintValidator.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\user\Plugin\Validation\Constraint\ProtectedUserFieldConstraintValidator.
- */
 
 namespace Drupal\user\Plugin\Validation\Constraint;
 

core/modules/user/src/Plugin/Validation/Constraint/UserMailRequired.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Validation\Constraint\UserMailRequired.
- */
-
 namespace Drupal\user\Plugin\Validation\Constraint;
 
 use Symfony\Component\Validator\Constraint;

core/modules/user/src/Plugin/Validation/Constraint/UserMailUnique.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Validation\Constraint\UserMailUnique.
- */
-
 namespace Drupal\user\Plugin\Validation\Constraint;
 
 use Drupal\Core\Validation\Plugin\Validation\Constraint\UniqueFieldConstraint;

core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraint.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Validation\Constraint\UserNameConstraint.
- */
-
 namespace Drupal\user\Plugin\Validation\Constraint;
 
 use Symfony\Component\Validator\Constraint;

core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraintValidator.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Validation\Constraint\UserNameConstraintValidator.
- */
-
 namespace Drupal\user\Plugin\Validation\Constraint;
 
 use Drupal\Component\Utility\Unicode;

core/modules/user/src/Plugin/Validation/Constraint/UserNameUnique.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\Validation\Constraint\UserNameUnique.
- */
-
 namespace Drupal\user\Plugin\Validation\Constraint;
 
 use Drupal\Core\Validation\Plugin\Validation\Constraint\UniqueFieldConstraint;

core/modules/user/src/Plugin/migrate/ProfileValues.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Drupal\user\Plugin\migrate;
+
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\Plugin\Migration;
+
+/**
+ * Plugin class for user migrations dealing with profile values.
+ */
+class ProfileValues extends Migration {
+
+  /**
+   * Flag determining whether the process plugin has been initialized.
+   *
+   * @var bool
+   */
+  protected $init = FALSE;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getProcess() {
+    if (!$this->init) {
+      $this->init = TRUE;
+      $definition['source'] = [
+        'plugin' => 'profile_field',
+        'ignore_map' => TRUE,
+      ] + $this->source;
+      $definition['destination']['plugin'] = 'null';
+      try {
+        $profile_field_migration = $this->migrationPluginManager->createStubMigration($definition);
+        $source_plugin = $profile_field_migration->getSourcePlugin();
+        $source_plugin->checkRequirements();
+        foreach ($source_plugin as $row) {
+          $name = $row->getSourceProperty('name');
+          $this->process[$name] = $name;
+        }
+      }
+      catch (RequirementsException $e) {
+        // The checkRequirements() call will fail when the profile module does
+        // not exist on the source site.
+      }
+    }
+    return parent::getProcess();
+  }
+
+}

core/modules/user/src/Plugin/migrate/User.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Drupal\user\Plugin\migrate;
+
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\Plugin\Migration;
+
+/**
+ * Plugin class for Drupal 7 user migrations dealing with fields and profiles.
+ */
+class User extends Migration {
+
+  /**
+   * Flag indicating whether the CCK data has been filled already.
+   *
+   * @var bool
+   */
+  protected $init = FALSE;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getProcess() {
+    if (!$this->init) {
+      $this->init = TRUE;
+      $definition['source'] = [
+        'entity_type' => 'user',
+        'ignore_map' => TRUE,
+      ] + $this->source;
+      $definition['destination']['plugin'] = 'null';
+      if (\Drupal::moduleHandler()->moduleExists('field')) {
+        $definition['source']['plugin'] = 'd7_field_instance';
+        $field_migration = $this->migrationPluginManager->createStubMigration($definition);
+        foreach ($field_migration->getSourcePlugin() as $row) {
+          $field_name = $row->getSourceProperty('field_name');
+          $this->process[$field_name] = $field_name;
+        }
+      }
+      try {
+        $definition['source']['plugin'] = 'profile_field';
+        $profile_migration = $this->migrationPluginManager->createStubMigration($definition);
+        // Ensure that Profile is enabled in the source DB.
+        $profile_migration->checkRequirements();
+        foreach ($profile_migration->getSourcePlugin() as $row) {
+          $name = $row->getSourceProperty('name');
+          $this->process[$name] = $name;
+        }
+      }
+      catch (RequirementsException $e) {
+        // The checkRequirements() call will fail when the profile module does
+        // not exist on the source site.
+      }
+    }
+    return parent::getProcess();
+  }
+
+}

core/modules/user/src/Plugin/migrate/builder/d6/ProfileValues.php

@@ -1,42 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\builder\d6\ProfileValues.
- */
-
-namespace Drupal\user\Plugin\migrate\builder\d6;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Exception\RequirementsException;
-use Drupal\migrate\Plugin\migrate\builder\BuilderBase;
-
-/**
- * @PluginID("d6_profile_values")
- */
-class ProfileValues extends BuilderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildMigrations(array $template) {
-    $migration = Migration::create($template);
-
-    // @TODO The source plugin should accept a database connection.
-    // @see https://www.drupal.org/node/2552791
-    $source_plugin = $this->getSourcePlugin('profile_field', $template['source']);
-    try {
-      $source_plugin->checkRequirements();
-    }
-    catch (RequirementsException $e) {
-      return [];
-    }
-
-    foreach ($source_plugin as $field) {
-      $migration->setProcessOfProperty($field->getSourceProperty('name'), $field->getSourceProperty('name'));
-    }
-
-    return [$migration];
-  }
-
-}

core/modules/user/src/Plugin/migrate/builder/d7/User.php

@@ -1,90 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\builder\d7\User.
- */
-
-namespace Drupal\user\Plugin\migrate\builder\d7;
-
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Exception\RequirementsException;
-use Drupal\migrate\Plugin\migrate\builder\BuilderBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * @PluginID("d7_user")
- */
-class User extends BuilderBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The module handler service.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * Constructs a d7_user builder plugin instance.
-   *
-   * @param array $configuration
-   *   The plugin configuration.
-   * @param string $plugin_id
-   *   The plugin ID.
-   * @param mixed $plugin_definition
-   *   The plugin definition.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ModuleHandlerInterface $module_handler) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->moduleHandler = $module_handler;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('module_handler')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildMigrations(array $template) {
-    $migration = Migration::create($template);
-
-    if ($this->moduleHandler->moduleExists('field')) {
-      $template['source']['entity_type'] = 'user';
-
-      $source_plugin = $this->getSourcePlugin('d7_field_instance', $template['source']);
-      foreach ($source_plugin as $field) {
-        $field_name = $field->getSourceProperty('field_name');
-        $migration->setProcessOfProperty($field_name, $field_name);
-      }
-    }
-
-    try {
-      $profile_fields = $this->getSourcePlugin('profile_field', $template['source']);
-      // Ensure that Profile is enabled in the source DB.
-      $profile_fields->checkRequirements();
-      foreach ($profile_fields as $field) {
-        $field_name = $field->getSourceProperty('name');
-        $migration->setProcessOfProperty($field_name, $field_name);
-      }
-    }
-    catch (RequirementsException $e) {
-      // Profile is not enabled in the source DB, so don't do anything.
-    }
-
-    return [$migration];
-  }
-
-}

core/modules/user/src/Plugin/migrate/destination/EntityUser.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\destination\EntityUser.
- */
-
 namespace Drupal\user\Plugin\migrate\destination;
 
 use Drupal\Component\Utility\Unicode;
@@ -13,7 +8,7 @@ use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
 use Drupal\Core\Field\Plugin\Field\FieldType\EmailItem;
 use Drupal\Core\Password\PasswordInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateException;
 use Drupal\user\MigratePassword;
 use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
@@ -43,7 +38,7 @@ class EntityUser extends EntityContentBase {
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration.
    * @param EntityStorageInterface $storage
    *   The storage for this entity type.

core/modules/user/src/Plugin/migrate/destination/UserData.php

@@ -1,13 +1,8 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\destination\UserData.
- */
-
 namespace Drupal\user\Plugin\migrate\destination;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\user\UserData as UserDataStorage;
 use Drupal\migrate\Row;
 use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
@@ -35,7 +30,7 @@ class UserData extends DestinationBase implements ContainerFactoryPluginInterfac
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration.
    * @param \Drupal\user\UserData $user_data
    *   The user data service.

core/modules/user/src/Plugin/migrate/process/ConvertTokens.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\process\ConvertTokens.
- */
-
 namespace Drupal\user\Plugin\migrate\process;
 
 use Drupal\migrate\MigrateException;

core/modules/user/src/Plugin/migrate/process/ProfileFieldSettings.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\process\ProfileFieldSettings.
- */
-
 namespace Drupal\user\Plugin\migrate\process;
 
 use Drupal\migrate\MigrateExecutableInterface;

core/modules/user/src/Plugin/migrate/process/UserUpdate8002.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\process\UserUpdate8002.
- */
-
 namespace Drupal\user\Plugin\migrate\process;
 
 use Drupal\migrate\MigrateExecutableInterface;

core/modules/user/src/Plugin/migrate/process/d6/UserUpdate7002.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\process\d6\UserUpdate7002.
- */
-
 namespace Drupal\user\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutableInterface;

core/modules/user/src/Plugin/migrate/source/ProfileField.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\source\ProfileField.
- */
-
 namespace Drupal\user\Plugin\migrate\source;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;

core/modules/user/src/Plugin/migrate/source/UserPictureInstance.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\source\UserPictureInstance.
- */
-
 namespace Drupal\user\Plugin\migrate\source;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;

core/modules/user/src/Plugin/migrate/source/d6/ProfileFieldValues.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\source\d6\ProfileFieldValues.
- */
-
 namespace Drupal\user\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;

core/modules/user/src/Plugin/migrate/source/d6/Role.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\source\d6\Role.
- */
-
 namespace Drupal\user\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;

core/modules/user/src/Plugin/migrate/source/d6/User.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\source\d6\User.
- */
-
 namespace Drupal\user\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;

core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\source\d6\UserPicture.
- */
-
 namespace Drupal\user\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;

core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\source\d6\UserPictureFile.
- */
-
 namespace Drupal\user\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;

core/modules/user/src/Plugin/migrate/source/d7/Role.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\source\d7\Role.
- */
-
 namespace Drupal\user\Plugin\migrate\source\d7;
 
 use Drupal\migrate\Row;

core/modules/user/src/Plugin/migrate/source/d7/User.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\source\d7\User.
- */
-
 namespace Drupal\user\Plugin\migrate\source\d7;
 
 use Drupal\migrate\Row;

core/modules/user/src/Plugin/views/access/Permission.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\access\Permission.
- */
-
 namespace Drupal\user\Plugin\views\access;
 
 use Drupal\Core\Cache\Cache;

core/modules/user/src/Plugin/views/access/Role.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\access\Role.
- */
-
 namespace Drupal\user\Plugin\views\access;
 
 use Drupal\Core\Cache\Cache;

core/modules/user/src/Plugin/views/argument/RolesRid.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\argument\RolesRid.
- */
-
 namespace Drupal\user\Plugin\views\argument;
 
 use Drupal\Core\Entity\EntityManagerInterface;

core/modules/user/src/Plugin/views/argument/Uid.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\argument\Uid.
- */
-
 namespace Drupal\user\Plugin\views\argument;
 
 use Drupal\Core\Entity\EntityStorageInterface;

core/modules/user/src/Plugin/views/argument_default/CurrentUser.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\argument_default\CurrentUser.
- */
-
 namespace Drupal\user\Plugin\views\argument_default;
 
 use Drupal\Core\Cache\Cache;

core/modules/user/src/Plugin/views/argument_default/User.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\argument_default\User.
- */
-
 namespace Drupal\user\Plugin\views\argument_default;
 
 use Drupal\Core\Cache\Cache;

core/modules/user/src/Plugin/views/argument_validator/User.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\argument_validator\User.
- */
-
 namespace Drupal\user\Plugin\views\argument_validator;
 
 use Drupal\Core\Entity\EntityInterface;

core/modules/user/src/Plugin/views/argument_validator/UserName.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\argument_validator\UserName.
- */
-
 namespace Drupal\user\Plugin\views\argument_validator;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/user/src/Plugin/views/field/Permissions.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\field\Permissions.
- */
-
 namespace Drupal\user\Plugin\views\field;
 
 use Drupal\Core\Entity\EntityManagerInterface;

core/modules/user/src/Plugin/views/field/Roles.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\field\Roles.
- */
-
 namespace Drupal\user\Plugin\views\field;
 
 use Drupal\Core\Database\Connection;

core/modules/user/src/Plugin/views/field/UserBulkForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\field\UserBulkForm.
- */
-
 namespace Drupal\user\Plugin\views\field;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/user/src/Plugin/views/field/UserData.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\field\UserData.
- */
-
 namespace Drupal\user\Plugin\views\field;
 
 use Drupal\Core\Extension\ModuleHandlerInterface;

core/modules/user/src/Plugin/views/filter/Current.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\filter\Current.
- */
-
 namespace Drupal\user\Plugin\views\filter;
 
 use Drupal\views\Plugin\views\display\DisplayPluginBase;

core/modules/user/src/Plugin/views/filter/Name.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\filter\Name.
- */
-
 namespace Drupal\user\Plugin\views\filter;
 
 use Drupal\Core\Entity\Element\EntityAutocomplete;

core/modules/user/src/Plugin/views/filter/Permissions.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\filter\Permissions.
- */
-
 namespace Drupal\user\Plugin\views\filter;
 
 use Drupal\Component\Utility\Html;

core/modules/user/src/Plugin/views/filter/Roles.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\filter\Roles.
- */
-
 namespace Drupal\user\Plugin\views\filter;
 
 use Drupal\user\RoleInterface;

core/modules/user/src/Plugin/views/row/UserRow.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\row\UserRow.
- */
-
 namespace Drupal\user\Plugin\views\row;
 
 use Drupal\views\Plugin\views\row\EntityRow;

core/modules/user/src/Plugin/views/wizard/Users.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\Plugin\views\wizard\Users.
- */
-
 namespace Drupal\user\Plugin\views\wizard;
 
 use Drupal\views\Plugin\views\wizard\WizardPluginBase;

core/modules/user/src/PrivateTempStore.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\PrivateTempStore.
- */
-
 namespace Drupal\user;
 
 use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface;

core/modules/user/src/PrivateTempStoreFactory.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\PrivateTempStoreFactory.
- */
-
 namespace Drupal\user;
 
 use Drupal\Core\KeyValueStore\KeyValueExpirableFactoryInterface;

core/modules/user/src/ProfileForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\ProfileForm.
- */
-
 namespace Drupal\user;
 
 use Drupal\Core\Entity\EntityManagerInterface;

core/modules/user/src/ProfileTranslationHandler.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\ProfileTranslationHandler.
- */
-
 namespace Drupal\user;
 
 use Drupal\Core\Entity\EntityInterface;

core/modules/user/src/RegisterForm.php

@@ -1,29 +1,14 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\user\RegisterForm.
- */
-
 namespace Drupal\user;
 
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
 
 /**
  * Form handler for the user register forms.
  */
 class RegisterForm extends AccountForm {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(EntityManagerInterface $entity_manager, LanguageManagerInterface $language_manager, QueryFactory $entity_query) {
-    parent::__construct($entity_manager, $language_manager, $entity_query);
-  }
-
   /**
    * {@inheritdoc}
    */