X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=66a45e537db557b1c3bb771a5bb1828b1207d247;hb=2d70f528cecab9f9b05f6e2458107bdf60e6338a;hp=782525e1a5e8805293db8aeb877edb6190fabc5c;hpb=211f10ac9751f1dc03827790557645baf47c088f;p=install.git

diff --git a/index.php b/index.php
index 782525e..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
@@ -56,7 +54,7 @@ final class ApplicationEntryPoint {
 	 * @param	$extraData		Extra information from exceptions
 	 * @param	$silentMode		Wether not silent mode is turned on
 	 * @return	void
-	 * @todo	This method is old code and needs heavy rewrite
+	 * @todo	This method is old code and needs heavy rewrite and should be moved to ApplicationHelper
 	 */
 	public static final function app_die ($message = '', $code = false, $extraData = '', $silentMode = false) {
 		// Is this method already called?
@@ -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))) {
@@ -109,9 +107,18 @@ final class ApplicationEntryPoint {
 			$backtraceArray = debug_backtrace();
 			$backtrace = '';
 			foreach ($backtraceArray as $key => $trace) {
-				if (!isset($trace['file'])) $trace['file'] = __FILE__;
-				if (!isset($trace['line'])) $trace['line'] = __LINE__;
-				if (!isset($trace['args'])) $trace['args'] = array();
+				// Set missing array elements
+				if (!isset($trace['file'])) {
+					$trace['file'] = __FILE__;
+				} // END - if
+				if (!isset($trace['line'])) {
+					$trace['line'] = __LINE__;
+				} // END - if
+				if (!isset($trace['args'])) {
+					$trace['args'] = array();
+				} // END - if
+
+				// Add the traceback path to the final output
 				$backtrace .= sprintf("<span class=\"backtrace_file\">%s</span>:%d, <span class=\"backtrace_function\">%s(%d)</span><br />\n",
 					basename($trace['file']),
 					$trace['line'],
@@ -121,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);
@@ -139,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'));