From 9629d09d405753f4b8c06f11b469a1f78879db59 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 30 Dec 2021 22:04:02 +0000
Subject: [PATCH] Issue #3246471 by apaderno, dagmar, vicheldt: Remove from the
DbLogController class the properties already defined from the parent class
---
.../dblog/src/Controller/DbLogController.php | 20 +++----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/core/modules/dblog/src/Controller/DbLogController.php b/core/modules/dblog/src/Controller/DbLogController.php
index e40c7db24110..b52ed5015a2d 100644
--- a/core/modules/dblog/src/Controller/DbLogController.php
+++ b/core/modules/dblog/src/Controller/DbLogController.php
@@ -34,13 +34,6 @@ class DbLogController extends ControllerBase {
*/
protected $database;
- /**
- * The module handler service.
- *
- * @var \Drupal\Core\Extension\ModuleHandlerInterface
- */
- protected $moduleHandler;
-
/**
* The date formatter service.
*
@@ -48,13 +41,6 @@ class DbLogController extends ControllerBase {
*/
protected $dateFormatter;
- /**
- * The form builder service.
- *
- * @var \Drupal\Core\Form\FormBuilderInterface
- */
- protected $formBuilder;
-
/**
* The user storage.
*
@@ -136,9 +122,9 @@ public function overview(Request $request) {
$classes = static::getLogLevelClassMap();
- $this->moduleHandler->loadInclude('dblog', 'admin.inc');
+ $this->moduleHandler()->loadInclude('dblog', 'admin.inc');
- $build['dblog_filter_form'] = $this->formBuilder->getForm('Drupal\dblog\Form\DblogFilterForm');
+ $build['dblog_filter_form'] = $this->formBuilder()->getForm('Drupal\dblog\Form\DblogFilterForm');
$header = [
// Icon column.
@@ -333,7 +319,7 @@ protected function buildFilterQuery(Request $request) {
return;
}
- $this->moduleHandler->loadInclude('dblog', 'admin.inc');
+ $this->moduleHandler()->loadInclude('dblog', 'admin.inc');
$filters = dblog_filters();
--
GitLab