Issue #3443488 by smustgrave: Remove deprecated code from lib/Flood and lib/Form (5e81fb10) · Commits · project / drupal

core/lib/Drupal/Core/Flood/DatabaseBackend.php

+7 −23

Original line number	Diff line number	Diff line
		@@ -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,
		) {
		}

		/**

core/lib/Drupal/Core/Form/ConfigFormBase.php

+2 −7

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}

		/**

core/lib/Drupal/Core/Form/FormSubmitter.php

+8 −32

Original line number	Diff line number	Diff line
		@@ -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,
		) {
		}

		/**