Issue #3477501 by mably: Drupal 11 compatibility fixes for prlp

Closes #3477501

src/Controller/PrlpController.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\prlp\Controller;
 
+use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Flood\FloodInterface;
 use Drupal\Core\Form\FormState;
@@ -31,6 +32,13 @@ class PrlpController extends UserController {
    */
   protected EventDispatcherInterface $eventDispatcher;
 
+  /**
+   * The current Request object.
+   *
+   * @var \Symfony\Component\HttpFoundation\Request
+   */
+  protected Request $request;
+
   /**
    * Constructs a PrlpController object.
    *
@@ -44,8 +52,12 @@ class PrlpController extends UserController {
    *   A logger instance.
    * @param \Drupal\Core\Flood\FloodInterface $flood
    *   The flood service.
+   * @param \Drupal\Component\Datetime\TimeInterface|null $time
+   *   The time service.
    * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
    *   The event dispatcher service.
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The current HTTP request.
    */
   public function __construct(
     DateFormatterInterface $date_formatter,
@@ -53,10 +65,13 @@ class PrlpController extends UserController {
     UserDataInterface $user_data,
     LoggerInterface $logger,
     FloodInterface $flood,
-    EventDispatcherInterface $event_dispatcher
+    protected TimeInterface $time,
+    EventDispatcherInterface $event_dispatcher,
+    Request $request,
   ) {
-    parent::__construct($date_formatter, $user_storage, $user_data, $logger, $flood);
+    parent::__construct($date_formatter, $user_storage, $user_data, $logger, $flood, $time);
     $this->eventDispatcher = $event_dispatcher;
+    $this->request = $request;
   }
 
   /**
@@ -69,7 +84,9 @@ class PrlpController extends UserController {
       $container->get('user.data'),
       $container->get('logger.factory')->get('user'),
       $container->get('flood'),
-      $container->get('event_dispatcher')
+      $container->get('datetime.time'),
+      $container->get('event_dispatcher'),
+      $container->get('request_stack')->getCurrentRequest(),
     );
   }
 
@@ -209,9 +226,8 @@ class PrlpController extends UserController {
    * @see \Drupal\Core\Url::fromUserInput()
    */
   private function stripSubdirectories($uri) {
-    $current_request = \Drupal::requestStack()->getCurrentRequest();
-    if ($current_request && !empty($current_request->getBasePath()) && strpos($uri, $current_request->getBasePath()) === 0) {
-      return substr($uri, mb_strlen($current_request->getBasePath()));
+    if ($this->request && !empty($this->request->getBasePath()) && strpos($uri, $this->request->getBasePath()) === 0) {
+      return substr($uri, mb_strlen($this->request->getBasePath()));
     }
     return $uri;
   }