Major overhaul of caching system (work in progress)

See #1124

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index deb265696a7fae93e511c371567727ec8ac2afd5..01fa9fcbe3be3131c5742a845076cf7af8ee2de8 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -111,7 +111,6 @@ class WCF {
                $this->initMagicQuotes();
                $this->initDB();
                $this->loadOptions();
-               $this->initCache();
                $this->initSession();
                $this->initLanguage();
                $this->initTPL();
@@ -289,20 +288,6 @@ class WCF {
                self::$dbObj = new $dbClass($dbHost, $dbUser, $dbPassword, $dbName, $dbPort);
        }
        
-       /**
-        * Initialises the cache handler and loads the default cache resources.
-        */
-       protected function initCache() {
-               $this->loadDefaultCacheResources();
-       }
-       
-       /**
-        * Loads the default cache resources.
-        */
-       protected function loadDefaultCacheResources() {
-               // TODO: Is this required anymore?
-       }
-       
        /**
         * Loads the options file, automatically created if not exists.
         */

diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php
index 9abc708d46de09b713af0ad2f436e8bdfe726ca0..2f4ff650a52bec0372d3db7a4648a254b33ab873 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCFACP.class.php
+++ b/wcfsetup/install/files/lib/system/WCFACP.class.php
@@ -39,7 +39,6 @@ class WCFACP extends WCF {
                $this->initDB();
                $this->loadOptions();
                $this->initPackage();
-               $this->initCache();
                $this->initSession();
                $this->initLanguage();
                $this->initTPL();
@@ -124,15 +123,6 @@ class WCFACP extends WCF {
                ));
        }
        
-       /**
-        * @see WCF::loadDefaultCacheResources()
-        */
-       protected function loadDefaultCacheResources() {
-               parent::loadDefaultCacheResources();
-               
-               // TODO: Is this required anymore?
-       }
-       
        /**
         * Initializes the active package.
         */

diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
index aab03e29ba889f1e09bf8526a351dc3183c7c46a..76301e5a12e51b6af2228a13fc72c8b883cc5e34 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
@@ -1,9 +1,5 @@
 <?php
 namespace wcf\system\package;
-use wcf\system\cache\builder\TemplateListenerCodeCacheBuilder;
-
-use wcf\system\cache\builder\TemplateListenerCacheBuilder;
-
 use wcf\data\application\Application;
 use wcf\data\application\ApplicationEditor;
 use wcf\data\language\category\LanguageCategory;
@@ -15,6 +11,8 @@ use wcf\data\package\installation\queue\PackageInstallationQueueEditor;
 use wcf\data\package\Package;
 use wcf\data\package\PackageEditor;
 use wcf\system\application\ApplicationHandler;
+use wcf\system\cache\builder\TemplateListenerCacheBuilder;
+use wcf\system\cache\builder\TemplateListenerCodeCacheBuilder;
 use wcf\system\cache\CacheHandler;
 use wcf\system\database\statement\PreparedStatement;
 use wcf\system\database\util\PreparedStatementConditionBuilder;

diff --git a/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
index afa29925b715de67fe3ec07f914087de870faf7e..b3de7eae6f00f1c50972ea3a2eecaaa45ff3bb38 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
@@ -1,8 +1,7 @@
 <?php
 namespace wcf\system\package\plugin;
-use wcf\system\cache\builder\TemplateListenerCodeCacheBuilder;
-
 use wcf\system\cache\builder\TemplateListenerCacheBuilder;
+use wcf\system\cache\builder\TemplateListenerCodeCacheBuilder;
 use wcf\system\cache\CacheHandler;
 use wcf\system\WCF;