From: Roland Haeder <roland@mxchange.org>
Date: Fri, 24 Feb 2017 20:23:05 +0000 (+0100)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=021618e8e583e2101b2393c21e7d74f509479ddc;p=core.git

Continued:
- scanApplicationClasses() must be called before starter.php is being included.
- this whole thing is old and needs an entire rewrite (which will take place
  slowly while this "namespace rewrite" and much more after it.
- added "import" for BaseResolver and Resolver

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/application/tests/init.php b/application/tests/init.php
index 4c6879c6..b877adab 100644
--- a/application/tests/init.php
+++ b/application/tests/init.php
@@ -1,13 +1,11 @@
 <?php
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Loader\ClassLoader;
 
 /**
  * Application initializer
  *
- * Please remember that this include file is being loaded *before* the class
- * loader is loading classes from "exceptions", "interfaces" and "main"!
- *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
@@ -27,5 +25,8 @@ use CoreFramework\Configuration\FrameworkConfiguration;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// Scan for application's classes, exceptions and interfaces
+ClassLoader::scanApplicationClasses();
+
 // Get config instance
 $cfg = FrameworkConfiguration::getSelfInstance();
diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index 95e26bb1..eee9fce1 100644
--- a/inc/loader/class_ClassLoader.php
+++ b/inc/loader/class_ClassLoader.php
@@ -190,11 +190,17 @@ class ClassLoader {
 	 * @return	void
 	 */
 	public static function scanFrameworkClasses () {
+		// Trace message
+		/* NOISY-DEBUG: */ printf('[%s:%d]: CALLED!' . PHP_EOL, __METHOD__, __LINE__);
+
 		// Cache loader instance
 		$loaderInstance = self::getSelfInstance();
 
 		// Load all classes
 		foreach (self::$frameworkPaths as $pathName) {
+			// Debug message
+			/* NOISY-DEBUG: */ printf('[%s:%d]: pathName=%s' . PHP_EOL, __METHOD__, __LINE__, $pathName);
+
 			// Try to load the framework classes
 			$loaderInstance->scanClassPath('inc/main/' . $pathName . '/');
 		} // END - foreach
@@ -206,18 +212,24 @@ class ClassLoader {
 	 * @return	void
 	 */
 	public static function scanApplicationClasses () {
+		// Trace message
+		/* NOISY-DEBUG: */ printf('[%s:%d]: CALLED!' . PHP_EOL, __METHOD__, __LINE__);
+
 		// Get config instance
 		$cfg = FrameworkConfiguration::getSelfInstance();
 
 		// Load all classes for the application
 		foreach (self::$frameworkPaths as $class) {
 			// Create path name
-			$path = sprintf('%s/%s/%s', $cfg->getConfigEntry('application_path'), $cfg->getConfigEntry('app_name'), $class);
+			$pathName = sprintf('%s/%s/%s', $cfg->getConfigEntry('application_path'), $cfg->getConfigEntry('app_name'), $class);
+
+			// Debug message
+			/* NOISY-DEBUG: */ printf('[%s:%d]: pathName=%s' . PHP_EOL, __METHOD__, __LINE__, $pathName);
 
 			// Is the path readable?
-			if (is_dir($path)) {
+			if (is_dir($pathName)) {
 				// Try to load the application classes
-				ClassLoader::getSelfInstance()->scanClassPath($path);
+				ClassLoader::getSelfInstance()->scanClassPath($pathName);
 			} // END - if
 		} // END - foreach
 	}
diff --git a/inc/main/classes/resolver/action/class_BaseActionResolver.php b/inc/main/classes/resolver/action/class_BaseActionResolver.php
index cd6cd5e9..0c4841b6 100644
--- a/inc/main/classes/resolver/action/class_BaseActionResolver.php
+++ b/inc/main/classes/resolver/action/class_BaseActionResolver.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Resolver\Action;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Resolver\BaseResolver;
 
 /**
  * A generic action resolver class
diff --git a/inc/main/classes/resolver/command/class_BaseCommandResolver.php b/inc/main/classes/resolver/command/class_BaseCommandResolver.php
index e538a8c4..730e2822 100644
--- a/inc/main/classes/resolver/command/class_BaseCommandResolver.php
+++ b/inc/main/classes/resolver/command/class_BaseCommandResolver.php
@@ -5,6 +5,7 @@ namespace CoreFramework\Resolver\Controller;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
+use CoreFramework\Resolver\BaseResolver;
 
 /**
  * A generic command resolver class
diff --git a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
index 38b81240..13a086a8 100644
--- a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
+++ b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Resolver\Controller;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Resolver\BaseResolver;
 
 /**
  * A generic controller resolver class
diff --git a/inc/main/interfaces/resolver/actions/class_ActionResolver.php b/inc/main/interfaces/resolver/actions/class_ActionResolver.php
index 7cfdccfa..ec97b79a 100644
--- a/inc/main/interfaces/resolver/actions/class_ActionResolver.php
+++ b/inc/main/interfaces/resolver/actions/class_ActionResolver.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Resolver\Action;
 
 // Import framework stuff
 use CoreFramework\Request\Requestable;
+use CoreFramework\Resolver\Generic\Resolver;
 
 /**
  * An instance for action resolver classes
diff --git a/inc/main/interfaces/resolver/class_Resolver.php b/inc/main/interfaces/resolver/class_Resolver.php
index e06bdd43..437bbb86 100644
--- a/inc/main/interfaces/resolver/class_Resolver.php
+++ b/inc/main/interfaces/resolver/class_Resolver.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Resolver;
+namespace CoreFramework\Resolver\Generic;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
diff --git a/inc/main/interfaces/resolver/commands/class_CommandResolver.php b/inc/main/interfaces/resolver/commands/class_CommandResolver.php
index 149fa8f2..71203a1f 100644
--- a/inc/main/interfaces/resolver/commands/class_CommandResolver.php
+++ b/inc/main/interfaces/resolver/commands/class_CommandResolver.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Resolver\Command;
 
 // Import framework stuff
 use CoreFramework\Request\Requestable;
+use CoreFramework\Resolver\Generic\Resolver;
 
 /**
  * An instance for command resolver classes
diff --git a/inc/main/interfaces/resolver/controller/class_ControllerResolver.php b/inc/main/interfaces/resolver/controller/class_ControllerResolver.php
index 1bf389a6..a3c5307a 100644
--- a/inc/main/interfaces/resolver/controller/class_ControllerResolver.php
+++ b/inc/main/interfaces/resolver/controller/class_ControllerResolver.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Resolver\Controller;
 
+// Import framework stuff
+use CoreFramework\Resolver\Generic\Resolver;
+
 /**
  * An instance for controller resolver classes
  *
diff --git a/inc/main/interfaces/resolver/state/class_StateResolver.php b/inc/main/interfaces/resolver/state/class_StateResolver.php
index be7657ea..d9b8707a 100644
--- a/inc/main/interfaces/resolver/state/class_StateResolver.php
+++ b/inc/main/interfaces/resolver/state/class_StateResolver.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Resolver\State;
 
+// Import framework stuff
+use CoreFramework\Resolver\Generic\Resolver;
+
 /**
  * An instance for state resolver classes
  *
diff --git a/inc/selector.php b/inc/selector.php
index 7c8594f2..59abbe55 100644
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -81,6 +81,3 @@ unset($appInc);
 unset($configAppIncludes);
 unset($appFqFn);
 unset($basePathFile);
-
-// Scan for application's classes, exceptions and interfaces
-ClassLoader::scanApplicationClasses();