inc/classes.php is old and only contains one call, so better remove it entirely.

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/inc/classes.php b/inc/classes.php
index 9debeb10c10ae61afb8a0041d3c1c6c3b38dd05d..f551ef47b7591c74e7b59193e56a1fa6505a87ab 100644 (file)
--- a/inc/classes.php
+++ b/inc/classes.php
@@ -1,32 +1,3 @@
 <?php
-/**
- * Load required framework classes first
- *
- * @author             Roland Haeder <webmaster@shipsimu.org>
- * @version            0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @deprecated
- * @todo               Minimize these includes
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Scan for all framework classes, exceptions and interfaces
-ClassLoader::scanFrameworkClasses();
-
-////// Until here the framework classes are loaded //////
-
-// [EOF]
+// @DEPRECATED
 ?>

diff --git a/inc/includes.php b/inc/includes.php
index 4b868980c7abd04d97536962b078fcd4f9652fcc..39be877dfe44369e0210269a3d8542b535be5102 100644 (file)
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -67,5 +67,8 @@ $application = preg_replace('/([^a-z0-9_-])+/i', '', $application);
 // Set the application name for later usage
 FrameworkConfiguration::getSelfInstance()->setConfigEntry('app_name', $application);
 
+// Scan for all framework classes, exceptions and interfaces
+ClassLoader::scanFrameworkClasses();
+
 // [EOF]
 ?>

diff --git a/index.php b/index.php
index ca598d09a38e399e38c126ba94ec54dc72459815..51eb50ef9341ef86cdff5c5f4a9b4023502e5024 100644 (file)
--- a/index.php
+++ b/index.php
@@ -197,9 +197,6 @@ final class ApplicationEntryPoint {
                // Load all include files
                require($cfg->getConfigEntry('base_path') . 'inc/includes.php');
 
-               // Load all framework classes
-               require($cfg->getConfigEntry('base_path') . 'inc/classes.php');
-
                // Include the application selector
                require($cfg->getConfigEntry('base_path') . 'inc/selector.php');
        } // END - main()