State (see State Pattern) prepared, a lot reworked/refactured

[core.git] / inc / classes / main / class_BaseFrameworkSystem.php

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 9e7f247b4bf131264ce6c8e6a7dc0d0ae20a9b55..e15af40017603d2c5fddc56df98c467b07eeae18 100644 (file)
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -128,7 +128,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
        const EXCEPTION_WRITE_PROTECED_PATH          = 0x018;
        const EXCEPTION_DIR_POINTER_INVALID          = 0x019;
        const EXCEPTION_FILE_POINTER_INVALID         = 0x01a;
-       const EXCEPTION_INVALID_DIRECTORY_POINTER    = 0x01b;
+       const EXCEPTION_INVALID_RESOURCE             = 0x01b;
        const EXCEPTION_UNEXPECTED_OBJECT            = 0x01c;
        const EXCEPTION_LIMIT_ELEMENT_IS_UNSUPPORTED = 0x01d;
        const EXCEPTION_GETTER_IS_MISSING            = 0x01e;
@@ -171,10 +171,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                // Set real class
                $this->setRealClass($className);
 
-               // Initialize the class if class Registry is there
-               if ((class_exists('Registry')) && (Registry::isInitialized() === false)) {
-                       // Initialize the registry automatically
-                       $this->initInstance();
+               // Set configuration instance if no registry
+               if (!$this instanceof Register) {
+                       // Because registries doesn't need to be configured
+                       $this->setConfigInstance(FrameworkConfiguration::getInstance());
                } // END - if
        }
 
@@ -245,16 +245,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                return null;
        }
 
-       /**
-        * Private initializer for this class
-        *
-        * @return      void
-        */
-       private final function initInstance () {
-               // Set configuration instance
-               $this->setConfigInstance(FrameworkConfiguration::getInstance());
-       }
-
        /**
         * Setter for database result instance
         *
@@ -388,7 +378,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         * @return      $debugInstance  Instance to class DebugConsoleOutput or DebugWebOutput
         */
        public final function getDebugInstance () {
+               // Get debug instance
                $debugInstance = Registry::getRegistry()->getInstance('debug');
+
+               // Return it
                return $debugInstance;
        }
 
@@ -429,13 +422,8 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         * @return      $dbInstance     The database layer instance
         */
        public final function getDatabaseInstance () {
-               // Default is invalid db instance
-               $dbInstance = null;
-
-               // Is the registry there and initialized?
-               if ((class_exists('Registry')) && (Registry::isInitialized() === true)) {
-                       $dbInstance = Registry::getRegistry()->getInstance('db_instance');
-               } // END - if
+               // Get instance
+               $dbInstance = Registry::getRegistry()->getInstance('db_instance');
 
                // Return instance
                return $dbInstance;