From 0957fe4e93e5ce3fe70e78fc0bebc5b9fa15e594 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Fri, 15 Jul 2011 00:39:32 +0200
Subject: [PATCH] [TASK] Remove XCLASS definitions from cache classes
With #28063 many core cache classes are required directly during bootstrap.
This makes XCLASS impossible since those base classes are not instantiated
with t3lib_div::makeInstance() anymore. t3lib_cache is static and can not be
XCLASSED. The caching framework has a built-in feature to register and use own
implementations. The patch removes all XCLASS definitions of cache classes.
Change-Id: I1e624bb769b899a14491aa3ee1cca9da480ebfb6
Resolves: #28221
Related: #28063
Reviewed-on: http://review.typo3.org/3340
Reviewed-by: Stefan Neufeind
Reviewed-by: Xavier Perseguers
Tested-by: Xavier Perseguers
Reviewed-by: Philipp Gampe
Tested-by: Philipp Gampe
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
---
.../backend/class.t3lib_cache_backend_abstractbackend.php | 5 -----
.../backend/class.t3lib_cache_backend_apcbackend.php | 7 -------
.../cache/backend/class.t3lib_cache_backend_dbbackend.php | 6 ------
.../backend/class.t3lib_cache_backend_filebackend.php | 6 ------
.../class.t3lib_cache_backend_memcachedbackend.php | 6 ------
.../backend/class.t3lib_cache_backend_nullbackend.php | 6 ------
.../backend/class.t3lib_cache_backend_pdobackend.php | 4 ----
.../class.t3lib_cache_backend_transientmemorybackend.php | 5 -----
.../interfaces/interface.t3lib_cache_backend_backend.php | 1 -
.../interface.t3lib_cache_backend_phpcapablebackend.php | 1 -
t3lib/cache/class.t3lib_cache_exception.php | 8 --------
t3lib/cache/class.t3lib_cache_factory.php | 7 -------
t3lib/cache/class.t3lib_cache_manager.php | 6 ------
.../class.t3lib_cache_exception_classalreadyloaded.php | 8 --------
.../class.t3lib_cache_exception_duplicateidentifier.php | 8 --------
.../class.t3lib_cache_exception_invalidbackend.php | 8 --------
.../class.t3lib_cache_exception_invalidcache.php | 8 --------
.../exception/class.t3lib_cache_exception_invaliddata.php | 8 --------
.../exception/class.t3lib_cache_exception_nosuchcache.php | 8 --------
.../class.t3lib_cache_frontend_abstractfrontend.php | 7 -------
.../frontend/class.t3lib_cache_frontend_phpfrontend.php | 6 +-----
.../class.t3lib_cache_frontend_stringfrontend.php | 7 -------
.../class.t3lib_cache_frontend_variablefrontend.php | 7 -------
.../interface.t3lib_cache_frontend_frontend.php | 5 +----
t3lib/class.t3lib_cache.php | 6 ------
25 files changed, 2 insertions(+), 152 deletions(-)
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php
index 81a2c38849bf..3ed64adb69f7 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php
@@ -144,9 +144,4 @@ abstract class t3lib_cache_backend_AbstractBackend implements t3lib_cache_backen
return $expiryTime;
}
}
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php']);
-}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_apcbackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_apcbackend.php
index 85e0636433dc..8dad52e4e44e 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_apcbackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_apcbackend.php
@@ -22,7 +22,6 @@
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-
/**
* A caching backend which stores cache entries by using APC.
*
@@ -315,10 +314,4 @@ class t3lib_cache_backend_ApcBackend extends t3lib_cache_backend_AbstractBackend
}
}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_apcbackend.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_apcbackend.php']);
-}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php
index 1ce23f404ec2..4ecc475383f4 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php
@@ -519,10 +519,4 @@ class t3lib_cache_backend_DbBackend extends t3lib_cache_backend_AbstractBackend
}
}
}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php']);
-}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php
index 6585912ab2c9..3d402122e83f 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php
@@ -526,10 +526,4 @@ class t3lib_cache_backend_FileBackend extends t3lib_cache_backend_AbstractBacken
return ($this->isCacheFileExpired($pathAndFilename)) ? FALSE : require_once($pathAndFilename);
}
}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php']);
-}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_memcachedbackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_memcachedbackend.php
index d947db141bc6..1e1376d45cd0 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_memcachedbackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_memcachedbackend.php
@@ -470,10 +470,4 @@ class t3lib_cache_backend_MemcachedBackend extends t3lib_cache_backend_AbstractB
public function collectGarbage() {
}
}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_memcachedbackend.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_memcachedbackend.php']);
-}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_nullbackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_nullbackend.php
index d9ef5795eec7..bf57be70e970 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_nullbackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_nullbackend.php
@@ -127,10 +127,4 @@ class t3lib_cache_backend_NullBackend extends t3lib_cache_backend_AbstractBacken
public function collectGarbage() {
}
}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_nullbackend.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_nullbackend.php']);
-}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_pdobackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_pdobackend.php
index 2d2fcbe0b07d..fccf8345aff5 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_pdobackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_pdobackend.php
@@ -371,8 +371,4 @@ class t3lib_cache_backend_PdoBackend extends t3lib_cache_backend_AbstractBackend
}
}
}
-
-if (defined('TYPO3_MODE') && $GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_pdobackend.php']) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_pdobackend.php']);
-}
?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_transientmemorybackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_transientmemorybackend.php
index fbd6f6db4a88..487f179379d9 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_transientmemorybackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_transientmemorybackend.php
@@ -169,9 +169,4 @@ class t3lib_cache_backend_TransientMemoryBackend extends t3lib_cache_backend_Abs
public function collectGarbage() {
}
}
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_transientmemorybackend.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_transientmemorybackend.php']);
-}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_backend.php b/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_backend.php
index 8e66bafbd404..dca824aeba50 100644
--- a/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_backend.php
+++ b/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_backend.php
@@ -122,6 +122,5 @@ interface t3lib_cache_backend_Backend {
* @api
*/
public function collectGarbage();
-
}
?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_phpcapablebackend.php b/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_phpcapablebackend.php
index 1c7cd2c60499..e591af2f582f 100644
--- a/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_phpcapablebackend.php
+++ b/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_phpcapablebackend.php
@@ -42,6 +42,5 @@ interface t3lib_cache_backend_PhpCapableBackend extends t3lib_cache_backend_Back
* @api
*/
public function requireOnce($entryIdentifier);
-
}
?>
\ No newline at end of file
diff --git a/t3lib/cache/class.t3lib_cache_exception.php b/t3lib/cache/class.t3lib_cache_exception.php
index 9ca84c40b9e5..2bdc9624cf7c 100644
--- a/t3lib/cache/class.t3lib_cache_exception.php
+++ b/t3lib/cache/class.t3lib_cache_exception.php
@@ -22,7 +22,6 @@
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-
/**
* A generic Cache exception
*
@@ -33,12 +32,5 @@
* @api
*/
class t3lib_cache_Exception extends Exception {
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_exception.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_exception.php']);
}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/class.t3lib_cache_factory.php b/t3lib/cache/class.t3lib_cache_factory.php
index 775ae8b8080f..e6bcbbbd336c 100644
--- a/t3lib/cache/class.t3lib_cache_factory.php
+++ b/t3lib/cache/class.t3lib_cache_factory.php
@@ -106,12 +106,5 @@ class t3lib_cache_Factory implements t3lib_Singleton {
$this->cacheManager->registerCache($cache);
return $cache;
}
-
}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_factory.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_factory.php']);
-}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/class.t3lib_cache_manager.php b/t3lib/cache/class.t3lib_cache_manager.php
index 0d6503adaaca..fa372f9815ec 100644
--- a/t3lib/cache/class.t3lib_cache_manager.php
+++ b/t3lib/cache/class.t3lib_cache_manager.php
@@ -276,10 +276,4 @@ class t3lib_cache_Manager implements t3lib_Singleton {
$this->cacheFactory->create($identifier, $frontend, $backend, $backendOptions);
}
}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_manager.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_manager.php']);
-}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/exception/class.t3lib_cache_exception_classalreadyloaded.php b/t3lib/cache/exception/class.t3lib_cache_exception_classalreadyloaded.php
index f47e2089bfc3..f13fdcc78713 100644
--- a/t3lib/cache/exception/class.t3lib_cache_exception_classalreadyloaded.php
+++ b/t3lib/cache/exception/class.t3lib_cache_exception_classalreadyloaded.php
@@ -22,7 +22,6 @@
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-
/**
* A "Class Already Loaded" exception
*
@@ -33,12 +32,5 @@
* @api
*/
class t3lib_cache_exception_ClassAlreadyLoaded extends t3lib_cache_Exception {
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_classalreadyloaded.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_classalreadyloaded.php']);
}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/exception/class.t3lib_cache_exception_duplicateidentifier.php b/t3lib/cache/exception/class.t3lib_cache_exception_duplicateidentifier.php
index 33d88aa97f5e..2e31b95ae25e 100644
--- a/t3lib/cache/exception/class.t3lib_cache_exception_duplicateidentifier.php
+++ b/t3lib/cache/exception/class.t3lib_cache_exception_duplicateidentifier.php
@@ -22,7 +22,6 @@
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-
/**
* A "Duplicate Identifier" exception
*
@@ -33,12 +32,5 @@
* @api
*/
class t3lib_cache_exception_DuplicateIdentifier extends t3lib_cache_Exception {
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_duplicateidentifier.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_duplicateidentifier.php']);
}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/exception/class.t3lib_cache_exception_invalidbackend.php b/t3lib/cache/exception/class.t3lib_cache_exception_invalidbackend.php
index e515ebad5c3b..9154ee03aaf3 100644
--- a/t3lib/cache/exception/class.t3lib_cache_exception_invalidbackend.php
+++ b/t3lib/cache/exception/class.t3lib_cache_exception_invalidbackend.php
@@ -22,7 +22,6 @@
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-
/**
* An "Invalid Backend" exception
*
@@ -33,12 +32,5 @@
* @api
*/
class t3lib_cache_exception_InvalidBackend extends t3lib_cache_Exception {
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_invalidbackend.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_invalidbackend.php']);
}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/exception/class.t3lib_cache_exception_invalidcache.php b/t3lib/cache/exception/class.t3lib_cache_exception_invalidcache.php
index c32a89db3331..76f3c2090835 100644
--- a/t3lib/cache/exception/class.t3lib_cache_exception_invalidcache.php
+++ b/t3lib/cache/exception/class.t3lib_cache_exception_invalidcache.php
@@ -22,7 +22,6 @@
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-
/**
* An "Invalid Cache" exception
*
@@ -33,12 +32,5 @@
* @api
*/
class t3lib_cache_exception_InvalidCache extends t3lib_cache_Exception {
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_invalidcache.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_invalidcache.php']);
}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/exception/class.t3lib_cache_exception_invaliddata.php b/t3lib/cache/exception/class.t3lib_cache_exception_invaliddata.php
index ce3f7eade4ab..0ae12ae8d6a3 100644
--- a/t3lib/cache/exception/class.t3lib_cache_exception_invaliddata.php
+++ b/t3lib/cache/exception/class.t3lib_cache_exception_invaliddata.php
@@ -22,7 +22,6 @@
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-
/**
* An "Invalid Data" exception
*
@@ -33,12 +32,5 @@
* @api
*/
class t3lib_cache_exception_InvalidData extends t3lib_cache_Exception {
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_invaliddata.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_invaliddata.php']);
}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/exception/class.t3lib_cache_exception_nosuchcache.php b/t3lib/cache/exception/class.t3lib_cache_exception_nosuchcache.php
index b4683f99254e..63fcc787575b 100644
--- a/t3lib/cache/exception/class.t3lib_cache_exception_nosuchcache.php
+++ b/t3lib/cache/exception/class.t3lib_cache_exception_nosuchcache.php
@@ -22,7 +22,6 @@
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-
/**
* A "No Such Cache" exception
*
@@ -33,12 +32,5 @@
* @api
*/
class t3lib_cache_exception_NoSuchCache extends t3lib_cache_Exception {
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_nosuchcache.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_nosuchcache.php']);
}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/frontend/class.t3lib_cache_frontend_abstractfrontend.php b/t3lib/cache/frontend/class.t3lib_cache_frontend_abstractfrontend.php
index 72c1fe0e95ee..a1a1952e5cd5 100644
--- a/t3lib/cache/frontend/class.t3lib_cache_frontend_abstractfrontend.php
+++ b/t3lib/cache/frontend/class.t3lib_cache_frontend_abstractfrontend.php
@@ -221,12 +221,5 @@ abstract class t3lib_cache_frontend_AbstractFrontend implements t3lib_cache_fron
public function isValidTag($tag) {
return preg_match(self::PATTERN_TAG, $tag) === 1;
}
-
}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/frontend/class.t3lib_cache_frontend_abstractfrontend.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/frontend/class.t3lib_cache_frontend_abstractfrontend.php']);
-}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/frontend/class.t3lib_cache_frontend_phpfrontend.php b/t3lib/cache/frontend/class.t3lib_cache_frontend_phpfrontend.php
index e25f01207224..c90ebac69bae 100644
--- a/t3lib/cache/frontend/class.t3lib_cache_frontend_phpfrontend.php
+++ b/t3lib/cache/frontend/class.t3lib_cache_frontend_phpfrontend.php
@@ -33,6 +33,7 @@
* @scope prototype
*/
class t3lib_cache_frontend_PhpFrontend extends t3lib_cache_frontend_StringFrontend {
+
/**
* Constructs the cache
*
@@ -94,9 +95,4 @@ class t3lib_cache_frontend_PhpFrontend extends t3lib_cache_frontend_StringFronte
return $this->backend->requireOnce($entryIdentifier);
}
}
-
-if (defined('TYPO3_MODE') && $GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_frontend_phpfrontend.php']) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_frontend_phpfrontend.php']);
-}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/frontend/class.t3lib_cache_frontend_stringfrontend.php b/t3lib/cache/frontend/class.t3lib_cache_frontend_stringfrontend.php
index 55d1a03090bc..b1590170439f 100644
--- a/t3lib/cache/frontend/class.t3lib_cache_frontend_stringfrontend.php
+++ b/t3lib/cache/frontend/class.t3lib_cache_frontend_stringfrontend.php
@@ -118,12 +118,5 @@ class t3lib_cache_frontend_StringFrontend extends t3lib_cache_frontend_AbstractF
}
return $entries;
}
-
}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_stringcache.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_stringcache.php']);
-}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/frontend/class.t3lib_cache_frontend_variablefrontend.php b/t3lib/cache/frontend/class.t3lib_cache_frontend_variablefrontend.php
index e667bd8f1e62..28e30ca0ef8b 100644
--- a/t3lib/cache/frontend/class.t3lib_cache_frontend_variablefrontend.php
+++ b/t3lib/cache/frontend/class.t3lib_cache_frontend_variablefrontend.php
@@ -142,12 +142,5 @@ class t3lib_cache_frontend_VariableFrontend extends t3lib_cache_frontend_Abstrac
}
return $entries;
}
-
}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_variablecache.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_variablecache.php']);
-}
-
?>
\ No newline at end of file
diff --git a/t3lib/cache/frontend/interfaces/interface.t3lib_cache_frontend_frontend.php b/t3lib/cache/frontend/interfaces/interface.t3lib_cache_frontend_frontend.php
index a247ff4ec886..f7771c455927 100644
--- a/t3lib/cache/frontend/interfaces/interface.t3lib_cache_frontend_frontend.php
+++ b/t3lib/cache/frontend/interfaces/interface.t3lib_cache_frontend_frontend.php
@@ -122,7 +122,7 @@ interface t3lib_cache_frontend_Frontend {
*
* @return void
*/
- function flush();
+ public function flush();
/**
* Removes all cache entries of this cache which are tagged by the specified tag.
@@ -158,8 +158,5 @@ interface t3lib_cache_frontend_Frontend {
* @api
*/
public function isValidTag($tag);
-
}
-
-
?>
\ No newline at end of file
diff --git a/t3lib/class.t3lib_cache.php b/t3lib/class.t3lib_cache.php
index fa062d45897a..1d1ab021deb1 100644
--- a/t3lib/class.t3lib_cache.php
+++ b/t3lib/class.t3lib_cache.php
@@ -113,10 +113,4 @@ class t3lib_cache {
t3lib_div::logDeprecatedFunction();
}
}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_cache.php'])) {
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_cache.php']);
-}
-
?>
\ No newline at end of file
--
GitLab