From: Roland Häder Date: Tue, 7 Aug 2012 00:21:17 +0000 (+0000) Subject: Used exit() instead of die() X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0b3e49d7a035fff10dc5ad73127b80f04f811769;p=install.git Used exit() instead of die() --- diff --git a/application/install/exceptions.php b/application/install/exceptions.php index d424396..d41f4ab 100644 --- a/application/install/exceptions.php +++ b/application/install/exceptions.php @@ -24,8 +24,8 @@ // Our own exception handler function __exceptionHandler (FrameworkException $e) { - // Call the app_die() method - ApplicationEntryPoint::app_die(sprintf("[Main:] The application %s (%s) has terminated due to an uncaught exception: %s [%s]: %s Backtrace:
%s
", + // Call the app_exit() method + ApplicationEntryPoint::app_exit(sprintf("[Main:] The application %s (%s) has terminated due to an uncaught exception: %s [%s]: %s Backtrace:
%s
", ApplicationHelper::getSelfInstance()->getAppName(), ApplicationHelper::getSelfInstance()->getAppShortName(), $e->__toString(), diff --git a/application/install/starter.php b/application/install/starter.php index f423a93..66e5c7f 100644 --- a/application/install/starter.php +++ b/application/install/starter.php @@ -29,18 +29,18 @@ $app = call_user_func_array(array(FrameworkConfiguration::getSelfInstance()->get // Some sanity checks if ((empty($app)) || (is_null($app))) { // Something went wrong! - ApplicationEntryPoint::app_die(sprintf("[Main:] The application %s could not be launched because the helper class %s is not loaded.", + ApplicationEntryPoint::app_exit(sprintf("[Main:] The application %s could not be launched because the helper class %s is not loaded.", $application, FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class') )); } elseif (!is_object($app)) { // No object! - ApplicationEntryPoint::app_die(sprintf("[Main:] The application %s could not be launched because 'app' is not an object.", + ApplicationEntryPoint::app_exit(sprintf("[Main:] The application %s could not be launched because 'app' is not an object.", $application )); } elseif (!method_exists($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method'))) { // Method not found! - ApplicationEntryPoint::app_die(sprintf("[Main:] The application %s could not be launched because the method %s is missing.", + ApplicationEntryPoint::app_exit(sprintf("[Main:] The application %s could not be launched because the method %s is missing.", $application, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method') )); diff --git a/index.php b/index.php index 66a45e5..a14e71b 100644 --- a/index.php +++ b/index.php @@ -9,7 +9,7 @@ * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * @@ -41,7 +41,7 @@ final class ApplicationEntryPoint { 'debug', // Debug output 'db', // Database layer 'io', // Base I/O system (local file [or network]) - 'engine', // Template engine ( for ApplicationEntryPoint::app_die() ) + 'engine', // Template engine ( for ApplicationEntryPoint::app_exit() ) 'lang', // Language sub-system 'app', // The ApplicationHelper instance ); @@ -52,15 +52,15 @@ final class ApplicationEntryPoint { * @param $message The optional message we shall output on exit * @param $code Error code from exception * @param $extraData Extra information from exceptions - * @param $silentMode Wether not silent mode is turned on + * @param $silentMode Whether silent mode is turned on * @return void * @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) { + public static final function app_exit ($message = '', $code = false, $extraData = '', $silentMode = false) { // Is this method already called? if (isset($GLOBALS['app_die_called'])) { // Then output the text directly - die($message); + exit($message); } // END - if // This method shall not be called twice @@ -78,7 +78,7 @@ final class ApplicationEntryPoint { // Do we have debug installation? if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) { // Abort here - die(); + exit(); } // END - if // Get some instances @@ -98,7 +98,7 @@ final class ApplicationEntryPoint { // Get the template instance from our object factory $templateInstance = ObjectFactory::createObjectByName($tpl); } catch (FrameworkException $e) { - die(sprintf("[Main:] Could not initialize template engine for reason: %s", + exit(sprintf("[Main:] Could not initialize template engine for reason: %s", $e->getMessage() )); } @@ -166,14 +166,14 @@ final class ApplicationEntryPoint { $responseInstance->flushBuffer(); } catch (FileIoException $e) { // Even the template 'emergency_exit' wasn't found so output both message - die($message . ', exception: ' . $e->getMessage()); + exit($message . ', exception: ' . $e->getMessage()); } // Good bye... exit(); } else { // Output message and die - die(sprintf("[Main:] Emergency exit reached: %s", + exit(sprintf("[Main:] Emergency exit reached: %s", $message )); }