From 7a1cf0efbe67e14d4c77255886902e8ffdd84b92 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 8 Nov 2011 06:38:31 +0000
Subject: [PATCH] Renamed getInstance() to getSelfInstance(), conflicts
BaseRegistry versus several other classes
---
application/install/config.php | 2 +-
application/install/data.php | 2 +-
application/install/exceptions.php | 4 ++--
application/install/init.php | 2 +-
application/install/loader.php | 4 ++--
application/install/starter.php | 10 +++++-----
index.php | 18 ++++++++----------
7 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/application/install/config.php b/application/install/config.php
index 8894ba2..25be20a 100644
--- a/application/install/config.php
+++ b/application/install/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/install/data.php b/application/install/data.php
index 2c32bb8..ada5d31 100644
--- a/application/install/data.php
+++ b/application/install/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/install/exceptions.php b/application/install/exceptions.php
index 41b4d75..d424396 100644
--- a/application/install/exceptions.php
+++ b/application/install/exceptions.php
@@ -26,8 +26,8 @@
function __exceptionHandler (FrameworkException $e) {
// Call the app_die() method
ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> (<span class=\"app_short_name\">%s</span>) has terminated due to an uncaught exception: <span class=\"exception_name\">%s</span> <span class=\"exception_number\">[%s]</span>: <span class=\"debug_exception\">%s</span> Backtrace: <div class=\"debug_backtrace\">%s</div>",
- ApplicationHelper::getInstance()->getAppName(),
- ApplicationHelper::getInstance()->getAppShortName(),
+ ApplicationHelper::getSelfInstance()->getAppName(),
+ ApplicationHelper::getSelfInstance()->getAppShortName(),
$e->__toString(),
$e->getHexCode(),
$e->getMessage(),
diff --git a/application/install/init.php b/application/install/init.php
index 3437d58..9d57989 100644
--- a/application/install/init.php
+++ b/application/install/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/install/loader.php b/application/install/loader.php
index b46c98f..033687e 100644
--- a/application/install/loader.php
+++ b/application/install/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/install/starter.php b/application/install/starter.php
index 1e6d888..c7e7215 100644
--- a/application/install/starter.php
+++ b/application/install/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 <span class=\"app_name\">%s</span> could not be launched because the helper class <span class=\"class_name\">%s</span> 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 <span class=\"app_name\">%s</span> 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 <span class=\"app_name\">%s</span> could not be launched because the method <span class=\"method_name\">%s</span> 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 3950334..66a45e5 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.39.5