X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=index.php;h=ecf66b48876f5635b4848a966b756595673f1fec;hp=b54c766135e0d55fd599451842699bb3280acb6a;hb=4e95c4e90f08f67f43591eaaa0c006f923d8bacf;hpb=9d1de68caa0fb93f1862f1f8d3939aa15405cee7

diff --git a/index.php b/index.php
index b54c7661..ecf66b48 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,18 @@
 <?php
+// Own namespace (watch out: core)
+namespace CoreFramework\EntryPoint;
+
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Helper\Application\ApplicationHelper;
+use CoreFramework\Localization\LanguageSystem;
+use CoreFramework\Loader\ClassLoader;
+use CoreFramework\Generic\FrameworkException;
+
+// Import SPL stuff
+use \Exception;
+
 /**
  * The main class with the entry point to the whole application. This class
  * "emulates" Java's entry point call. Additionally it covers local
@@ -28,9 +42,9 @@
  */
 final class ApplicationEntryPoint {
 	/**
-	 * Core path
+	 * Framework path
 	 */
-	private static $corePath = '';
+	private static $frameworkPath = '';
 
 	/**
 	 * The application's emergency exit
@@ -117,7 +131,7 @@ final class ApplicationEntryPoint {
 			$applicationInstance = NULL;
 
 			// Is the class there?
-			if (class_exists('ApplicationHelper')) {
+			if (class_exists('CoreFramework\Helper\Application\ApplicationHelper')) {
 				// Get application instance
 				$applicationInstance = ApplicationHelper::getSelfInstance();
 
@@ -166,20 +180,61 @@ final class ApplicationEntryPoint {
 	}
 
 	/**
-	 * Determines the correct absolute path for all includes only once per run.
-	 * Other calls of this method are being "cached".
+	 * Determines the correct absolute path for the framework. A set of common
+	 * paths is being tested (first most common for applications, second when
+	 * core tests are being executed and third/forth if the framework has been
+	 * cloned there).
 	 *
-	 * @return	$corePath	Base path (core) for all includes
+	 * @return	$frameworkPath	Path for framework
 	 */
-	protected static final function detectCorePath () {
+	public static final function detectFrameworkPath () {
 		// Is it not set?
-		if (empty(self::$corePath)) {
-			// Auto-detect our core path
-			self::$corePath = str_replace("\\", '/', dirname(__FILE__));
+		if (empty(self::$frameworkPath)) {
+			// Auto-detect core path (first application-common)
+			foreach (array('core', '.', '/usr/local/share/php/core', '/usr/share/php/core') as $possiblePath) {
+				// 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?
+				if ($realPath === FALSE) {
+					// Then, not found.
+					continue;
+				} // END - if
+
+				// First create full-qualified file name (FQFN) to framework/config.inc.php
+				$fqfn = sprintf(
+					'%s%sframework%sconfig.inc.php',
+					$realPath,
+					DIRECTORY_SEPARATOR,
+					DIRECTORY_SEPARATOR,
+					$possiblePath
+				);
+
+				// Debug message
+				/* NOISY-DEBUG: */ printf('[%s:%d]: fqfn=%s' . PHP_EOL, __METHOD__, __LINE__, $fqfn);
+
+				// Is it readable?
+				if (is_readable($fqfn)) {
+					// Found one
+					self::$frameworkPath = $realPath . '/framework/';
+
+					// 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::$corePath;
+		return self::$frameworkPath;
 	}
 
 	/**
@@ -191,22 +246,11 @@ final class ApplicationEntryPoint {
 	 * @return	void
 	 */
 	public static final function main () {
-		// Load config file, this provides $cfg
-		require(self::detectCorePath() . '/inc/config.php');
+		// Load bootstrap file
+		require(self::detectFrameworkPath() . 'bootstrap/bootstrap.inc.php');
 
 		// Get a new configuration instance
 		$cfg = FrameworkConfiguration::getSelfInstance();
-
-		// Load bootstrap class
-		require($cfg->getConfigEntry('base_path') . 'inc/bootstrap/class_BootstrapFramework.php');
-
-		// ----- Below is deprecated -----
-
-		// Load all include files
-		require($cfg->getConfigEntry('base_path') . 'inc/includes.php');
-
-		// Include the application selector
-		require($cfg->getConfigEntry('base_path') . 'inc/selector.php');
 	}
 }
 
@@ -220,6 +264,3 @@ define('DEVELOPER', TRUE);
 
 // Call above main() method
 ApplicationEntryPoint::main();
-
-// [EOF]
-?>