From 53433de1bc39f51d48970edd7fc5d305c1c5cd35 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 8 Nov 2011 06:44:20 +0000 Subject: [PATCH] Renamed getInstance() to getSelfInstance(), conflicts BaseRegistry versus several other classes --- application/mailer/config.php | 2 +- application/mailer/data.php | 2 +- application/mailer/exceptions.php | 4 ++-- application/mailer/init.php | 2 +- application/mailer/loader.php | 4 ++-- application/mailer/starter.php | 10 +++++----- index.php | 18 ++++++++---------- 7 files changed, 20 insertions(+), 22 deletions(-) diff --git a/application/mailer/config.php b/application/mailer/config.php index 99304ca556..b7ccd991a8 100644 --- a/application/mailer/config.php +++ b/application/mailer/config.php @@ -23,7 +23,7 @@ */ // Get a configuration instance for shorter lines -$cfg = FrameworkConfiguration::getInstance(); +$cfg = FrameworkConfiguration::getSelfInstance(); // CFG: HEADER-CHARSET $cfg->setConfigEntry('header_charset', 'utf-8'); diff --git a/application/mailer/data.php b/application/mailer/data.php index b9b0fdcefa..ca39154825 100644 --- a/application/mailer/data.php +++ b/application/mailer/data.php @@ -34,7 +34,7 @@ */ // Get config instance -$cfg = FrameworkConfiguration::getInstance(); +$cfg = FrameworkConfiguration::getSelfInstance(); // Get an instance of the helper $app = call_user_func_array( diff --git a/application/mailer/exceptions.php b/application/mailer/exceptions.php index bb3f8aa3df..7ba368c8a3 100644 --- a/application/mailer/exceptions.php +++ b/application/mailer/exceptions.php @@ -26,8 +26,8 @@ function __exceptionHandler (FrameworkException $e) { // Call the app_die() method ApplicationEntryPoint::app_die(sprintf("[Main:] The application %s (%s) has terminated due to a thrown exception: %s [%s]: %s Backtrace:
%s
", - ApplicationHelper::getInstance()->getAppName(), - ApplicationHelper::getInstance()->getAppShortName(), + ApplicationHelper::getSelfInstance()->getAppName(), + ApplicationHelper::getSelfInstance()->getAppShortName(), $e->__toString(), $e->getHexCode(), $e->getMessage(), diff --git a/application/mailer/init.php b/application/mailer/init.php index d8eecf2a79..38f705e300 100644 --- a/application/mailer/init.php +++ b/application/mailer/init.php @@ -34,7 +34,7 @@ */ // Get config instance -$cfg = FrameworkConfiguration::getInstance(); +$cfg = FrameworkConfiguration::getSelfInstance(); // Initialize output system require($cfg->getConfigEntry('base_path') . 'inc/output.php'); diff --git a/application/mailer/loader.php b/application/mailer/loader.php index f5c144306d..bd99c987e3 100644 --- a/application/mailer/loader.php +++ b/application/mailer/loader.php @@ -23,12 +23,12 @@ */ // Get config instance -$cfg = FrameworkConfiguration::getInstance(); +$cfg = FrameworkConfiguration::getSelfInstance(); // Load all classes for the application foreach ($lowerClasses as $className) { // Load the application classes - ClassLoader::getInstance()->scanClassPath(sprintf("%s/%s/%s", $cfg->getConfigEntry('application_path'), $cfg->getConfigEntry('app_name'), $className)); + ClassLoader::getSelfInstance()->scanClassPath(sprintf("%s/%s/%s", $cfg->getConfigEntry('application_path'), $cfg->getConfigEntry('app_name'), $className)); } // END - if // Clean up the global namespace diff --git a/application/mailer/starter.php b/application/mailer/starter.php index 14806008a4..0f231105e8 100644 --- a/application/mailer/starter.php +++ b/application/mailer/starter.php @@ -24,30 +24,30 @@ // Is there an application helper instance? We need the method main() for // maining the application -$app = call_user_func_array(array(FrameworkConfiguration::getInstance()->getConfigEntry('app_helper_class'), 'getInstance'), array()); +$app = call_user_func_array(array(FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class'), 'getInstance'), array()); // Some sanity checks if ((empty($app)) || (is_null($app))) { // Something went wrong! ApplicationEntryPoint::app_die(sprintf("[Main:] The application %s could not be launched because the helper class %s is not loaded.", $application, - FrameworkConfiguration::getInstance()->getConfigEntry('app_helper_class') + FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class') )); } elseif (!is_object($app)) { // No object! ApplicationEntryPoint::app_die(sprintf("[Main:] The application %s could not be launched because 'app' is not an object.", $application )); -} elseif (!method_exists($app, FrameworkConfiguration::getInstance()->getConfigEntry('entry_method'))) { +} elseif (!method_exists($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method'))) { // Method not found! ApplicationEntryPoint::app_die(sprintf("[Main:] The application %s could not be launched because the method %s is missing.", $application, - FrameworkConfiguration::getInstance()->getConfigEntry('entry_method') + FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method') )); } // Call user function -call_user_func_array(array($app, FrameworkConfiguration::getInstance()->getConfigEntry('entry_method')), array()); +call_user_func_array(array($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method')), array()); // [EOF] ?> diff --git a/index.php b/index.php index 3950334e91..66a45e537d 100644 --- a/index.php +++ b/index.php @@ -34,8 +34,6 @@ final class ApplicationEntryPoint { /** * The instances we want to remove after all is done - * - * @return void */ private static $instances = array ( 'cfg', // The configuration system @@ -75,7 +73,7 @@ final class ApplicationEntryPoint { } // END - if // Get config instance - $configInstance = FrameworkConfiguration::getInstance(); + $configInstance = FrameworkConfiguration::getSelfInstance(); // Do we have debug installation? if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) { @@ -84,14 +82,14 @@ final class ApplicationEntryPoint { } // END - if // Get some instances - $tpl = FrameworkConfiguration::getInstance()->getConfigEntry('web_template_class'); - $languageInstance = LanguageSystem::getInstance(); + $tpl = FrameworkConfiguration::getSelfInstance()->getConfigEntry('web_template_class'); + $languageInstance = LanguageSystem::getSelfInstance(); // Initialize template instance here to avoid warnings in IDE - $templateInstance = null; + $templateInstance = NULL; // Get response instance - $responseInstance = ApplicationHelper::getInstance()->getResponseInstance(); + $responseInstance = ApplicationHelper::getSelfInstance()->getResponseInstance(); // Is the template engine loaded? if ((class_exists($tpl)) && (is_object($languageInstance))) { @@ -130,12 +128,12 @@ final class ApplicationEntryPoint { } // END - foreach // Init application instance - $applicationInstance = null; + $applicationInstance = NULL; // Is the class there? if (class_exists('ApplicationHelper')) { // Get application instance - $applicationInstance = ApplicationHelper::getInstance(); + $applicationInstance = ApplicationHelper::getSelfInstance(); // Assign application data $templateInstance->assignApplicationData($applicationInstance); @@ -148,7 +146,7 @@ final class ApplicationEntryPoint { $templateInstance->assignVariable('code', $code); $templateInstance->assignVariable('extra', $extraData); $templateInstance->assignVariable('backtrace', $backtrace); - $templateInstance->assignVariable('total_includes', ClassLoader::getInstance()->getTotal()); + $templateInstance->assignVariable('total_includes', ClassLoader::getSelfInstance()->getTotal()); $templateInstance->assignVariable('total_objects', ObjectFactory::getTotal()); $templateInstance->assignVariable('title', $languageInstance->getMessage('emergency_exit_title')); -- 2.30.2