Deprecated method loadIncludes() removed

diff --git a/docs/TODOs.txt b/docs/TODOs.txt
index 280d1d25a8db4d7af3484cd400141b80c560ab14..111348c548c53b54a26ede996f80afa0789bf8d1 100644 (file)
--- a/docs/TODOs.txt
+++ b/docs/TODOs.txt
@@ -5,11 +5,11 @@
 ./inc/classes/exceptions/main/class_ConfigEntryNotFoundException.php:10: * @todo               Rename this class to NoFoundEntryException
 ./inc/classes/exceptions/main/class_MissingMethodException.php:13: * @todo             Try to rewrite user/guest login classes and mark this exception as deprecated
 ./inc/classes/interfaces/class_FrameworkInterface.php:11: * @todo              Find a better name for this interface
-./inc/classes/main/class_BaseFrameworkSystem.php:1040:  * @todo        Write a logging mechanism for productive mode
-./inc/classes/main/class_BaseFrameworkSystem.php:104:  // @todo Try to clean these constants up
-./inc/classes/main/class_BaseFrameworkSystem.php:1054:                 // @TODO Finish this part!
-./inc/classes/main/class_BaseFrameworkSystem.php:185:   * @todo        This is old code. Do we still need this old lost code?
-./inc/classes/main/class_BaseFrameworkSystem.php:253:   * @todo        SearchableResult and UpdateableResult shall have a super interface to use here
+./inc/classes/main/class_BaseFrameworkSystem.php:1045:  * @todo        Write a logging mechanism for productive mode
+./inc/classes/main/class_BaseFrameworkSystem.php:1059:                 // @TODO Finish this part!
+./inc/classes/main/class_BaseFrameworkSystem.php:109:  // @todo Try to clean these constants up
+./inc/classes/main/class_BaseFrameworkSystem.php:190:   * @todo        This is old code. Do we still need this old lost code?
+./inc/classes/main/class_BaseFrameworkSystem.php:258:   * @todo        SearchableResult and UpdateableResult shall have a super interface to use here
 ./inc/classes/main/commands/web/class_WebLoginAreaCommand.php:64:       * @todo        Add some stuff here: Some personal data, app/game related data
 ./inc/classes/main/console/class_ConsoleTools.php:41:   * @todo        We should connect this to a caching class to cache DNS requests
 ./inc/classes/main/console/class_ConsoleTools.php:54:          // @TODO Here should the cacher be implemented
@@ -83,7 +83,7 @@
 ./inc/classes/main/user/class_BaseUser.php:80:  * @todo        Find a way of casting here. "(int)" might destroy the user id > 32766
 ./inc/classes/main/user/member/class_Member.php:84:     * @todo        Add more ways over creating user classes
 ./inc/classes/middleware/debug/class_DebugMiddleware.php:112:                  // @TODO Initialization phase
-./inc/config/class_FrameworkConfiguration.php:205:      * @todo        We have to add some more entries from $_SERVER here
+./inc/config/class_FrameworkConfiguration.php:172:      * @todo        We have to add some more entries from $_SERVER here
 ./inc/database.php:49:// @TODO Rewrite this
 ./inc/hooks.php:26:// @TODO This makes the core depending on the SPL. But it should be installed anyway.
 ./inc/includes.php:36:// @TODO Find a nicer OOP-ed way for this
@@ -97,4 +97,3 @@
 ./inc/classes/exceptions/main/class_ConfigEntryNotFoundException.php:11: * @deprecated
 ./inc/classes/main/filter/class_AbstractFilterDecorator.php:2:// @DEPRECATED
 ./inc/classes/main/template/class_BaseTemplateEngine.php:1131:  * @deprecated
-./inc/config/class_FrameworkConfiguration.php:107:      * @deprecated

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index c96e851961f113ab1b420f4f95a94635f08b1077..70f0585895cc6e3ff6ae6ee89299e7e6485a56c5 100644 (file)
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -99,39 +99,6 @@ class FrameworkConfiguration implements Registerable {
                set_magic_quotes_runtime($enableQuotes);
        }
 
-       /**
-        * A private include loader
-        *
-        * @param       $arrayObject    The array object with all include files
-        * @return      void
-        * @deprecated
-        * @see         ClassLoader
-        */
-       private function loadIncludes (ArrayObject $arrayObject) {
-               // Load only if there are includes defined
-               if (!is_null($arrayObject)) {
-                       for ($idx = $arrayObject->getIterator(); $idx->valid(); $idx->next()) {
-                               // Get include file
-                               $inc = $idx->current();
-
-                               // Is the file name really set?
-                               if (!empty($inc)) {
-                                       // Base path is by default added
-                                       $fqfn = $inc;
-
-                                       // Base path added? (Uni* / Windows)
-                                       if ((substr($inc, 0, 1) != '/') && (substr($inc, 1, 1) != ':')) {
-                                               // Generate FQFN
-                                               $fqfn = $this->getConfigEntry('base_path') . '/inc/extra/' . $inc;
-                                       } // END - if
-                               } // END - if
-
-                               // Include them all here
-                               require($fqfn);
-                       }
-               } // END - if
-       }
-
        /**
         * Checks wether the given configuration entry is set
         *