Skip to content
Snippets Groups Projects
Commit 1d573dc9 authored by Phil Norton's avatar Phil Norton
Browse files

Issue #3434477: Drupal 11 compatibility fixes for session_inspector.

parent 0278302a
Branches
Tags
No related merge requests found
Pipeline #242104 passed with warnings
Stage: build
Stage: validate
Hide whitespace changes
Inline Side-by-side
src/Controller/UserSessionInspector.php
+ 7
− 34
View file @ 1d573dc9
......@@ -2,14 +2,9 @@
namespace Drupal\session_inspector\Controller;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Controller\ControllerBase;
use Drupal\Core\Datetime\DateFormatterInterface;
use Drupal\Core\Link;
use Drupal\Core\Url;
use Drupal\session_inspector\Plugin\BrowserFormatManager;
use Drupal\session_inspector\Plugin\HostnameFormatManager;
use Drupal\session_inspector\SessionInspectorInterface;
use Drupal\user\UserInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
......@@ -62,39 +57,17 @@ class UserSessionInspector extends ControllerBase {
*/
protected $hostnameFormatManager;
/**
* Constructs a UserSessionInspector object.
*
* @param \Drupal\session_inspector\SessionInspectorInterface $session_inspector
* The SessionInspector service.
* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
* The configuration factory.
* @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
* The date formatter service.
* @param \Drupal\session_inspector\Plugin\BrowserFormatManager $browser_format_manager
* The browser format manager.
* @param \Drupal\session_inspector\Plugin\HostnameFormatManager $hostname_format_manager
* The hostname format manager.
*/
public function __construct(SessionInspectorInterface $session_inspector, ConfigFactoryInterface $config_factory, DateFormatterInterface $date_formatter, BrowserFormatManager $browser_format_manager, HostnameFormatManager $hostname_format_manager) {
$this->sessionInspector = $session_inspector;
$this->configFactory = $config_factory;
$this->dateFormatter = $date_formatter;
$this->browserFormatManager = $browser_format_manager;
$this->hostnameFormatManager = $hostname_format_manager;
}
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new self(
$container->get('session_inspector'),
$container->get('config.factory'),
$container->get('date.formatter'),
$container->get('plugin.manager.session_inspector.browser_format'),
$container->get('plugin.manager.session_inspector.hostname_format')
);
$instance = new self();
$instance->sessionInspector = $container->get('session_inspector');
$instance->configFactory = $container->get('config.factory');
$instance->dateFormatter = $container->get('date.formatter');
$instance->browserFormatManager = $container->get('plugin.manager.session_inspector.browser_format');
$instance->hostnameFormatManager = $container->get('plugin.manager.session_inspector.hostname_format');
return $instance;
}
/**
......
src/Form/DeleteAllSessionsForm.php
+ 3
− 14
View file @ 1d573dc9
......@@ -5,7 +5,6 @@ namespace Drupal\session_inspector\Form;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
use Drupal\session_inspector\SessionDeletionInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
......@@ -29,16 +28,6 @@ class DeleteAllSessionsForm extends ConfirmFormBase {
*/
protected $deleteAllSessionsService;
/**
* Constructs a DeleteAllSessionsForm object.
*
* @param \Drupal\session_inspector\SessionDeletionInterface $deleteAllSessionsService
* The session inspector delete all sessions service.
*/
public function __construct(SessionDeletionInterface $deleteAllSessionsService) {
$this->deleteAllSessionsService = $deleteAllSessionsService;
}
/**
* {@inheritdoc}
*/
......@@ -51,9 +40,9 @@ class DeleteAllSessionsForm extends ConfirmFormBase {
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new self(
$container->get('session_inspector.session_deletion')
);
$instance = new self();
$instance->deleteAllSessionsService = $container->get('session_inspector.session_deletion');
return $instance;
}
/**
......
src/Form/DeleteSessionForm.php
+ 4
− 17
View file @ 1d573dc9
......@@ -45,19 +45,6 @@ class DeleteSessionForm extends ConfirmFormBase {
*/
protected SessionDeletionInterface $deleteAllSessionsService;
/**
* Constructs a DeleteSessionForm object.
*
* @param \Drupal\session_inspector\SessionInspectorInterface $session_inspector
* The SessionInspector service.
* @param \Drupal\session_inspector\SessionDeletionInterface $deleteAllSessionsService
* The session delete interface.
*/
public function __construct(SessionInspectorInterface $session_inspector, SessionDeletionInterface $deleteAllSessionsService) {
$this->sessionInspector = $session_inspector;
$this->deleteAllSessionsService = $deleteAllSessionsService;
}
/**
* {@inheritDoc}
*/
......@@ -71,10 +58,10 @@ class DeleteSessionForm extends ConfirmFormBase {
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new self(
$container->get('session_inspector'),
$container->get('session_inspector.session_deletion')
);
$instance = new self();
$instance->sessionInspector = $container->get('session_inspector');
$instance->deleteAllSessionsService = $container->get('session_inspector.session_deletion');
return $instance;
}
/**
......
src/Form/SessionInspectorConfigForm.php
+ 8
− 39
View file @ 1d573dc9
......@@ -2,14 +2,8 @@
namespace Drupal\session_inspector\Form;
use Drupal\Component\Datetime\TimeInterface;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Datetime\DateFormatterInterface;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Form\ConfigFormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\session_inspector\Plugin\BrowserFormatManager;
use Drupal\session_inspector\Plugin\HostnameFormatManager;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
......@@ -54,45 +48,20 @@ class SessionInspectorConfigForm extends ConfigFormBase {
*/
protected $dateTime;
/**
* Constructs a SessionInspectorConfigForm object.
*
* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
* The factory for configuration objects.
* @param \Drupal\session_inspector\Plugin\BrowserFormatManager $browser_format_manager
* The browser format plugin manager.
* @param \Drupal\session_inspector\Plugin\HostnameFormatManager $hostname_format_manager
* The hostname format plugin manager.
* @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
* The date formatter service.
* @param \Drupal\Core\Entity\EntityStorageInterface $date_format_storage
* The date format storage.
* @param \Drupal\Component\Datetime\TimeInterface $date_time
* The date time service.
*/
public function __construct(ConfigFactoryInterface $config_factory, BrowserFormatManager $browser_format_manager, HostnameFormatManager $hostname_format_manager, DateFormatterInterface $date_formatter, EntityStorageInterface $date_format_storage, TimeInterface $date_time) {
parent::__construct($config_factory);
$this->browserFormatManager = $browser_format_manager;
$this->hostnameFormatManager = $hostname_format_manager;
$this->dateFormatter = $date_formatter;
$this->dateFormatStorage = $date_format_storage;
$this->dateTime = $date_time;
}
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new self(
$instance = new self(
$container->get('config.factory'),
$container->get('plugin.manager.session_inspector.browser_format'),
$container->get('plugin.manager.session_inspector.hostname_format'),
$container->get('date.formatter'),
$container->get('entity_type.manager')->getStorage('date_format'),
$container->get('datetime.time')
$container->get('config.typed')
);
$instance->browserFormatManager = $container->get('plugin.manager.session_inspector.browser_format');
$instance->hostnameFormatManager = $container->get('plugin.manager.session_inspector.hostname_format');
$instance->dateFormatter = $container->get('date.formatter');
$instance->dateFormatStorage = $container->get('entity_type.manager')->getStorage('date_format');
$instance->dateTime = $container->get('datetime.time');
return $instance;
}
/**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment