Continued:

[core.git] / index.php

diff --git a/index.php b/index.php
index 818fb7386a86c0b9dec9db7fc259b495d9955c13..bc2faf43ddb258a277fbd85e2ab58b31c7660a05 100644 (file)
--- a/index.php
+++ b/index.php
@@ -57,12 +57,12 @@ final class ApplicationEntryPoint {
         * @return      void
         * @todo        This method is old code and needs heavy rewrite and should be moved to ApplicationHelper
         */
-       public static final function exitApplication ($message = '', $code = false, $extraData = '', $silentMode = false) {
+       public static final function exitApplication (string $message = '', int $code = -1, string $extraData = '', bool $silentMode = false) {
                // Is this method already called?
                if (isset($GLOBALS['app_die_called'])) {
                        // Then output the text directly
                        exit($message);
-               } // END - if
+               }
 
                // This method shall not be called twice
                $GLOBALS['app_die_called'] = true;
@@ -71,7 +71,7 @@ final class ApplicationEntryPoint {
                if (empty($message)) {
                        // No message provided
                        $message = 'No message provided.';
-               } // END - if
+               }
 
                // Get config instance
                $configInstance = FrameworkBootstrap::getConfigurationInstance();
@@ -79,8 +79,8 @@ final class ApplicationEntryPoint {
                // Do we have debug installation?
                if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) {
                        // Abort here
-                       exit();
-               } // END - if
+                       exit;
+               }
 
                // Get some instances
                $tpl = $configInstance->getConfigEntry('html_template_class');
@@ -105,19 +105,18 @@ final class ApplicationEntryPoint {
                        }
 
                        // Get and prepare backtrace for output
-                       $backtraceArray = debug_backtrace();
                        $backtrace = '';
-                       foreach ($backtraceArray as $key => $trace) {
+                       foreach (debug_backtrace() as $key => $trace) {
                                // 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 />' . PHP_EOL,
@@ -126,7 +125,7 @@ final class ApplicationEntryPoint {
                                        $trace['function'],
                                        count($trace['args'])
                                );
-                       } // END - foreach
+                       }
 
                        // Init application instance
                        $applicationInstance = NULL;
@@ -138,7 +137,7 @@ final class ApplicationEntryPoint {
 
                                // Assign application data
                                $templateInstance->assignApplicationData();
-                       } // END - if
+                       }
 
                        // We only try this
                        try {
@@ -171,10 +170,10 @@ final class ApplicationEntryPoint {
                        }
 
                        // Good bye...
-                       exit();
+                       exit;
                } else {
                        // Output message and die
-                       exit(sprintf('[Main:] Emergency exit reached: <span class="emergency_span">%s</span>',
+                       die(sprintf('[Main:] Emergency exit reached: <span class="emergency_span">%s</span>',
                                $message
                        ));
                }
@@ -196,14 +195,12 @@ final class ApplicationEntryPoint {
                                // Create full path for testing
                                $realPath = realpath($possiblePath);
 
-                               // Debug message
-                               //* NOISY-DEBUG: */ printf('[%s:%d]: realPath[%s]=%s' . PHP_EOL, __METHOD__, __LINE__, gettype($realPath), $realPath);
-
                                // Is it false?
+                               //* NOISY-DEBUG: */ printf('[%s:%d]: realPath[%s]=%s' . PHP_EOL, __METHOD__, __LINE__, gettype($realPath), $realPath);
                                if ($realPath === false) {
                                        // Then, not found.
                                        continue;
-                               } // END - if
+                               }
 
                                // Append framework path
                                $frameworkPath = sprintf('%s%sframework%s', $realPath, DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR);
@@ -211,25 +208,23 @@ final class ApplicationEntryPoint {
                                // First create full-qualified file name (FQFN) to framework/config-global.php
                                $configFile = $frameworkPath . 'config-global.php';
 
-                               // Debug message
-                               //* NOISY-DEBUG: */ printf('[%s:%d]: configFile=%s' . PHP_EOL, __METHOD__, __LINE__, $configFile);
-
                                // Is it readable?
+                               //* NOISY-DEBUG: */ printf('[%s:%d]: configFile=%s' . PHP_EOL, __METHOD__, __LINE__, $configFile);
                                if (is_readable($configFile)) {
                                        // Found one
                                        self::$frameworkPath = $frameworkPath;
 
                                        // Abort here
                                        break;
-                               } // END - if
-                       } // END - foreach
+                               }
+                       }
 
                        // Able to find?
                        if (!is_dir(self::$frameworkPath)) {
                                // Is no directory
                                throw new Exception('Cannot find framework.');
-                       } // END - if
-               } // END - if
+                       }
+               }
 
                // Return it
                return self::$frameworkPath;