Renamed getInstance() to getSelfInstance(), conflicts BaseRegistry versus several...

[qa.git] / index.php

diff --git a/index.php b/index.php
index fea50278e467080d96bc7d9c1d2e0400b1af9929..66a45e537db557b1c3bb771a5bb1828b1207d247 100644 (file)
--- a/index.php
+++ b/index.php
@@ -73,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)) {
@@ -82,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;
 
                // Get response instance
-               $responseInstance = ApplicationHelper::getInstance()->getResponseInstance();
+               $responseInstance = ApplicationHelper::getSelfInstance()->getResponseInstance();
 
                // Is the template engine loaded?
                if ((class_exists($tpl)) && (is_object($languageInstance))) {
@@ -133,7 +133,7 @@ final class ApplicationEntryPoint {
                        // Is the class there?
                        if (class_exists('ApplicationHelper')) {
                                // Get application instance
-                               $applicationInstance = ApplicationHelper::getInstance();
+                               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                                // Assign application data
                                $templateInstance->assignApplicationData($applicationInstance);
@@ -146,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'));