Support for application local configuration file 'config-local.php' added

diff --git a/inc/config.php b/inc/config.php
index d79cfe19dd9ffbff64e867c4e797d372b79977af..73dc39421163033439c561a3fd5d4b3ca513ab2d 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -24,7 +24,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Load the class from inc/config direktory
+// Load very basic classes, required to bootstrap
 require(ApplicationEntryPoint::detectCorePath() . '/inc/classes/interfaces/class_FrameworkInterface.php');
 require(ApplicationEntryPoint::detectCorePath() . '/inc/classes/interfaces/registry/class_Registerable.php');
 require(ApplicationEntryPoint::detectCorePath() . '/inc/config/class_FrameworkConfiguration.php');

diff --git a/inc/selector.php b/inc/selector.php
index 3554c3daef22e6b8e75bc0f5cf909857bfbbd45d..00b1dffbb1303eec8d6c9947743ce2fa49c8017f 100644 (file)
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -31,6 +31,7 @@ $configAppIncludes = array(
        'exceptions',   // The application's own exception handler
        'loader',               // The application's class loader
        'config',               // The application's own configuration
+       'config-local', // Local configuration file (optional)
        'data',                 // Application data
        'init',                 // The application initializer
        'starter',              // The application starter (calls entryPoint(), etc.)
@@ -51,7 +52,7 @@ foreach ($configAppIncludes as $appInc) {
        if (($appInc == 'starter') && (defined('TEST'))) {
                // Skip it here
                continue;
-       }
+       } // END - if
 
        // Generate a FQFN for the helper class
        $appFqFn = $basePathFile . '/' . $appInc . '.php';
@@ -71,7 +72,10 @@ foreach ($configAppIncludes as $appInc) {
 }
 
 // Remove variables from namespace, which we don't need
-unset($appInc, $configAppIncludes, $appFqFn, $basePathFile);
+unset($appInc);
+unset($configAppIncludes);
+unset($appFqFn);
+unset($basePathFile);
 
 // [EOF]
 ?>