diff --git a/core/modules/views/src/Plugin/views/cache/Time.php b/core/modules/views/src/Plugin/views/cache/Time.php index 962693d921..f663cc87cc 100644 --- a/core/modules/views/src/Plugin/views/cache/Time.php +++ b/core/modules/views/src/Plugin/views/cache/Time.php @@ -33,13 +33,6 @@ class Time extends CachePluginBase { */ protected $dateFormatter; - /** - * The current request. - * - * @var \Symfony\Component\HttpFoundation\Request - */ - protected $request; - /** * Constructs a Time cache plugin object. * @@ -51,12 +44,12 @@ class Time extends CachePluginBase { * The plugin implementation definition. * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter * The date formatter service. - * @param \Symfony\Component\HttpFoundation\Request $request - * The current request. */ - public function __construct(array $configuration, $plugin_id, $plugin_definition, DateFormatterInterface $date_formatter, Request $request) { + public function __construct(array $configuration, $plugin_id, $plugin_definition, DateFormatterInterface $date_formatter) { $this->dateFormatter = $date_formatter; - $this->request = $request; + if (func_get_arg(4) && func_get_arg(4) instanceof Request) { + @trigger_error('The request object must not be passed to ' . __METHOD__ . '(). It is deprecated in drupal:9.1.0 and will be removed in drupal:10.0.0. See https://www.drupal.org/project/drupal/issues/3109109', E_USER_DEPRECATED); + } parent::__construct($configuration, $plugin_id, $plugin_definition); } @@ -69,8 +62,7 @@ public static function create(ContainerInterface $container, array $configuratio $configuration, $plugin_id, $plugin_definition, - $container->get('date.formatter'), - $container->get('request_stack')->getCurrentRequest() + $container->get('date.formatter') ); }