X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=3950334e917c67e0b9c65eaa558bae402cfd9677;hb=f1e468915bc933e73f8e1ba0bad9ba496ce7a813;hp=55bc413e52b985abad3a6e5e7b44cde95916d2a8;hpb=aababdab2089856dbc7da45f437aaf1811a10b28;p=hub.git
diff --git a/index.php b/index.php
index 55bc413e5..3950334e9 100644
--- a/index.php
+++ b/index.php
@@ -56,9 +56,9 @@ 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 function app_die ($message = '', $code = false, $extraData = '', $silentMode = false) {
+ public static final function app_die ($message = '', $code = false, $extraData = '', $silentMode = false) {
// Is this method already called?
if (isset($GLOBALS['app_die_called'])) {
// Then output the text directly
@@ -98,7 +98,7 @@ final class ApplicationEntryPoint {
// Use the template engine for putting out (nicer look) the message
try {
// Get the template instance from our object factory
- $templateInstance = ObjectFactory::createObjectByName($tpl, array(ApplicationHelper::getInstance()));
+ $templateInstance = ObjectFactory::createObjectByName($tpl);
} catch (FrameworkException $e) {
die(sprintf("[Main:] Could not initialize template engine for reason: %s",
$e->getMessage()
@@ -109,9 +109,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("%s:%d, %s(%d)
\n",
basename($trace['file']),
$trace['line'],
@@ -176,9 +185,9 @@ final class ApplicationEntryPoint {
* Determines the correct absolute path for all includes only once per run.
* Other calls of this method are being "cached".
*
- * @return $basePath Base path (core) for all includes
+ * @return $corePath Base path (core) for all includes
*/
- protected static function detectCorePath () {
+ protected static final function detectCorePath () {
// Is it not set?
if (empty(self::$corePath)) {
// Auto-detect our core path
@@ -197,7 +206,7 @@ final class ApplicationEntryPoint {
*
* @return void
*/
- public static function main () {
+ public static final function main () {
// Load config file
require(self::detectCorePath() . '/inc/config.php');