Skip to content
Snippets Groups Projects

[#3477501] Re-enable D10 support.

All threads resolved!
Merged Ted Cooper requested to merge issue/prlp-3477501:2.0.x-3477501-d10-enable into 2.0.x
All threads resolved!
4 files
+ 25
55
Compare changes
  • Side-by-side
  • Inline
Files
4
@@ -4,8 +4,11 @@ namespace Drupal\prlp\Controller;
use Drupal\Component\Datetime\TimeInterface;
use Drupal\Core\Datetime\DateFormatterInterface;
use Drupal\Core\DependencyInjection\AutowireTrait;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Flood\FloodInterface;
use Drupal\Core\Form\FormState;
use Drupal\Core\Logger\LoggerChannelFactoryInterface;
use Drupal\Core\Messenger\MessengerInterface;
use Drupal\Core\Url;
use Drupal\prlp\Event\PrlpPasswordBeforeSaveEvent;
@@ -14,12 +17,10 @@ use Drupal\prlp\PrlpEvents;
use Drupal\user\Controller\UserController;
use Drupal\user\Form\UserPasswordResetForm;
use Drupal\user\UserDataInterface;
use Drupal\user\UserStorageInterface;
use Psr\Log\LoggerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Psr\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
/**
@@ -27,10 +28,7 @@ use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
*/
class PrlpController extends UserController {
/**
* Event dispatcher service.
*/
protected EventDispatcherInterface $eventDispatcher;
use AutowireTrait;
/**
* The current Request object.
@@ -40,54 +38,27 @@ class PrlpController extends UserController {
protected Request $request;
/**
* Constructs a PrlpController object.
*
* @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
* The date formatter service.
* @param \Drupal\user\UserStorageInterface $user_storage
* The user storage.
* @param \Drupal\user\UserDataInterface $user_data
* The user data service.
* @param \Psr\Log\LoggerInterface $logger
* 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.
* Constructs a new PrlpController object.
*/
public function __construct(
DateFormatterInterface $date_formatter,
UserStorageInterface $user_storage,
EntityTypeManagerInterface $entityTypeManager,
UserDataInterface $user_data,
LoggerInterface $logger,
LoggerChannelFactoryInterface $loggerFactory,
FloodInterface $flood,
protected TimeInterface $time,
EventDispatcherInterface $event_dispatcher,
Request $request,
TimeInterface $time,
protected EventDispatcherInterface $eventDispatcher,
protected RequestStack $requestStack,
) {
parent::__construct($date_formatter, $user_storage, $user_data, $logger, $flood, $time);
$this->eventDispatcher = $event_dispatcher;
$this->request = $request;
}
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
$container->get('date.formatter'),
$container->get('entity_type.manager')->getStorage('user'),
$container->get('user.data'),
$container->get('logger.factory')->get('user'),
$container->get('flood'),
$container->get('datetime.time'),
$container->get('event_dispatcher'),
$container->get('request_stack')->getCurrentRequest(),
parent::__construct(
$date_formatter,
$entityTypeManager->getStorage('user'),
$user_data,
$loggerFactory->get('user'),
$flood,
$time
);
$this->request = $this->requestStack->getCurrentRequest();
}
/**
Loading