Issue #2095961 by ekes: Remove instances of menu_get_object('user').

core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php

@@ -7,21 +7,62 @@
 
 namespace Drupal\user\Plugin\views\argument_default;
 
-use Drupal\Component\Annotation\Plugin;
-use Drupal\views\Annotation\ViewsArgumentDefault;
-use Drupal\Core\Annotation\Translation;
 use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Drupal\user\UserInterface;
+use Drupal\node\NodeInterface;
 
 /**
- * Default argument plugin to extract a user via menu_get_object.
+ * Default argument plugin to extract a user from request.
  *
  * @ViewsArgumentDefault(
  *   id = "user",
- *   title = @Translation("User ID from URL")
+ *   title = @Translation("User ID from route context")
  * )
  */
 class User extends ArgumentDefaultPluginBase {
 
+  /**
+   * The request object.
+   *
+   * @var \Symfony\Component\HttpFoundation\Request
+   */
+  protected $request;
+
+  /**
+   * Constructs a default argument User object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param array $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The request object.
+   */
+  public function __construct(array $configuration, $plugin_id, array $plugin_definition, Request $request) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+
+    $this->request = $request;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('request')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   protected function defineOptions() {
     $options = parent::defineOptions();
     $options['user'] = array('default' => '', 'bool' => TRUE, 'translatable' => FALSE);
@@ -29,6 +70,9 @@ protected function defineOptions() {
     return $options;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function buildOptionsForm(&$form, &$form_state) {
     $form['user'] = array(
       '#type' => 'checkbox',
@@ -37,44 +81,28 @@ public function buildOptionsForm(&$form, &$form_state) {
     );
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function getArgument() {
-    foreach (range(1, 3) as $i) {
-      $user = menu_get_object('user', $i);
-      if (!empty($user)) {
-        return $user->id();
-      }
-    }
 
-    foreach (range(1, 3) as $i) {
-      $user = menu_get_object('user_uid_optional', $i);
-      if (!empty($user)) {
+    // If there is a user object in the current route.
+    if ($this->request->attributes->has('user')) {
+      $user = $this->request->attributes->get('user');
+      if ($user instanceof UserInterface) {
         return $user->id();
       }
     }
 
-    if (!empty($this->options['user'])) {
-      foreach (range(1, 3) as $i) {
-        $node = menu_get_object('node', $i);
-        if (!empty($node)) {
-          return $node->getAuthorId();
-        }
-      }
-    }
-
-    if (arg(0) == 'user' && is_numeric(arg(1))) {
-      return arg(1);
-    }
-
-    if (!empty($this->options['user'])) {
-      if (arg(0) == 'node' && is_numeric(arg(1))) {
-        $node = node_load(arg(1));
-        if ($node) {
-          return $node->getAuthorId();
-        }
+    // If option to use node author; and node in current route.
+    if (!empty($this->options['user']) && $this->request->attributes->has('node')) {
+      $node = $this->request->attributes->get('node');
+      if ($node instanceof NodeInterface) {
+        return $node->getAuthorId();
       }
     }
 
-    // If the current page is a view that takes uid as an argument, return the uid.
+    // If the current page is a view that takes uid as an argument.
     $view = views_get_page_view();
 
     if ($view && isset($view->argument['uid'])) {