Continued:

- added noisy trace message
- added "import" for Registerable

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

diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index 7dd6d63e95377c96386cafaf21084a591fadb41c..ed5b7825fcba6f8364f4715536e392394034ce02 100644 (file)
--- a/inc/loader/class_ClassLoader.php
+++ b/inc/loader/class_ClassLoader.php
@@ -279,7 +279,7 @@ class ClassLoader {
         */
        public static function autoLoad ($className) {
                // Try to include this class
-               self::getSelfInstance()->includeClass($className);
+               self::getSelfInstance()->loadClassFile($className);
        }
 
        /**
@@ -412,7 +412,10 @@ class ClassLoader {
         * @param       $className      The class that shall be loaded
         * @return      void
         */
-       public function includeClass ($className) {
+       private function loadClassFile ($className) {
+               // Trace message
+               /* NOISY-DEBUG: */ printf('[%s:%d] className=%s - CALLED!' . PHP_EOL, __METHOD__, __LINE__, $className);
+
                // The class name should contain at least 2 back-slashes, so split at them
                $classNameParts = explode("\\", $className);
 

diff --git a/inc/main/classes/container/socket/class_SocketContainer.php b/inc/main/classes/container/socket/class_SocketContainer.php
index 087f2c58cc80f11aeb78d6ce927ddf3e50b4b9de..936874e96f7a1c4302f0ae2a8aaf302bba1c5210 100644 (file)
--- a/inc/main/classes/container/socket/class_SocketContainer.php
+++ b/inc/main/classes/container/socket/class_SocketContainer.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Container\Socket;
 
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A Socket Container class
  *

diff --git a/inc/main/classes/controller/class_BaseController.php b/inc/main/classes/controller/class_BaseController.php
index fcf97fce78c45ce23bf8a56a959b616e493b0bc4..abaace75c9370f83bbc8d6df01f20f5b10dae31b 100644 (file)
--- a/inc/main/classes/controller/class_BaseController.php
+++ b/inc/main/classes/controller/class_BaseController.php
@@ -6,6 +6,7 @@ namespace CoreFramework\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A generic controller class. You should extend this base class if you want to

diff --git a/inc/main/classes/handler/tasks/class_TaskHandler.php b/inc/main/classes/handler/tasks/class_TaskHandler.php
index e44f40d2bdea1cf40c91da616f8d4b0630db4137..b87a8f60cdd4615db85a0bad0aa18990a21387d1 100644 (file)
--- a/inc/main/classes/handler/tasks/class_TaskHandler.php
+++ b/inc/main/classes/handler/tasks/class_TaskHandler.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Handler\Task;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A Task handler

diff --git a/inc/main/classes/images/class_BaseImage.php b/inc/main/classes/images/class_BaseImage.php
index 15ee4963e1675585bc1e0eb825e9fbe316677fdc..da592594346e7579bbdc25836013909678c894d2 100644 (file)
--- a/inc/main/classes/images/class_BaseImage.php
+++ b/inc/main/classes/images/class_BaseImage.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Image;
 
 // Import framework stuff
 use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A general image class

diff --git a/inc/main/classes/points/class_UserPoints.php b/inc/main/classes/points/class_UserPoints.php
index 54424e1eaffd2d1a11a258c01bdafdc6dc70bde9..ce28dabb29898a1a96490f80ffb1c71860b1ce20 100644 (file)
--- a/inc/main/classes/points/class_UserPoints.php
+++ b/inc/main/classes/points/class_UserPoints.php
@@ -5,6 +5,7 @@ namespace CoreFramework\User\Point;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A class for handling user points which can be real or Internet currency

diff --git a/inc/main/middleware/compressor/class_CompressorChannel.php b/inc/main/middleware/compressor/class_CompressorChannel.php
index 1e5cdbc9ed3bb0cabc2768d9bb19a0394b081502..726969a8c2c9ffd7d0612e21957c8e314eede715 100644 (file)
--- a/inc/main/middleware/compressor/class_CompressorChannel.php
+++ b/inc/main/middleware/compressor/class_CompressorChannel.php
@@ -5,6 +5,7 @@ namespace CoreFramework\Channel\Compressor;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Middleware\BaseMiddleware;
+use CoreFramework\Registry\Registerable;
 
 /**
  * Middleware class for selecting the right compressor channel

diff --git a/inc/main/middleware/debug/class_DebugMiddleware.php b/inc/main/middleware/debug/class_DebugMiddleware.php
index 81948737bf6f04cb2201210098a03c34be7db1f0..eca786cdca12bc302c45a1fe02d01e764caa5d49 100644 (file)
--- a/inc/main/middleware/debug/class_DebugMiddleware.php
+++ b/inc/main/middleware/debug/class_DebugMiddleware.php
@@ -5,6 +5,7 @@ namespace CoreFramework\Middleware\Debug;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Middleware\BaseMiddleware;
+use CoreFramework\Registry\Registerable;
 
 /**
  * The middlware debug output system. A *real* or concrete output class shall