From 2ee2828d9984e161cfc5139b76ed28f6900cdc60 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Mon, 16 Oct 2017 12:21:20 +0200
Subject: [PATCH] [TASK] Remove internal log method from ConditionMatcher
ConditionMatcher has a log method which is never used.
Resolves: #82770
Releases: master
Change-Id: I8554f253260601a8511dacdbca3ddfc894be80bd
Reviewed-on: https://review.typo3.org/54402
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Susanne Moog <susanne.moog@typo3.org>
Tested-by: Susanne Moog <susanne.moog@typo3.org>
---
.../ConditionMatching/ConditionMatcher.php | 12 -----------
.../AbstractConditionMatcher.php | 7 -------
.../ConditionMatching/ConditionMatcher.php | 21 -------------------
3 files changed, 40 deletions(-)
diff --git a/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php b/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
index 17a3661e2c1c..6d5d92f83230 100644
--- a/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
+++ b/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
@@ -273,18 +273,6 @@ class ConditionMatcher extends AbstractConditionMatcher
return $this->getBackendUserAuthentication()->isAdmin();
}
- /**
- * Set/write a log message.
- *
- * @param string $message The log message to set/write
- */
- protected function log($message)
- {
- if (is_object($this->getBackendUserAuthentication())) {
- $this->getBackendUserAuthentication()->writelog(3, 0, 1, 0, $message, []);
- }
- }
-
/**
* @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
*/
diff --git a/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php b/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
index 1c67ec5f90df..704a6bea6477 100644
--- a/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
+++ b/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
@@ -652,11 +652,4 @@ abstract class AbstractConditionMatcher
* @return bool Determines if a user is logged in
*/
abstract protected function isUserLoggedIn();
-
- /**
- * Sets a log message.
- *
- * @param string $message The log message to set/write
- */
- abstract protected function log($message);
}
diff --git a/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php b/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
index 1f597c3c14ab..b536d0f49508 100644
--- a/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
+++ b/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
@@ -15,7 +15,6 @@ namespace TYPO3\CMS\Frontend\Configuration\TypoScript\ConditionMatching;
*/
use TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher;
-use TYPO3\CMS\Core\TimeTracker\TimeTracker;
use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
@@ -173,18 +172,6 @@ class ConditionMatcher extends AbstractConditionMatcher
return (bool)$this->getTypoScriptFrontendController()->loginUser;
}
- /**
- * Set/write a log message.
- *
- * @param string $message The log message to set/write
- */
- protected function log($message)
- {
- if ($this->getTimeTracker() !== null) {
- $this->getTimeTracker()->setTSlogMessage($message, 3);
- }
- }
-
/**
* @return \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController
*/
@@ -192,12 +179,4 @@ class ConditionMatcher extends AbstractConditionMatcher
{
return $GLOBALS['TSFE'];
}
-
- /**
- * @return TimeTracker
- */
- protected function getTimeTracker()
- {
- return GeneralUtility::makeInstance(TimeTracker::class);
- }
}
--
GitLab