Skip to content
Snippets Groups Projects
Verified Commit 5e81fb10 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3443488 by smustgrave: Remove deprecated code from lib/Flood and lib/Form

parent 40b5046f
No related branches found
No related tags found
26 merge requests!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!9470[10.3.x-only-DO-NOT-MERGE]: #3331771 Fix file_get_contents(): Passing null to parameter,!8540Issue #3457061: Bootstrap Modal dialog Not closing after 10.3.0 Update,!8528Issue #3456871 by Tim Bozeman: Support NULL services,!8373Issue #3427374 by danflanagan8, Vighneshh: taxonomy_tid ViewsArgumentDefault...,!3878Removed unused condition head title for views,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2964Issue #2865710 : Dependencies from only one instance of a widget are used in display modes,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2062Issue #3246454: Add weekly granularity to views date sort,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!877Issue #2708101: Default value for link text is not saved,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493
Pipeline #157241 canceled
......@@ -17,38 +17,22 @@ class DatabaseBackend implements FloodInterface, PrefixFloodInterface {
*/
const TABLE_NAME = 'flood';
/**
* The database connection used to store flood event information.
*
* @var \Drupal\Core\Database\Connection
*/
protected $connection;
/**
* The request stack.
*
* @var \Symfony\Component\HttpFoundation\RequestStack
*/
protected $requestStack;
/**
* Construct the DatabaseBackend.
*
* @param \Drupal\Core\Database\Connection $connection
* The database connection which will be used to store the flood event
* information.
* @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
* @param \Symfony\Component\HttpFoundation\RequestStack $requestStack
* The request stack used to retrieve the current request.
* @param \Drupal\Component\Datetime\TimeInterface|null $time
* @param \Drupal\Component\Datetime\TimeInterface $time
* The time service.
*/
public function __construct(Connection $connection, RequestStack $request_stack, protected ?TimeInterface $time = NULL) {
$this->connection = $connection;
$this->requestStack = $request_stack;
if (!$time) {
@trigger_error('Calling ' . __METHOD__ . '() without the $time argument is deprecated in drupal:10.3.0 and it will be required in drupal:11.0.0. See https://www.drupal.org/node/3387233', E_USER_DEPRECATED);
$this->time = \Drupal::service(TimeInterface::class);
}
public function __construct(
protected Connection $connection,
protected RequestStack $requestStack,
protected TimeInterface $time,
) {
}
/**
......
......@@ -35,19 +35,14 @@ abstract class ConfigFormBase extends FormBase {
*
* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
* The factory for configuration objects.
* @param \Drupal\Core\Config\TypedConfigManagerInterface|null $typedConfigManager
* @param \Drupal\Core\Config\TypedConfigManagerInterface $typedConfigManager
* The typed config manager.
*/
public function __construct(
ConfigFactoryInterface $config_factory,
protected $typedConfigManager = NULL,
protected TypedConfigManagerInterface $typedConfigManager,
) {
$this->setConfigFactory($config_factory);
if (!$typedConfigManager instanceof TypedConfigManagerInterface) {
$type = get_debug_type($typedConfigManager);
@trigger_error("Passing $type to the \$typedConfigManager parameter of ConfigFormBase::__construct() is deprecated in drupal:10.2.0 and must be an instance of \Drupal\Core\Config\TypedConfigManagerInterface in drupal:11.0.0. See https://www.drupal.org/node/3404140", E_USER_DEPRECATED);
}
}
/**
......
......@@ -14,45 +14,21 @@
*/
class FormSubmitter implements FormSubmitterInterface {
/**
* The URL generator.
*
* @var \Drupal\Core\Routing\UrlGeneratorInterface
*/
protected $urlGenerator;
/**
* The request stack.
*
* @var \Symfony\Component\HttpFoundation\RequestStack
*/
protected $requestStack;
/**
* The redirect response subscriber.
*
* @var \Drupal\Core\EventSubscriber\RedirectResponseSubscriber
*/
protected RedirectResponseSubscriber $redirectResponseSubscriber;
/**
* Constructs a new FormSubmitter.
*
* @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
* @param \Symfony\Component\HttpFoundation\RequestStack $requestStack
* The request stack.
* @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
* @param \Drupal\Core\Routing\UrlGeneratorInterface $urlGenerator
* The URL generator.
* @param \Drupal\Core\EventSubscriber\RedirectResponseSubscriber|null $redirect_response_subscriber
* @param \Drupal\Core\EventSubscriber\RedirectResponseSubscriber $redirectResponseSubscriber
* The redirect response subscriber.
*/
public function __construct(RequestStack $request_stack, UrlGeneratorInterface $url_generator, ?RedirectResponseSubscriber $redirect_response_subscriber = NULL) {
$this->requestStack = $request_stack;
$this->urlGenerator = $url_generator;
if (is_null($redirect_response_subscriber)) {
@trigger_error('Calling ' . __CLASS__ . '::__construct() without the $redirect_response_subscriber argument is deprecated in drupal:10.2.0 and is required in drupal:11.0.0. See https://www.drupal.org/node/3377297', E_USER_DEPRECATED);
$redirect_response_subscriber = \Drupal::service('redirect_response_subscriber');
}
$this->redirectResponseSubscriber = $redirect_response_subscriber;
public function __construct(
protected RequestStack $requestStack,
protected UrlGeneratorInterface $urlGenerator,
protected RedirectResponseSubscriber $redirectResponseSubscriber,
) {
}
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment