From: Roland Häder <roland@mxchange.org>
Date: Sat, 25 Feb 2023 04:48:41 +0000 (+0100)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=859058a3bb0ad1dedf262d18f39cd41646652446;p=shipsimu.git

Continued:
- added some more debug lines (updated index.php)
- updated 'core' framework
---

diff --git a/core b/core
index f861d6b..ba76f13 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit f861d6bc00f8a3ecf6b057f2aa93129572643896
+Subproject commit ba76f1380ebef3021b78d122cbabd6fe3173cd47
diff --git a/index.php b/index.php
index 94177e3..37fa261 100644
--- a/index.php
+++ b/index.php
@@ -60,6 +60,7 @@ final class ApplicationEntryPoint {
 	 */
 	public static final function exitApplication (string $message = '', int $code = -1, string $extraData = '', bool $silentMode = false) {
 		// Is this method already called?
+		//* NOISY-DEBUG: */ printf('[%s:%d]: message=%s,code=%d,extraData=%s,silentMode=%d - CALLED!' . PHP_EOL, __METHOD__, __LINE__, $message, $code, $extraData, intval($silentMode));
 		if (isset($GLOBALS['app_die_called'])) {
 			// Then output the text directly
 			print $message . PHP_EOL;
@@ -81,6 +82,7 @@ final class ApplicationEntryPoint {
 		// Do we have debug installation?
 		if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) {
 			// Abort here
+			//* NOISY-DEBUG: */ printf('[%s:%d]: product_install_mode=%d,silentMode=%d - EXIT!' . PHP_EOL, __METHOD__, __LINE__, $configInstance->getConfigEntry('product_install_mode'), intval($silentMode));
 			exit(255);
 		}
 
@@ -185,6 +187,9 @@ final class ApplicationEntryPoint {
 			printf('[Main:] Emergency exit reached: <span class="emergency_span">%s</span>', $message);
 			exit(255);
 		}
+
+		// Trace message
+		//* NOISY-DEBUG: */ printf('[%s:%d]: EXIT!' . PHP_EOL, __METHOD__, __LINE__);
 	}
 
 	/**
@@ -197,16 +202,19 @@ final class ApplicationEntryPoint {
 	 */
 	public static final function detectFrameworkPath () {
 		// Is it not set?
+		//* NOISY-DEBUG: */ printf('[%s:%d]: self::frameworkPath=%s - CALLED!' . PHP_EOL, __METHOD__, __LINE__, self::$frameworkPath);
 		if (empty(self::$frameworkPath)) {
 			// Auto-detect core path (first application-common)
-			foreach (array('core', __DIR__, '/usr/local/share/php/core', '/usr/share/php/core') as $possiblePath) {
+			foreach (['core', self::getRootPath(), '/usr/local/share/php/core', '/usr/share/php/core'] as $possiblePath) {
 				// Create full path for testing
+				//* NOISY-DEBUG: */ printf('[%s:%d]: possiblePath=%s' . PHP_EOL, __METHOD__, __LINE__, $possiblePath);
 				$realPath = realpath($possiblePath);
 
 				// Is it false?
 				//* NOISY-DEBUG: */ printf('[%s:%d]: realPath[%s]=%s' . PHP_EOL, __METHOD__, __LINE__, gettype($realPath), $realPath);
 				if ($realPath === false) {
 					// Then, not found.
+					//* NOISY-DEBUG: */ printf('[%s:%d]: possiblePath=%s was not found. - SKIPPED!' . PHP_EOL, __METHOD__, __LINE__, $possiblePath);
 					continue;
 				}
 
@@ -214,6 +222,7 @@ final class ApplicationEntryPoint {
 				$frameworkPath = sprintf('%s%sframework%s', $realPath, DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR);
 
 				// First create full-qualified file name (FQFN) to framework/config-global.php
+				//* NOISY-DEBUG: */ printf('[%s:%d]: frameworkPath=%s' . PHP_EOL, __METHOD__, __LINE__, $frameworkPath);
 				$configFile = $frameworkPath . 'config-global.php';
 
 				// Is it readable?
@@ -223,11 +232,13 @@ final class ApplicationEntryPoint {
 					self::$frameworkPath = $frameworkPath;
 
 					// Abort here
+					//* NOISY-DEBUG: */ printf('[%s:%d]: Setting self::frameworkPath=%s - BREAK!' . PHP_EOL, __METHOD__, __LINE__, $frameworkPath);
 					break;
 				}
 			}
 
 			// Able to find?
+			//* NOISY-DEBUG: */ printf('[%s:%d]: self::frameworkPath=%s - Checking ...' . PHP_EOL, __METHOD__, __LINE__, self::$frameworkPath);
 			if (!is_dir(self::$frameworkPath)) {
 				// Is no directory
 				throw new Exception('Cannot find framework.');
@@ -235,6 +246,7 @@ final class ApplicationEntryPoint {
 		}
 
 		// Return it
+		//* NOISY-DEBUG: */ printf('[%s:%d]: self::frameworkPath=%s - EXIT!' . PHP_EOL, __METHOD__, __LINE__, self::$frameworkPath);
 		return self::$frameworkPath;
 	}
 
@@ -258,6 +270,7 @@ final class ApplicationEntryPoint {
 	 */
 	public static final function main () {
 		// Load bootstrap file
+		//* NOISY-DEBUG: */ printf('[%s:%d]: CALLED!' . PHP_EOL, __METHOD__, __LINE__);
 		require sprintf('%sbootstrap%sbootstrap.inc.php', self::detectFrameworkPath(), DIRECTORY_SEPARATOR);
 
 		/*
@@ -274,13 +287,14 @@ final class ApplicationEntryPoint {
 		 * register the application instance in registry.
 		 */
 		FrameworkBootstrap::startApplication();
+
+		// Trace message
+		//* NOISY-DEBUG: */ printf('[%s:%d]: EXIT!' . PHP_EOL, __METHOD__, __LINE__);
 	}
 }
 
 // Log all exceptions (only debug! This option can create large error logs)
 //define('LOG_EXCEPTIONS', true);
 
-//xdebug_start_trace();
-
 // Call above main() method
 ApplicationEntryPoint::main();