diff --git a/core/modules/system/src/Plugin/Block/SystemPageActionsBlock.php b/core/modules/system/src/Plugin/Block/SystemPageActionsBlock.php index edb9739..3c234a1 100644 --- a/core/modules/system/src/Plugin/Block/SystemPageActionsBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemPageActionsBlock.php @@ -40,13 +40,6 @@ class SystemPageActionsBlock extends BlockBase implements ContainerFactoryPlugin protected $localActionManager; /** - * A route object. - * - * @var \Symfony\Cmf\Component\Routing\RouteObjectInterface - */ - protected $routeObject; - - /** * A request stack object. * * @var \Symfony\Component\HttpFoundation\RequestStack @@ -66,16 +59,13 @@ class SystemPageActionsBlock extends BlockBase implements ContainerFactoryPlugin * The factory for configuration objects. * @param \Drupal\Core\Menu\LocalActionManager $local_action_manager * The local action manager. - * @param \Symfony\Cmf\Component\Routing\RouteObjectInterface $route_object - * The route object. * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack * The request stack object. */ - public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config_factory, LocalActionManager $local_action_manager, RouteObjectInterface $route_object, RequestStack $request_stack) { + public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config_factory, LocalActionManager $local_action_manager, RequestStack $request_stack) { parent::__construct($configuration, $plugin_id, $plugin_definition); $this->configFactory = $config_factory; $this->localActionManager = $local_action_manager; - $this->routeObject = $route_object; $this->requestStack = $request_stack; } @@ -89,7 +79,6 @@ public static function create(ContainerInterface $container, array $configuratio $plugin_definition, $container->get('config.factory'), $container->get('plugin.manager.menu.local_action'), - $container->get('route_object'), $container->get('request_stack') ); } diff --git a/core/modules/system/src/Plugin/Block/SystemPageTitleBlock.php b/core/modules/system/src/Plugin/Block/SystemPageTitleBlock.php index 43f2510..a198c0c 100644 --- a/core/modules/system/src/Plugin/Block/SystemPageTitleBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemPageTitleBlock.php @@ -40,13 +40,6 @@ class SystemPageTitleBlock extends BlockBase implements ContainerFactoryPluginIn protected $titleResolver; /** - * A route object. - * - * @var \Symfony\Cmf\Component\Routing\RouteObjectInterface - */ - protected $routeObject; - - /** * A request stack object. * * @var \Symfony\Component\HttpFoundation\RequestStack @@ -66,16 +59,13 @@ class SystemPageTitleBlock extends BlockBase implements ContainerFactoryPluginIn * The factory for configuration objects. * @param \Drupal\Core\Controller\TitleResolverInterface $title_resolver * The title resolver. - * @param \Symfony\Cmf\Component\Routing\RouteObjectInterface $route_object - * The route object. * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack * The request stack object. */ - public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config_factory, TitleResolverInterface $title_resolver, RouteObjectInterface $route_object, RequestStack $request_stack) { + public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config_factory, TitleResolverInterface $title_resolver, RequestStack $request_stack) { parent::__construct($configuration, $plugin_id, $plugin_definition); $this->configFactory = $config_factory; $this->titleResolver = $title_resolver; - $this->routeObject = $route_object; $this->requestStack = $request_stack; } @@ -89,7 +79,6 @@ public static function create(ContainerInterface $container, array $configuratio $plugin_definition, $container->get('config.factory'), $container->get('title_resolver'), - $container->get('route_object'), $container->get('request_stack') ); }