The current user views default argument should use dependency injection

Re-rolled #2 for 9.4.

removed following code from the patch because the change is already there.

--- a/core/modules/user/src/Plugin/views/argument_default/CurrentUser.php
+++ b/core/modules/user/src/Plugin/views/argument_default/CurrentUser.php
@@ -4,10 +4,12 @@
 
 
 /**
- * Default argument plugin to extract the current user
+ * Default argument plugin to extract the current user.
  *
  * This plugin actually has no options so it does not need to do a great deal.
  *
--- a/core/modules/user/src/Plugin/views/argument_default/User.php
+++ b/core/modules/user/src/Plugin/views/argument_default/User.php
@@ -37,7 +37,6 @@ class User extends ArgumentDefaultPluginBase implements CacheableDependencyInter
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   *
    * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
    *   The route match.
    */

This issue is being reviewed by the kind folks in Slack, #needs-review-queue-initiative. We are working to keep the size of Needs Review queue [2700+ issues] to around 400 (1 month or less), following Review a patch or merge request as a guide.

Couldn't find the meta but this would fall under replacing service calls with dependency injections one.

+++ b/core/modules/user/src/Plugin/views/argument_default/CurrentUser.php
@@ -18,11 +20,42 @@
+  /**
+   * CurrentUser constructor.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Session\AccountProxyInterface $currentUser
+   *   The current user.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, AccountProxyInterface $currentUser) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->currentUser = $currentUser;
+  }

This should use property promotion and also needs to do a deprecation dance... something like this

  public function __construct(array $configuration, $plugin_id, $plugin_definition, protected ?AccountProxyInterface $currentUser = NULL) {
    parent::__construct($configuration, $plugin_id, $plugin_definition);
    if ($currentUser === NULL) {
      @trigger_error('Calling ' . __CLASS__ . '::__construct() without the $currentUser argument is deprecated in drupal:10.1.0 and is removed in drupal:11.0.0. See https://www.drupal.org/node/TBD', E_USER_DEPRECATED);
      $this->currentUser = \Drupal::currentUser();
    }
  }

Note a change record will need to be put in place.

Addressed #12 as per that updating patch and attaching the inter_diff along.

Addressed #12 as per that updating patch and attaching the inter_diff along.

attaching the inter_diff

@Ranjit1032002 try

if ($currentUser === NULL) {
  @trigger_error...
  $currentUser = \Drupal::currentUser();
}
$this->currentUser = $currentUser;

Adding updated #14 patch after change record.

Needs the change record to review now.

Change record https://www.drupal.org/node/3347878

Still needs work. Change link https://www.drupal.org/node/TBD.
+ @trigger_error('Calling' . __CLASS__ . '::__construct() without the $currentUser argument is deprecated in drupal:10.1.0 and is removed in drupal:11.0.0. See https://www.drupal.org/node/TBD', E_USER_DEPRECATED);

1/ Naming conventions should be consistent throughout the code. Change $currentUser to $current_user.
public function __construct(array $configuration, $plugin_id, $plugin_definition, AccountProxyInterface $currentUser = NULL) {

2/ It should be more descriptive.

+  /**
+   * CurrentUser.
+   *
+   * @var \Drupal\Core\Session\AccountProxyInterface
+   */
+  protected $currentUser;
+
+  /**
+   * CurrentUser constructor.

Updated the patch as per #21 & #22, please review.
*interdiff is with #19

'Calling' . __CLASS__ . '::__construct() without the $currentUser argument
One more $currentUser to change to $current_user.

Updated according to #24. please review.

Will need a simple deprecation test to ensure the message is returned correctly

This patch was working great, but it no longer applies to 10.3.1 resulting in the following error that prevents the upgrade.

Fatal error: Could not check compatibility between Drupal\user\Plugin\views\argument_default\CurrentUser::create(Drupal\user\Plugin\views\argument_default\ContainerInterface $container, arr
ay $configuration, $plugin_id, $plugin_definition) and Drupal\views\Plugin\views\PluginBase::create(Symfony\Component\DependencyInjection\ContainerInterface $container, array $configuration
, $plugin_id, $plugin_definition), because class Drupal\user\Plugin\views\argument_default\ContainerInterface is not available in .../web/core/modules/user/src/Plugin/views/argument_default/CurrentUser.php on line 53

Oh so the only part of the patch that is needed for 10.3 is this. Once applied the update works.

diff --git a/core/modules/user/src/Plugin/views/argument_default/CurrentUser.php b/core/modules/user/src/Plugin/views/argument_default/CurrentUser.php
index 251d47198b..b0c11febe4 100644
--- a/core/modules/user/src/Plugin/views/argument_default/CurrentUser.php
+++ b/core/modules/user/src/Plugin/views/argument_default/CurrentUser.php
@@ -4,7 +4,9 @@

use Drupal\Core\Cache\Cache;
use Drupal\Core\Cache\CacheableDependencyInterface;
+use Drupal\Core\Session\AccountProxyInterface;
use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;

That's great I found this issue, because I wasn't sure if DI should be used here.
I will update patch, update message, add deprecation test and move from patch to MR approach.

Mark $current_user argument as nullable.
MR is ready for review.

Left some comments on the MR.

Thanks for feedback. I will update MR.

Thanks again for your feedback. I made changes, MR is ready for review.

Introduce return type hinting for create() is better at #3050720: [Meta] Implement strict typing in existing code.

I update deprecation test, because after changing currentUser to property promotion unit test failed.
Should we add type hinting for property or skip for now and add only at D12?

I hide all patch files.
MR updated: move deprecation test to user module.

Will agree with the static return.

Rest of the feedback appers to be addressed.

I removed the test because we do not require tests for constructor changes like this.

Committed 6728ca1 and pushed to 11.x. Thanks!

Great job, thanks for merging.

It looks like we forgot to change argument name at deprecation message.

without the $current_user argument 

But at construct

protected ?AccountInterface $currentUser = NULL

@nikolay shapovalov I committed a quick follow-up to fix this.