X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fclass_BaseFrameworkSystem.php;h=15a9f5fbead9c47707308ca880164f4045f1b163;hb=9a7a272f04e54537aaf30c282598c1742fe0ad88;hp=ab26925d0d90fed6ed32147f1feb656d94e6f3f6;hpb=e470a1e08a95da8e83878b94fc322f8400ba15ec;p=core.git

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index ab26925d..15a9f5fb 100644
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -4,57 +4,27 @@ namespace Org\Mxchange\CoreFramework\Object;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
-use Org\Mxchange\CoreFramework\Compressor\Compressor;
-use Org\Mxchange\CoreFramework\Configuration\FrameworkConfiguration;
-use Org\Mxchange\CoreFramework\Connection\Database\DatabaseConnection;
-use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Criteria\Criteria;
-use Org\Mxchange\CoreFramework\Criteria\Local\LocalSearchCriteria;
-use Org\Mxchange\CoreFramework\Criteria\Local\LocalUpdateCriteria;
-use Org\Mxchange\CoreFramework\Crypto\Cryptable;
-use Org\Mxchange\CoreFramework\Crypto\RandomNumber\RandomNumberGenerator;
 use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper;
 use Org\Mxchange\CoreFramework\EntryPoint\ApplicationEntryPoint;
 use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Filesystem\Block;
-use Org\Mxchange\CoreFramework\Filesystem\FilePointer;
-use Org\Mxchange\CoreFramework\Filesystem\FrameworkDirectory;
 use Org\Mxchange\CoreFramework\Filesystem\PathWriteProtectedException;
 use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
 use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException;
-use Org\Mxchange\CoreFramework\Handler\Handleable;
-use Org\Mxchange\CoreFramework\Handler\Stream\IoHandler;
-use Org\Mxchange\CoreFramework\Helper\Helper;
-use Org\Mxchange\CoreFramework\Index\Indexable;
-use Org\Mxchange\CoreFramework\Lists\Listable;
 use Org\Mxchange\CoreFramework\Loader\ClassLoader;
-use Org\Mxchange\CoreFramework\Localization\ManageableLanguage;
 use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
-use Org\Mxchange\CoreFramework\Menu\RenderableMenu;
-use Org\Mxchange\CoreFramework\Middleware\Compressor\CompressorChannel;
 use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware;
-use Org\Mxchange\CoreFramework\Parser\Parseable;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
-use Org\Mxchange\CoreFramework\Registry\Register;
-use Org\Mxchange\CoreFramework\Resolver\Resolver;
 use Org\Mxchange\CoreFramework\Result\Database\CachedDatabaseResult;
-use Org\Mxchange\CoreFramework\Result\Search\SearchableResult;
-use Org\Mxchange\CoreFramework\Stacker\Stackable;
 use Org\Mxchange\CoreFramework\State\Stateable;
-use Org\Mxchange\CoreFramework\Stream\Input\InputStream;
 use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
-use Org\Mxchange\CoreFramework\Stream\Output\OutputStream;
-use Org\Mxchange\CoreFramework\String\Utils\StringUtils;
-use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
-use Org\Mxchange\CoreFramework\User\ManageableAccount;
-use Org\Mxchange\CoreFramework\Visitor\Visitor;
+use Org\Mxchange\CoreFramework\Utils\String\StringUtils;
 
 // Import SPL stuff
 use \stdClass;
 use \InvalidArgumentException;
-use \Iterator;
 use \ReflectionClass;
 use \SplFileInfo;
 
@@ -64,7 +34,7 @@ use \SplFileInfo;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -88,232 +58,34 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
 	private static $hashLength = NULL;
 
 	/**
-	 * The real class name
-	 */
-	private $realClass = 'BaseFrameworkSystem';
-
-	/**
-	 * Search criteria instance
-	 */
-	private $searchInstance = NULL;
-
-	/**
-	 * Update criteria instance
-	 */
-	private $updateInstance = NULL;
-
-	/**
-	 * The file I/O instance for the template loader
-	 */
-	private $fileIoInstance = NULL;
-
-	/**
-	 * Resolver instance
-	 */
-	private $resolverInstance = NULL;
-
-	/**
-	 * Template engine instance
-	 */
-	private $templateInstance = NULL;
-
-	/**
-	 * Database result instance
-	 */
-	private $resultInstance = NULL;
-
-	/**
-	 * Instance for user class
-	 */
-	private $userInstance = NULL;
-
-	/**
-	 * A controller instance
-	 */
-	private $controllerInstance = NULL;
-
-	/**
-	 * Instance of a RNG
-	 */
-	private $rngInstance = NULL;
-
-	/**
-	 * Instance of a crypto helper
-	 */
-	private $cryptoInstance = NULL;
-
-	/**
-	 * Instance of an Iterator class
-	 */
-	private $iteratorInstance = NULL;
-
-	/**
-	 * Instance of the list
-	 */
-	private $listInstance = NULL;
-
-	/**
-	 * Instance of a menu
-	 */
-	private $menuInstance = NULL;
-
-	/**
-	 * Instance of the image
-	 */
-	private $imageInstance = NULL;
-
-	/**
-	 * Instance of the stacker
-	 */
-	private $stackInstance = NULL;
-
-	/**
-	 * A Compressor instance
-	 */
-	private $compressorInstance = NULL;
-
-	/**
-	 * A Parseable instance
-	 */
-	private $parserInstance = NULL;
-
-	/**
-	 * A database wrapper instance
-	 */
-	private $databaseInstance = NULL;
-
-	/**
-	 * A helper instance for the form
-	 */
-	private $helperInstance = NULL;
-
-	/**
-	 * An instance of a InputStream class
-	 */
-	private $inputStreamInstance = NULL;
-
-	/**
-	 * An instance of a OutputStream class
+	 * Self-referencing instance
 	 */
-	private $outputStreamInstance = NULL;
+	private static $instance = NULL;
 
 	/**
-	 * Handler instance
-	 */
-	private $handlerInstance = NULL;
-
-	/**
-	 * Visitor handler instance
+	 * The real class name
 	 */
-	private $visitorInstance = NULL;
+	private $realClass = __CLASS__;
 
 	/**
 	 * An instance of a database wrapper class
 	 */
 	private $wrapperInstance = NULL;
 
-	/**
-	 * An instance of a file I/O pointer class (not handler)
-	 */
-	private $pointerInstance = NULL;
-
-	/**
-	 * An instance of an Indexable class
-	 */
-	private $indexInstance = NULL;
-
-	/**
-	 * An instance of a Block class
-	 */
-	private $blockInstance = NULL;
-
-	/**
-	 * A Minable instance
-	 */
-	private $minableInstance = NULL;
-
-	/**
-	 * A FrameworkDirectory instance
-	 */
-	private $directoryInstance = NULL;
-
-	/**
-	 * The concrete output instance
-	 */
-	private $outputInstance = NULL;
-
 	/**
 	 * State instance
 	 */
 	private $stateInstance = NULL;
 
-	/**
-	 * Registry instance (implementing Register)
-	 */
-	private $registryInstance = NULL;
-
 	/**
 	 * Call-back instance
 	 */
 	private $callbackInstance = NULL;
 
-	/**
-	 * Thousands separator
-	 */
-	private $thousands = '.'; // German
-
-	/**
-	 * Decimal separator
-	 */
-	private $decimals  = ','; // German
-
-	/**
-	 * Socket resource
-	 */
-	private $socketResource = false;
-
 	/**
 	 * Generic array
 	 */
-	private $genericArray = array();
-
-	/**
-	 * Command name
-	 */
-	private $commandName = '';
-
-	/**
-	 * Controller name
-	 */
-	private $controllerName = '';
-
-	/**
-	 * Array with bitmasks and such for pack/unpack methods to support both
-	 * 32-bit and 64-bit systems
-	 */
-	private $packingData = array(
-		32 => array(
-			'step'   => 3,
-			'left'   => 0xffff0000,
-			'right'  => 0x0000ffff,
-			'factor' => 16,
-			'format' => 'II',
-		),
-		64 => array(
-			'step'   => 7,
-			'left'   => 0xffffffff00000000,
-			'right'  => 0x00000000ffffffff,
-			'factor' => 32,
-			'format' => 'NN'
-		)
-	);
-
-	/**
-	 * Simple 64-bit check, thanks to "Salman A" from stackoverflow.com:
-	 *
-	 * The integer size is 4 bytes on 32-bit and 8 bytes on a 64-bit system.
-	 */
-	private $archArrayElement = false;
+	private $genericArray = [];
 
 	/***********************
 	 * Exception codes.... *
@@ -382,50 +154,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
 	const EXCEPTION_DATABASE_UPDATED_NOT_ALLOWED = 0x03c;
 	const EXCEPTION_FILTER_CHAIN_INTERCEPTED     = 0x03d;
 	const EXCEPTION_INVALID_SOCKET               = 0x03e;
-
-	/**
-	 * Hexadecimal->Decimal translation array
-	 */
-	private static $hexdec = array(
-		'0' => 0,
-		'1' => 1,
-		'2' => 2,
-		'3' => 3,
-		'4' => 4,
-		'5' => 5,
-		'6' => 6,
-		'7' => 7,
-		'8' => 8,
-		'9' => 9,
-		'a' => 10,
-		'b' => 11,
-		'c' => 12,
-		'd' => 13,
-		'e' => 14,
-		'f' => 15
-	);
-
-	/**
-	 * Decimal->hexadecimal translation array
-	 */
-	private static $dechex = array(
-		 0 => '0',
-		 1 => '1',
-		 2 => '2',
-		 3 => '3',
-		 4 => '4',
-		 5 => '5',
-		 6 => '6',
-		 7 => '7',
-		 8 => '8',
-		 9 => '9',
-		10 => 'a',
-		11 => 'b',
-		12 => 'c',
-		13 => 'd',
-		14 => 'e',
-		15 => 'f'
-	);
+	const EXCEPTION_SELF_INSTANCE                = 0x03f;
 
 	/**
 	 * Startup time in miliseconds
@@ -438,24 +167,15 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
 	 * @param	$className	Name of the class
 	 * @return	void
 	 */
-	protected function __construct ($className) {
+	protected function __construct (string $className) {
 		// Set real class
 		$this->setRealClass($className);
 
-		// Set configuration instance if no registry ...
-		if (!$this instanceof Register) {
-			// ... because registries doesn't need to be configured
-			$this->setConfigInstance(FrameworkBootstrap::getConfigurationInstance());
-		} // END - if
-
 		// Is the startup time set? (0 cannot be true anymore)
 		if (self::$startupTime == 0) {
 			// Then set it
 			self::$startupTime = microtime(true);
-		} // END - if
-
-		// Set array element
-		$this->archArrayElement = (PHP_INT_SIZE === 8 ? 64 : 32);
+		}
 	}
 
 	/**
@@ -464,9 +184,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
 	 * @return	void
 	 */
 	public function __destruct () {
-		// Flush any updated entries to the database
-		$this->flushPendingUpdates();
-
 		// Is this object already destroyed?
 		if ($this->__toString() != 'DestructedObject') {
 			// Destroy all informations about this class but keep some text about it alive
@@ -490,23 +207,39 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
 	 * @args	$args			Arguments passed to the method
 	 * @return	void
 	 */
-	public final function __call ($methodName, $args) {
-		return self::__callStatic($methodName, $args);
+	public final function __call (string $methodName, array $args = NULL) {
+		// Set self-instance
+		self::$instance = $this;
+
+		// Call static method
+		self::__callStatic($methodName, $args);
+
+		// Clear self-instance
+		self::$instance = NULL;
 	}
 
 	/**
 	 * The __callStatic() method where all non-implemented static methods end up
 	 *
 	 * @param	$methodName		Name of the missing method
-	 * @args	$args			Arguments passed to the method
+	 * @param	$args			Arguments passed to the method
 	 * @return	void
+	 * @throws	InvalidArgumentException If self::$instance is not a framework's own object
 	 */
-	public static final function __callStatic ($methodName, $args) {
-		// Trace message
+	public static final function __callStatic (string $methodName, array $args = NULL) {
+		// Init argument string and class name
 		//* PRINT-DEBUG: */ printf('[%s:%d]: methodName=%s,args[]=%s - CALLED!' . PHP_EOL, __METHOD__, __LINE__, $methodName, gettype($args));
-
-		// Init argument string
 		$argsString = '';
+		$className = 'unknown';
+
+		// Is self-instance set?
+		if (self::$instance instanceof FrameworkInterface) {
+			// Framework's own instance
+			$className = self::$instance->__toString();
+		} elseif (!is_null(self::$instance)) {
+			// Invalid argument!
+			throw new InvalidArgumentException(sprintf('self::instance[%s] is not expected.', gettype(self::$instance)), self::EXCEPTION_SELF_INSTANCE);
+		}
 
 		// Is it NULL, empty or an array?
 		if (is_null($args)) {
@@ -549,23 +282,22 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
 
 				// Comma for next one
 				$argsString .= ', ';
-			} // END - foreach
+			}
 
-			// Remove last comma
+			// Last comma found?
 			if (substr($argsString, -2, 1) == ',') {
+				// Remove last comma
 				$argsString = substr($argsString, 0, -2);
-			} // END - if
+			}
 
 			// Close braces
 			$argsString .= ')';
-		} else {
-			// Invalid arguments!
-			$argsString = '!INVALID:' . gettype($args) . '!';
 		}
 
 		// Output stub message
 		// @TODO __CLASS__ does always return BaseFrameworkSystem but not the extending (=child) class
-		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[unknown::%s]: Stub! Args: %s',
+		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s::%s]: Stub! Args: %s',
+			$className,
 			$methodName,
 			$argsString
 		));
@@ -577,788 +309,152 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
 	/**
 	 * Getter for $realClass
 	 *
-	 * @return	$realClass The name of the real class (not BaseFrameworkSystem)
-	 */
-	public function __toString () {
-		return $this->realClass;
-	}
-
-	/**
-	 * Magic method to catch setting of missing but set class fields/attributes
-	 *
-	 * @param	$name	Name of the field/attribute
-	 * @param	$value	Value to store
-	 * @return	void
-	 */
-	public final function __set ($name, $value) {
-		$this->debugBackTrace(sprintf('Tried to set a missing field. name=%s, value[%s]=%s',
-			$name,
-			gettype($value),
-			print_r($value, true)
-		));
-	}
-
-	/**
-	 * Magic method to catch getting of missing fields/attributes
-	 *
-	 * @param	$name	Name of the field/attribute
-	 * @return	void
-	 */
-	public final function __get ($name) {
-		$this->debugBackTrace(sprintf('Tried to get a missing field. name=%s',
-			$name
-		));
-	}
-
-	/**
-	 * Magic method to catch unsetting of missing fields/attributes
-	 *
-	 * @param	$name	Name of the field/attribute
-	 * @return	void
-	 */
-	public final function __unset ($name) {
-		$this->debugBackTrace(sprintf('Tried to unset a missing field. name=%s',
-			$name
-		));
-	}
-
-	/**
-	 * Magic method to catch object serialization
-	 *
-	 * @return	$unsupported	Unsupported method
-	 * @throws	UnsupportedOperationException	Objects of this framework cannot be serialized
-	 */
-	public final function __sleep () {
-		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
-	}
-
-	/**
-	 * Magic method to catch object deserialization
-	 *
-	 * @return	$unsupported	Unsupported method
-	 * @throws	UnsupportedOperationException	Objects of this framework cannot be serialized
-	 */
-	public final function __wakeup () {
-		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
-	}
-
-	/**
-	 * Magic method to catch calls when an object instance is called
-	 *
-	 * @return	$unsupported	Unsupported method
-	 * @throws	UnsupportedOperationException	Objects of this framework cannot be serialized
-	 */
-	public final function __invoke () {
-		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
-	}
-
-	/**
-	 * Setter for the real class name
-	 *
-	 * @param	$realClass	Class name (string)
-	 * @return	void
-	 */
-	public final function setRealClass ($realClass) {
-		// Set real class
-		$this->realClass = (string) $realClass;
-	}
-
-	/**
-	 * Setter for database result instance
-	 *
-	 * @param	$resultInstance		An instance of a database result class
-	 * @return	void
-	 * @todo	SearchableResult and UpdateableResult shall have a super interface to use here
-	 */
-	protected final function setResultInstance (SearchableResult $resultInstance) {
-		$this->resultInstance =  $resultInstance;
-	}
-
-	/**
-	 * Getter for database result instance
-	 *
-	 * @return	$resultInstance		An instance of a database result class
-	 */
-	public final function getResultInstance () {
-		return $this->resultInstance;
-	}
-
-	/**
-	 * Setter for template engine instances
-	 *
-	 * @param	$templateInstance	An instance of a template engine class
-	 * @return	void
-	 */
-	protected final function setTemplateInstance (CompileableTemplate $templateInstance) {
-		$this->templateInstance = $templateInstance;
-	}
-
-	/**
-	 * Getter for template engine instances
-	 *
-	 * @return	$templateInstance	An instance of a template engine class
-	 */
-	protected final function getTemplateInstance () {
-		return $this->templateInstance;
-	}
-
-	/**
-	 * Setter for search instance
-	 *
-	 * @param	$searchInstance		Searchable criteria instance
-	 * @return	void
-	 */
-	public final function setSearchInstance (LocalSearchCriteria $searchInstance) {
-		$this->searchInstance = $searchInstance;
-	}
-
-	/**
-	 * Getter for search instance
-	 *
-	 * @return	$searchInstance		Searchable criteria instance
-	 */
-	public final function getSearchInstance () {
-		return $this->searchInstance;
-	}
-
-	/**
-	 * Setter for update instance
-	 *
-	 * @param	$updateInstance		An instance of a LocalUpdateCriteria clase
-	 * @return	void
-	 */
-	public final function setUpdateInstance (LocalUpdateCriteria $updateInstance) {
-		$this->updateInstance = $updateInstance;
-	}
-
-	/**
-	 * Getter for update instance
-	 *
-	 * @return	$updateInstance		Updateable criteria instance
-	 */
-	public final function getUpdateInstance () {
-		return $this->updateInstance;
-	}
-
-	/**
-	 * Setter for resolver instance
-	 *
-	 * @param	$resolverInstance	Instance of a command resolver class
-	 * @return	void
-	 */
-	public final function setResolverInstance (Resolver $resolverInstance) {
-		$this->resolverInstance = $resolverInstance;
-	}
-
-	/**
-	 * Getter for resolver instance
-	 *
-	 * @return	$resolverInstance	Instance of a command resolver class
-	 */
-	public final function getResolverInstance () {
-		return $this->resolverInstance;
-	}
-
-	/**
-	 * Setter for language instance
-	 *
-	 * @param	$configInstance		The configuration instance which shall
-	 *								be FrameworkConfiguration
-	 * @return	void
-	 */
-	public final function setConfigInstance (FrameworkConfiguration $configInstance) {
-		GenericRegistry::getRegistry()->addInstance('config', $configInstance);
-	}
-
-	/**
-	 * Getter for configuration instance
-	 *
-	 * @return	$configInstance		Configuration instance
-	 */
-	public final function getConfigInstance () {
-		$configInstance = GenericRegistry::getRegistry()->getInstance('config');
-		return $configInstance;
-	}
-
-	/**
-	 * Setter for debug instance
-	 *
-	 * @param	$debugInstance	The instance for debug output class
-	 * @return	void
-	 */
-	public final function setDebugInstance (DebugMiddleware $debugInstance) {
-		GenericRegistry::getRegistry()->addInstance('debug', $debugInstance);
-	}
-
-	/**
-	 * Getter for debug instance
-	 *
-	 * @return	$debugInstance	Instance to class DebugConsoleOutput or DebugWebOutput
-	 */
-	public final function getDebugInstance () {
-		// Get debug instance
-		$debugInstance = GenericRegistry::getRegistry()->getInstance('debug');
-
-		// Return it
-		return $debugInstance;
-	}
-
-	/**
-	 * Setter for web output instance
-	 *
-	 * @param	$webInstance	The instance for web output class
-	 * @return	void
-	 */
-	public final function setWebOutputInstance (OutputStreamer $webInstance) {
-		GenericRegistry::getRegistry()->addInstance('web_output', $webInstance);
-	}
-
-	/**
-	 * Getter for web output instance
-	 *
-	 * @return	$webOutputInstance - Instance to class WebOutput
-	 */
-	public final function getWebOutputInstance () {
-		$webOutputInstance = GenericRegistry::getRegistry()->getInstance('web_output');
-		return $webOutputInstance;
-	}
-
-	/**
-	 * Setter for database instance
-	 *
-	 * @param	$databaseInstance	The instance for the database connection (forced DatabaseConnection)
-	 * @return	void
-	 */
-	public final function setDatabaseInstance (DatabaseConnection $databaseInstance) {
-		GenericRegistry::getRegistry()->addInstance('db_instance', $databaseInstance);
-	}
-
-	/**
-	 * Getter for database layer
-	 *
-	 * @return	$databaseInstance	The database layer instance
-	 */
-	public final function getDatabaseInstance () {
-		// Get instance
-		$databaseInstance = GenericRegistry::getRegistry()->getInstance('db_instance');
-
-		// Return instance
-		return $databaseInstance;
-	}
-
-	/**
-	 * Setter for compressor channel
-	 *
-	 * @param	$compressorInstance		An instance of CompressorChannel
-	 * @return	void
-	 */
-	public final function setCompressorChannel (CompressorChannel $compressorInstance) {
-		GenericRegistry::getRegistry()->addInstance('compressor', $compressorInstance);
-	}
-
-	/**
-	 * Getter for compressor channel
-	 *
-	 * @return	$compressorInstance		The compressor channel
-	 */
-	public final function getCompressorChannel () {
-		$compressorInstance = GenericRegistry::getRegistry()->getInstance('compressor');
-		return $compressorInstance;
-	}
-
-	/**
-	 * Private getter for language instance
-	 *
-	 * @return	$langInstance	An instance to the language sub-system
-	 */
-	protected final function getLanguageInstance () {
-		$langInstance = GenericRegistry::getRegistry()->getInstance('language');
-		return $langInstance;
-	}
-
-	/**
-	 * Setter for language instance
-	 *
-	 * @param	$langInstance	An instance to the language sub-system
-	 * @return	void
-	 * @see		LanguageSystem
-	 */
-	public final function setLanguageInstance (ManageableLanguage $langInstance) {
-		GenericRegistry::getRegistry()->addInstance('language', $langInstance);
-	}
-
-	/**
-	 * Private getter for file IO instance
-	 *
-	 * @return	$fileIoInstance		An instance to the file I/O sub-system
-	 */
-	protected final function getFileIoInstance () {
-		return $this->fileIoInstance;
-	}
-
-	/**
-	 * Setter for file I/O instance
-	 *
-	 * @param	$fileIoInstance		An instance to the file I/O sub-system
-	 * @return	void
-	 */
-	public final function setFileIoInstance (IoHandler $fileIoInstance) {
-		$this->fileIoInstance = $fileIoInstance;
-	}
-
-	/**
-	 * Protected setter for user instance
-	 *
-	 * @param	$userInstance	An instance of a user class
-	 * @return	void
-	 */
-	protected final function setUserInstance (ManageableAccount $userInstance) {
-		$this->userInstance = $userInstance;
-	}
-
-	/**
-	 * Getter for user instance
-	 *
-	 * @return	$userInstance	An instance of a user class
-	 */
-	public final function getUserInstance () {
-		return $this->userInstance;
-	}
-
-	/**
-	 * Setter for controller instance (this surely breaks a bit the MVC patterm)
-	 *
-	 * @param	$controllerInstance		An instance of the controller
-	 * @return	void
-	 */
-	public final function setControllerInstance (Controller $controllerInstance) {
-		$this->controllerInstance = $controllerInstance;
-	}
-
-	/**
-	 * Getter for controller instance (this surely breaks a bit the MVC patterm)
-	 *
-	 * @return	$controllerInstance		An instance of the controller
-	 */
-	public final function getControllerInstance () {
-		return $this->controllerInstance;
-	}
-
-	/**
-	 * Setter for RNG instance
-	 *
-	 * @param	$rngInstance	An instance of a random number generator (RNG)
-	 * @return	void
-	 */
-	protected final function setRngInstance (RandomNumberGenerator $rngInstance) {
-		$this->rngInstance = $rngInstance;
-	}
-
-	/**
-	 * Getter for RNG instance
-	 *
-	 * @return	$rngInstance	An instance of a random number generator (RNG)
-	 */
-	public final function getRngInstance () {
-		return $this->rngInstance;
-	}
-
-	/**
-	 * Setter for Cryptable instance
-	 *
-	 * @param	$cryptoInstance	An instance of a Cryptable class
-	 * @return	void
-	 */
-	protected final function setCryptoInstance (Cryptable $cryptoInstance) {
-		$this->cryptoInstance = $cryptoInstance;
-	}
-
-	/**
-	 * Getter for Cryptable instance
-	 *
-	 * @return	$cryptoInstance	An instance of a Cryptable class
-	 */
-	public final function getCryptoInstance () {
-		return $this->cryptoInstance;
-	}
-
-	/**
-	 * Setter for the list instance
-	 *
-	 * @param	$listInstance	A list of Listable
-	 * @return	void
-	 */
-	protected final function setListInstance (Listable $listInstance) {
-		$this->listInstance = $listInstance;
-	}
-
-	/**
-	 * Getter for the list instance
-	 *
-	 * @return	$listInstance	A list of Listable
-	 */
-	protected final function getListInstance () {
-		return $this->listInstance;
-	}
-
-	/**
-	 * Setter for the menu instance
-	 *
-	 * @param	$menuInstance	A RenderableMenu instance
-	 * @return	void
-	 */
-	protected final function setMenuInstance (RenderableMenu $menuInstance) {
-		$this->menuInstance = $menuInstance;
-	}
-
-	/**
-	 * Getter for the menu instance
-	 *
-	 * @return	$menuInstance	A RenderableMenu instance
-	 */
-	protected final function getMenuInstance () {
-		return $this->menuInstance;
-	}
-
-	/**
-	 * Setter for image instance
-	 *
-	 * @param	$imageInstance	An instance of an image
-	 * @return	void
-	 */
-	public final function setImageInstance (BaseImage $imageInstance) {
-		$this->imageInstance = $imageInstance;
-	}
-
-	/**
-	 * Getter for image instance
-	 *
-	 * @return	$imageInstance	An instance of an image
-	 */
-	public final function getImageInstance () {
-		return $this->imageInstance;
-	}
-
-	/**
-	 * Setter for stacker instance
-	 *
-	 * @param	$stackInstance	An instance of an stacker
-	 * @return	void
-	 */
-	public final function setStackInstance (Stackable $stackInstance) {
-		$this->stackInstance = $stackInstance;
-	}
-
-	/**
-	 * Getter for stacker instance
-	 *
-	 * @return	$stackInstance	An instance of an stacker
-	 */
-	public final function getStackInstance () {
-		return $this->stackInstance;
-	}
-
-	/**
-	 * Setter for compressor instance
-	 *
-	 * @param	$compressorInstance	An instance of an compressor
-	 * @return	void
-	 */
-	public final function setCompressorInstance (Compressor $compressorInstance) {
-		$this->compressorInstance = $compressorInstance;
-	}
-
-	/**
-	 * Getter for compressor instance
-	 *
-	 * @return	$compressorInstance	An instance of an compressor
-	 */
-	public final function getCompressorInstance () {
-		return $this->compressorInstance;
-	}
-
-	/**
-	 * Setter for Parseable instance
-	 *
-	 * @param	$parserInstance	An instance of an Parseable
-	 * @return	void
-	 */
-	public final function setParserInstance (Parseable $parserInstance) {
-		$this->parserInstance = $parserInstance;
-	}
-
-	/**
-	 * Getter for Parseable instance
-	 *
-	 * @return	$parserInstance	An instance of an Parseable
-	 */
-	public final function getParserInstance () {
-		return $this->parserInstance;
-	}
-
-	/**
-	 * Setter for DatabaseWrapper instance
-	 *
-	 * @param	$wrapperInstance	An instance of an DatabaseWrapper
-	 * @return	void
-	 */
-	public final function setWrapperInstance (DatabaseWrapper $wrapperInstance) {
-		$this->wrapperInstance = $wrapperInstance;
-	}
-
-	/**
-	 * Getter for DatabaseWrapper instance
-	 *
-	 * @return	$wrapperInstance	An instance of an DatabaseWrapper
-	 */
-	public final function getWrapperInstance () {
-		return $this->wrapperInstance;
-	}
-
-	/**
-	 * Setter for socket resource
-	 *
-	 * @param	$socketResource		A valid socket resource
-	 * @return	void
-	 */
-	public final function setSocketResource ($socketResource) {
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($this->__toString() . '::' . __FUNCTION__ . ': socketResource=' . $socketResource . ',previous[' . gettype($this->socketResource) . ']=' . $this->socketResource);
-		$this->socketResource = $socketResource;
-	}
-
-	/**
-	 * Getter for socket resource
-	 *
-	 * @return	$socketResource		A valid socket resource
-	 */
-	public final function getSocketResource () {
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($this->__toString() . '::' . __FUNCTION__ . ': socketResource[' . gettype($this->socketResource) . ']=' . $this->socketResource);
-		return $this->socketResource;
-	}
-
-	/**
-	 * Setter for helper instance
-	 *
-	 * @param	$helperInstance		An instance of a helper class
-	 * @return	void
-	 */
-	protected final function setHelperInstance (Helper $helperInstance) {
-		$this->helperInstance = $helperInstance;
-	}
-
-	/**
-	 * Getter for helper instance
-	 *
-	 * @return	$helperInstance		An instance of a helper class
-	 */
-	public final function getHelperInstance () {
-		return $this->helperInstance;
-	}
-
-	/**
-	 * Getter for a InputStream instance
-	 *
-	 * @param	$inputStreamInstance	The InputStream instance
-	 */
-	protected final function getInputStreamInstance () {
-		return $this->inputStreamInstance;
-	}
-
-	/**
-	 * Setter for a InputStream instance
-	 *
-	 * @param	$inputStreamInstance	The InputStream instance
-	 * @return	void
-	 */
-	protected final function setInputStreamInstance (InputStream $inputStreamInstance) {
-		$this->inputStreamInstance = $inputStreamInstance;
-	}
-
-	/**
-	 * Getter for a OutputStream instance
-	 *
-	 * @param	$outputStreamInstance	The OutputStream instance
-	 */
-	protected final function getOutputStreamInstance () {
-		return $this->outputStreamInstance;
-	}
-
-	/**
-	 * Setter for a OutputStream instance
-	 *
-	 * @param	$outputStreamInstance	The OutputStream instance
-	 * @return	void
-	 */
-	protected final function setOutputStreamInstance (OutputStream $outputStreamInstance) {
-		$this->outputStreamInstance = $outputStreamInstance;
-	}
-
-	/**
-	 * Setter for handler instance
-	 *
-	 * @param	$handlerInstance	An instance of a Handleable class
-	 * @return	void
-	 */
-	protected final function setHandlerInstance (Handleable $handlerInstance) {
-		$this->handlerInstance = $handlerInstance;
-	}
-
-	/**
-	 * Getter for handler instance
-	 *
-	 * @return	$handlerInstance	A Handleable instance
-	 */
-	protected final function getHandlerInstance () {
-		return $this->handlerInstance;
-	}
-
-	/**
-	 * Setter for visitor instance
-	 *
-	 * @param	$visitorInstance	A Visitor instance
-	 * @return	void
-	 */
-	protected final function setVisitorInstance (Visitor $visitorInstance) {
-		$this->visitorInstance = $visitorInstance;
-	}
-
-	/**
-	 * Getter for visitor instance
-	 *
-	 * @return	$visitorInstance	A Visitor instance
+	 * @return	$realClass The name of the real class (not BaseFrameworkSystem)
 	 */
-	protected final function getVisitorInstance () {
-		return $this->visitorInstance;
+	public function __toString () {
+		return $this->realClass;
 	}
 
 	/**
-	 * Setter for Iterator instance
+	 * Magic method to catch setting of missing but set class fields/attributes
 	 *
-	 * @param	$iteratorInstance	An instance of an Iterator
+	 * @param	$name	Name of the field/attribute
+	 * @param	$value	Value to store
 	 * @return	void
 	 */
-	protected final function setIteratorInstance (Iterator $iteratorInstance) {
-		$this->iteratorInstance = $iteratorInstance;
+	public final function __set (string $name, $value) {
+		$this->debugBackTrace(sprintf('Tried to set a missing field. name=%s, value[%s]=%s',
+			$name,
+			gettype($value),
+			print_r($value, true)
+		));
 	}
 
 	/**
-	 * Getter for Iterator instance
+	 * Magic method to catch getting of missing fields/attributes
 	 *
-	 * @return	$iteratorInstance	An instance of an Iterator
+	 * @param	$name	Name of the field/attribute
+	 * @return	void
 	 */
-	public final function getIteratorInstance () {
-		return $this->iteratorInstance;
+	public final function __get (string $name) {
+		$this->debugBackTrace(sprintf('Tried to get a missing field. name=%s',
+			$name
+		));
 	}
 
 	/**
-	 * Setter for FilePointer instance
+	 * Magic method to catch unsetting of missing fields/attributes
 	 *
-	 * @param	$pointerInstance	An instance of an FilePointer class
+	 * @param	$name	Name of the field/attribute
 	 * @return	void
 	 */
-	protected final function setPointerInstance (FilePointer $pointerInstance) {
-		$this->pointerInstance = $pointerInstance;
+	public final function __unset (string $name) {
+		$this->debugBackTrace(sprintf('Tried to unset a missing field. name=%s',
+			$name
+		));
 	}
 
 	/**
-	 * Getter for FilePointer instance
+	 * Magic method to catch object serialization
 	 *
-	 * @return	$pointerInstance	An instance of an FilePointer class
+	 * @return	$unsupported	Unsupported method
+	 * @throws	UnsupportedOperationException	Objects of this framework cannot be serialized
 	 */
-	public final function getPointerInstance () {
-		return $this->pointerInstance;
+	public final function __sleep () {
+		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
 
 	/**
-	 * Unsets pointer instance which triggers a call of __destruct() if the
-	 * instance is still there. This is surely not fatal on already "closed"
-	 * file pointer instances.
-	 *
-	 * I don't want to mess around with above setter by giving it a default
-	 * value NULL as setter should always explicitly only set (existing) object
-	 * instances and NULL is NULL.
+	 * Magic method to catch object deserialization
 	 *
-	 * @return	void
+	 * @return	$unsupported	Unsupported method
+	 * @throws	UnsupportedOperationException	Objects of this framework cannot be serialized
 	 */
-	protected final function unsetPointerInstance () {
-		// Simply it to NULL
-		$this->pointerInstance = NULL;
+	public final function __wakeup () {
+		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
 
 	/**
-	 * Setter for Indexable instance
+	 * Magic method to catch calls when an object instance is called
 	 *
-	 * @param	$indexInstance	An instance of an Indexable class
-	 * @return	void
+	 * @return	$unsupported	Unsupported method
+	 * @throws	UnsupportedOperationException	Objects of this framework cannot be serialized
 	 */
-	protected final function setIndexInstance (Indexable $indexInstance) {
-		$this->indexInstance = $indexInstance;
+	public final function __invoke () {
+		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
 
 	/**
-	 * Getter for Indexable instance
+	 * Setter for the real class name
 	 *
-	 * @return	$indexInstance	An instance of an Indexable class
+	 * @param	$realClass	Class name (string)
+	 * @return	void
 	 */
-	public final function getIndexInstance () {
-		return $this->indexInstance;
+	public final function setRealClass (string $realClass) {
+		// Set real class
+		$this->realClass = $realClass;
 	}
 
 	/**
-	 * Setter for Block instance
+	 * Setter for debug instance
 	 *
-	 * @param	$blockInstance	An instance of an Block class
+	 * @param	$debugInstance	The instance for debug output class
 	 * @return	void
 	 */
-	protected final function setBlockInstance (Block $blockInstance) {
-		$this->blockInstance = $blockInstance;
+	public final function setDebugInstance (DebugMiddleware $debugInstance) {
+		GenericRegistry::getRegistry()->addInstance('debug', $debugInstance);
 	}
 
 	/**
-	 * Getter for Block instance
+	 * Getter for debug instance
 	 *
-	 * @return	$blockInstance	An instance of an Block class
+	 * @return	$debugInstance	Instance to class DebugConsoleOutput or DebugWebOutput
 	 */
-	public final function getBlockInstance () {
-		return $this->blockInstance;
+	public final function getDebugInstance () {
+		// Get debug instance
+		$debugInstance = GenericRegistry::getRegistry()->getInstance('debug');
+
+		// Return it
+		return $debugInstance;
 	}
 
 	/**
-	 * Setter for Minable instance
+	 * Setter for web output instance
 	 *
-	 * @param	$minableInstance	A Minable instance
+	 * @param	$webInstance	The instance for web output class
 	 * @return	void
 	 */
-	protected final function setMinableInstance (Minable $minableInstance) {
-		$this->minableInstance = $minableInstance;
+	public final function setWebOutputInstance (OutputStreamer $webInstance) {
+		GenericRegistry::getRegistry()->addInstance('web_output', $webInstance);
 	}
 
 	/**
-	 * Getter for minable instance
+	 * Getter for web output instance
 	 *
-	 * @return	$minableInstance	A Minable instance
+	 * @return	$webOutputInstance - Instance to class WebOutput
 	 */
-	protected final function getMinableInstance () {
-		return $this->minableInstance;
+	public final function getWebOutputInstance () {
+		$webOutputInstance = GenericRegistry::getRegistry()->getInstance('web_output');
+		return $webOutputInstance;
 	}
 
 	/**
-	 * Setter for FrameworkDirectory instance
+	 * Setter for DatabaseWrapper instance
 	 *
-	 * @param	$directoryInstance	A FrameworkDirectory instance
+	 * @param	$wrapperInstance	An instance of an DatabaseWrapper
 	 * @return	void
 	 */
-	protected final function setDirectoryInstance (FrameworkDirectory $directoryInstance) {
-		$this->directoryInstance = $directoryInstance;
+	public final function setWrapperInstance (DatabaseWrapper $wrapperInstance) {
+		$this->wrapperInstance = $wrapperInstance;
 	}
 
 	/**
-	 * Getter for FrameworkDirectory instance
+	 * Getter for DatabaseWrapper instance
 	 *
-	 * @return	$directoryInstance	A FrameworkDirectory instance
+	 * @return	$wrapperInstance	An instance of an DatabaseWrapper
 	 */
-	protected final function getDirectoryInstance () {
-		return $this->directoryInstance;
+	public final function getWrapperInstance () {
+		return $this->wrapperInstance;
 	}
 
 	/**
@@ -1380,44 +476,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
 		return $this->stateInstance;
 	}
 
-	/**
-	 * Setter for output instance
-	 *
-	 * @param	$outputInstance	The debug output instance
-	 * @return	void
-	 */
-	public final function setOutputInstance (OutputStreamer $outputInstance) {
-		$this->outputInstance = $outputInstance;
-	}
-
-	/**
-	 * Getter for output instance
-	 *
-	 * @return	$outputInstance	The debug output instance
-	 */
-	public final function getOutputInstance () {
-		return $this->outputInstance;
-	}
-
-	/**
-	 * Setter for registry instance
-	 *
-	 * @param	$registryInstance		An instance of a Register class
-	 * @return	void
-	 */
-	protected final function setRegistryInstance (Register $registryInstance) {
-		$this->registryInstance = $registryInstance;
-	}
-
-	/**
-	 * Getter for registry instance
-	 *
-	 * @return	$registryInstance	The debug registry instance
-	 */
-	public final function getRegistryInstance () {
-		return $this->registryInstance;
-	}
-
 	/**
 	 * Setter for call-back instance
 	 *
@@ -1437,44 +495,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
 		return $this->callbackInstance;
 	}
 
-	/**
-	 * Setter for command name
-	 *
-	 * @param	$commandName	Last validated command name
-	 * @return	void
-	 */
-	protected final function setCommandName ($commandName) {
-		$this->commandName = $commandName;
-	}
-
-	/**
-	 * Getter for command name
-	 *
-	 * @return	$commandName	Last validated command name
-	 */
-	protected final function getCommandName () {
-		return $this->commandName;
-	}
-
-	/**
-	 * Setter for controller name
-	 *
-	 * @param	$controllerName	Last validated controller name
-	 * @return	void
-	 */
-	protected final function setControllerName ($controllerName) {
-		$this->controllerName = $controllerName;
-	}
-
-	/**
-	 * Getter for controller name
-	 *
-	 * @return	$controllerName	Last validated controller name
-	 */
-	protected final function getControllerName () {
-		return $this->controllerName;
-	}
-
 	/**
 	 * Checks whether an object equals this object. You should overwrite this
 	 * method to implement own equality checks
@@ -1505,35 +525,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
 		return crc32($this->__toString());
 	}
 
-	/**
-	 * Formats computer generated price values into human-understandable formats
-	 * with thousand and decimal separators.
-	 *
-	 * @param	$value		The in computer format value for a price
-	 * @param	$currency	The currency symbol (use HTML-valid characters!)
-	 * @param	$decNum		Number of decimals after commata
-	 * @return	$price		The for the current language formated price string
-	 * @throws	MissingDecimalsThousandsSeparatorException	If decimals or
-	 *												thousands separator
-	 *												is missing
-	 */
-	public function formatCurrency ($value, $currency = '&euro;', $decNum = 2) {
-		// Are all required attriutes set?
-		if ((!isset($this->decimals)) || (!isset($this->thousands))) {
-			// Throw an exception
-			throw new MissingDecimalsThousandsSeparatorException($this, self::EXCEPTION_ATTRIBUTES_ARE_MISSING);
-		} // END - if
-
-		// Cast the number
-		$value = (float) $value;
-
-		// Reformat the US number
-		$price = number_format($value, $decNum, $this->decimals, $this->thousands) . $currency;
-
-		// Return as string...
-		return $price;
-	}
-
 	/**
 	 * Appends a trailing slash to a string
 	 *
@@ -1544,42 +535,12 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
 		// Is there a trailing slash?
 		if (substr($str, -1, 1) != '/') {
 			$str .= '/';
-		} // END - if
+		}
 
 		// Return string with trailing slash
 		return $str;
 	}
 
-	/**
-	 * Prepare the template engine (HtmlTemplateEngine by default) for a given
-	 * application helper instance (ApplicationHelper by default).
-	 *
-	 * @param		$applicationInstance	An application helper instance or
-	 *										null if we shall use the default
-	 * @return		$templateInstance		The template engine instance
-	 * @throws		NullPointerException	If the discovered application
-	 *										instance is still null
-	 */
-	protected function prepareTemplateInstance (ManageableApplication $applicationInstance = NULL) {
-		// Is the application instance set?
-		if (is_null($applicationInstance)) {
-			// Get the current instance
-			$applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
-
-			// Still null?
-			if (is_null($applicationInstance)) {
-				// Thrown an exception
-				throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
-			} // END - if
-		} // END - if
-
-		// Initialize the template engine
-		$templateInstance = ObjectFactory::createObjectByConfiguredName('html_template_class');
-
-		// Return the prepared instance
-		return $templateInstance;
-	}
-
 	/**
 	 * Debugs this instance by putting out it's full content
 	 *
@@ -1599,7 +560,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
 			$content = sprintf('<div class="debug_message">
 	Message: %s
 </div>' . PHP_EOL, $message);
-		} // END - if
+		}
 
 		// Generate the output
 		$content .= sprintf('<pre>%s</pre>',
@@ -1654,13 +615,13 @@ Loaded includes:
 	 */
 	protected function partialStub ($message = '') {
 		// Init variable
-		$stubMessage = 'Partial Stub!';
+		$stubMessage = 'Partial stub!';
 
-		// Is the extra message given?
+		// Is an extra message given?
 		if (!empty($message)) {
 			// Then add it as well
 			$stubMessage .= ' Message: ' . $message;
-		} // END - if
+		}
 
 		// Debug instance is there?
 		if (!is_null($this->getDebugInstance())) {
@@ -1685,7 +646,7 @@ Loaded includes:
 		if (!empty($message)) {
 			// Output message
 			printf('Message: %s<br />' . PHP_EOL, $message);
-		} // END - if
+		}
 
 		print('<pre>');
 		debug_print_backtrace();
@@ -1694,7 +655,7 @@ Loaded includes:
 		// Exit program?
 		if ($doExit === true) {
 			exit();
-		} // END - if
+		}
 	}
 
 	/**
@@ -1797,13 +758,13 @@ Loaded includes:
 			if ($doPrint === false) {
 				// Die here if not printed
 				exit();
-			} // END - if
+			}
 		} else {
 			// Are debug times enabled?
-			if ($this->getConfigInstance()->getConfigEntry('debug_' . FrameworkBootstrap::getRequestTypeFromSystem() . '_output_timings') == 'Y') {
+			if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('debug_' . FrameworkBootstrap::getRequestTypeFromSystem() . '_output_timings') == 'Y') {
 				// Prepent it
 				$message = $this->getPrintableExecutionTime() . $message;
-			} // END - if
+			}
 
 			// Put directly out
 			if ($doPrint === true) {
@@ -1816,29 +777,6 @@ Loaded includes:
 		}
 	}
 
-	/**
-	 * Converts e.g. a command from URL to a valid class by keeping out bad characters
-	 *
-	 * @param	$str		The string, what ever it is needs to be converted
-	 * @return	$className	Generated class name
-	 */
-	public static final function convertToClassName ($str) {
-		// Init class name
-		$className = '';
-
-		// Convert all dashes in underscores
-		$str = StringUtils::convertDashesToUnderscores($str);
-
-		// Now use that underscores to get classname parts for hungarian style
-		foreach (explode('_', $str) as $strPart) {
-			// Make the class name part lower case and first upper case
-			$className .= ucfirst(strtolower($strPart));
-		} // END - foreach
-
-		// Return class name
-		return $className;
-	}
-
 	/**
 	 * Marks up the code by adding e.g. line numbers
 	 *
@@ -1861,7 +799,7 @@ Loaded includes:
 				$errorArray['message'],
 				$errorArray['type']
 			);
-		} // END - if
+		}
 
 		// Add line number to the code
 		foreach (explode(chr(10), $phpCode) as $lineNo => $code) {
@@ -1870,92 +808,26 @@ Loaded includes:
 				($lineNo + 1),
 				htmlentities($code, ENT_QUOTES)
 			);
-		} // END - foreach
+		}
 
 		// Return the code
 		return $markedCode;
 	}
 
-	/**
-	 * Filter a given GMT timestamp (non Uni* stamp!) to make it look more
-	 * beatiful for web-based front-ends. If null is given a message id
-	 * null_timestamp will be resolved and returned.
-	 *
-	 * @param	$timestamp	Timestamp to prepare (filter) for display
-	 * @return	$readable	A readable timestamp
-	 */
-	public function doFilterFormatTimestamp ($timestamp) {
-		// Default value to return
-		$readable = '???';
-
-		// Is the timestamp null?
-		if (is_null($timestamp)) {
-			// Get a message string
-			$readable = $this->getLanguageInstance()->getMessage('null_timestamp');
-		} else {
-			switch ($this->getLanguageInstance()->getLanguageCode()) {
-				case 'de': // German format is a bit different to default
-					// Split the GMT stamp up
-					$dateTime  = explode(' ', $timestamp  );
-					$dateArray = explode('-', $dateTime[0]);
-					$timeArray = explode(':', $dateTime[1]);
-
-					// Construct the timestamp
-					$readable = sprintf($this->getConfigInstance()->getConfigEntry('german_date_time'),
-						$dateArray[0],
-						$dateArray[1],
-						$dateArray[2],
-						$timeArray[0],
-						$timeArray[1],
-						$timeArray[2]
-					);
-					break;
-
-				default: // Default is pass-through
-					$readable = $timestamp;
-					break;
-			} // END - switch
-		}
-
-		// Return the stamp
-		return $readable;
-	}
-
-	/**
-	 * Filter a given number into a localized number
-	 *
-	 * @param	$value		The raw value from e.g. database
-	 * @return	$localized	Localized value
-	 */
-	public function doFilterFormatNumber ($value) {
-		// Generate it from config and localize dependencies
-		switch ($this->getLanguageInstance()->getLanguageCode()) {
-			case 'de': // German format is a bit different to default
-				$localized = number_format($value, $this->getConfigInstance()->getConfigEntry('decimals'), ',', '.');
-				break;
-
-			default: // US, etc.
-				$localized = number_format($value, $this->getConfigInstance()->getConfigEntry('decimals'), '.', ',');
-				break;
-		} // END - switch
-
-		// Return it
-		return $localized;
-	}
-
 	/**
 	 * "Getter" for databse entry
 	 *
 	 * @return	$entry	An array with database entries
 	 * @throws	NullPointerException	If the database result is not found
 	 * @throws	InvalidDatabaseResultException	If the database result is invalid
+	 * @todo	Monolithic method, should be moved to proper classes
 	 */
 	protected final function getDatabaseEntry () {
 		// Is there an instance?
 		if (!$this->getResultInstance() instanceof SearchableResult) {
 			// Throw an exception here
 			throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
-		} // END - if
+		}
 
 		// Rewind it
 		$this->getResultInstance()->rewind();
@@ -1964,7 +836,7 @@ Loaded includes:
 		if ($this->getResultInstance()->valid() === false) {
 			// @TODO Move the constant to e.g. BaseDatabaseResult when there is a non-cached database result available
 			throw new InvalidDatabaseResultException(array($this, $this->getResultInstance()), CachedDatabaseResult::EXCEPTION_INVALID_DATABASE_RESULT);
-		} // END - if
+		}
 
 		// Get next entry
 		$this->getResultInstance()->next();
@@ -1983,7 +855,7 @@ Loaded includes:
 	 * @return	$fieldValue		Field value from the user
 	 * @throws	NullPointerException	If the result instance is null
 	 */
-	public final function getField ($fieldName) {
+	public final function getField (string $fieldName) {
 		// Default field value
 		$fieldValue = NULL;
 
@@ -1994,7 +866,7 @@ Loaded includes:
 		if (is_null($resultInstance)) {
 			// Then the user instance is no longer valid (expired cookies?)
 			throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
-		} // END - if
+		}
 
 		// Get current array
 		$fieldArray = $resultInstance->current();
@@ -2026,7 +898,7 @@ Loaded includes:
 	 * @return	$isSet		Whether the given field name is set
 	 * @throws	NullPointerException	If the result instance is null
 	 */
-	public function isFieldSet ($fieldName) {
+	public function isFieldSet (string $fieldName) {
 		// Get result instance
 		$resultInstance = $this->getResultInstance();
 
@@ -2034,7 +906,7 @@ Loaded includes:
 		if (is_null($resultInstance)) {
 			// Then the user instance is no longer valid (expired cookies?)
 			throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
-		} // END - if
+		}
 
 		// Get current array
 		$fieldArray = $resultInstance->current();
@@ -2050,28 +922,6 @@ Loaded includes:
 		return $isSet;
 	}
 
-	/**
-	 * Flushs all pending updates to the database layer
-	 *
-	 * @return	void
-	 */
-	public function flushPendingUpdates () {
-		// Get result instance
-		$resultInstance = $this->getResultInstance();
-
-		// Do we have data to update?
-		if ((is_object($resultInstance)) && ($resultInstance->ifDataNeedsFlush())) {
-			// Get wrapper class name config entry
-			$configEntry = $resultInstance->getUpdateInstance()->getWrapperConfigEntry();
-
-			// Create object instance
-			$wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName($configEntry);
-
-			// Yes, then send the whole result to the database layer
-			$wrapperInstance->doUpdateByResult($this->getResultInstance());
-		} // END - if
-	}
-
 	/**
 	 * Outputs a deprecation warning to the developer.
 	 *
@@ -2152,143 +1002,6 @@ Loaded includes:
 		// Return result
 		return $hasSlept;
 	}
-	/**
-	 * Converts a hexadecimal string, even with negative sign as first string to
-	 * a decimal number using BC functions.
-	 *
-	 * This work is based on comment #86673 on php.net documentation page at:
-	 * <http://de.php.net/manual/en/function.dechex.php#86673>
-	 *
-	 * @param	$hex	Hexadecimal string
-	 * @return	$dec	Decimal number
-	 */
-	protected function hex2dec ($hex) {
-		// Convert to all lower-case
-		$hex = strtolower($hex);
-
-		// Detect sign (negative/positive numbers)
-		$sign = '';
-		if (substr($hex, 0, 1) == '-') {
-			$sign = '-';
-			$hex = substr($hex, 1);
-		} // END - if
-
-		// Decode the hexadecimal string into a decimal number
-		$dec = 0;
-		for ($i = strlen($hex) - 1, $e = 1; $i >= 0; $i--, $e = bcmul($e, 16)) {
-			$factor = self::$hexdec[substr($hex, $i, 1)];
-			$dec = bcadd($dec, bcmul($factor, $e));
-		} // END - for
-
-		// Return the decimal number
-		return $sign . $dec;
-	}
-
-	/**
-	 * Converts even very large decimal numbers, also signed, to a hexadecimal
-	 * string.
-	 *
-	 * This work is based on comment #97756 on php.net documentation page at:
-	 * <http://de.php.net/manual/en/function.hexdec.php#97756>
-	 *
-	 * @param	$dec		Decimal number, even with negative sign
-	 * @param	$maxLength	Optional maximum length of the string
-	 * @return	$hex	Hexadecimal string
-	 */
-	protected function dec2hex ($dec, $maxLength = 0) {
-		// maxLength can be zero or devideable by 2
-		assert(($maxLength == 0) || (($maxLength % 2) == 0));
-
-		// Detect sign (negative/positive numbers)
-		$sign = '';
-		if ($dec < 0) {
-			$sign = '-';
-			$dec = abs($dec);
-		} // END - if
-
-		// Encode the decimal number into a hexadecimal string
-		$hex = '';
-		do {
-			$hex = self::$dechex[($dec % (2 ^ 4))] . $hex;
-			$dec /= (2 ^ 4);
-		} while ($dec >= 1);
-
-		/*
-		 * Leading zeros are required for hex-decimal "numbers". In some
-		 * situations more leading zeros are wanted, so check for both
-		 * conditions.
-		 */
-		if ($maxLength > 0) {
-			// Prepend more zeros
-			$hex = str_pad($hex, $maxLength, '0', STR_PAD_LEFT);
-		} elseif ((strlen($hex) % 2) != 0) {
-			// Only make string's length dividable by 2
-			$hex = '0' . $hex;
-		}
-
-		// Return the hexadecimal string
-		return $sign . $hex;
-	}
-
-	/**
-	 * Converts a ASCII string (0 to 255) into a decimal number.
-	 *
-	 * @param	$asc	The ASCII string to be converted
-	 * @return	$dec	Decimal number
-	 */
-	protected function asc2dec ($asc) {
-		// Convert it into a hexadecimal number
-		$hex = bin2hex($asc);
-
-		// And back into a decimal number
-		$dec = $this->hex2dec($hex);
-
-		// Return it
-		return $dec;
-	}
-
-	/**
-	 * Converts a decimal number into an ASCII string.
-	 *
-	 * @param	$dec		Decimal number
-	 * @return	$asc	An ASCII string
-	 */
-	protected function dec2asc ($dec) {
-		// First convert the number into a hexadecimal string
-		$hex = $this->dec2hex($dec);
-
-		// Then convert it into the ASCII string
-		$asc = $this->hex2asc($hex);
-
-		// Return it
-		return $asc;
-	}
-
-	/**
-	 * Converts a hexadecimal number into an ASCII string. Negative numbers
-	 * are not allowed.
-	 *
-	 * @param	$hex	Hexadecimal string
-	 * @return	$asc	An ASCII string
-	 */
-	protected function hex2asc ($hex) {
-		// Check for length, it must be devideable by 2
-		//* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('hex='.$hex);
-		assert((strlen($hex) % 2) == 0);
-
-		// Walk the string
-		$asc = '';
-		for ($idx = 0; $idx < strlen($hex); $idx+=2) {
-			// Get the decimal number of the chunk
-			$part = hexdec(substr($hex, $idx, 2));
-
-			// Add it to the final string
-			$asc .= chr($part);
-		} // END - for
-
-		// Return the final string
-		return $asc;
-	}
 
 	/**
 	 * Checks whether the given encoded data was encoded with Base64
@@ -2311,15 +1024,16 @@ Loaded includes:
 	 * @param	$onlyKeys			Only use these keys for a cache key
 	 * @return	$cacheKey			A cache key suitable for lookup/storage purposes
 	 */
-	protected function getCacheKeyByCriteria (Criteria $criteriaInstance, array $onlyKeys = array()) {
+	protected function getCacheKeyByCriteria (Criteria $criteriaInstance, array $onlyKeys = []) {
 		// Generate it
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FRAMEWORK-SYSTEM: criteriaInstance=' . $criteriaInstance->__toString() . ',onlyKeys()=' . count($onlyKeys) . ' - CALLED!');
 		$cacheKey = sprintf('%s@%s',
 			$this->__toString(),
 			$criteriaInstance->getCacheKey($onlyKeys)
 		);
 
 		// And return it
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($this->__toString() . ': cacheKey=' . $cacheKey);
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FRAMEWORK-SYSTEM: cacheKey=' . $cacheKey . ' - EXIT!');
 		return $cacheKey;
 	}
 
@@ -2374,7 +1088,7 @@ Loaded includes:
 		if (is_null(self::$hashLength)) {
 			// No, then hash a string and save its length.
 			self::$hashLength = strlen(self::hash('abc123'));
-		} // END - if
+		}
 
 		// Return it
 		return self::$hashLength;
@@ -2396,13 +1110,13 @@ Loaded includes:
 		if ($castValue === true) {
 			// Cast to biggest numeric type
 			$ret = (double) $ret;
-		} // END - if
+		}
 
 		// Assert only if requested
 		if ($assertMismatch === true) {
 			// Has the whole value changed?
 			assert(('' . $ret . '' != '' . $num . '') && (!is_null($num)));
-		} // END - if
+		}
 
 		// Return result
 		return $ret;
@@ -2423,7 +1137,7 @@ Loaded includes:
 		if ($assertMismatch === true) {
 			// Has the whole value changed?
 			assert(('' . $ret . '' != '' . $num . '') && (!is_null($num)));
-		} // END - if
+		}
 
 		// Return result
 		return $ret;
@@ -2499,7 +1213,7 @@ Loaded includes:
 			// No, then abort here
 			trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ' not found.');
 			exit;
-		} // END - if
+		}
 
 		// Debug message
 		//* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',value=' . print_r($this->genericArray[$keyGroup][$subGroup], true));
@@ -2624,10 +1338,10 @@ Loaded includes:
 			// Already initialized
 			trigger_error(__METHOD__ . ':keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ' already initialized.');
 			exit;
-		} // END - if
+		}
 
 		// Initialize it
-		$this->genericArray[$keyGroup][$subGroup] = array();
+		$this->genericArray[$keyGroup][$subGroup] = [];
 	}
 
 	/**
@@ -2648,10 +1362,10 @@ Loaded includes:
 			// Already initialized
 			trigger_error(__METHOD__ . ':keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ' already initialized.');
 			exit;
-		} // END - if
+		}
 
 		// Initialize it
-		$this->genericArray[$keyGroup][$subGroup][$key] = array();
+		$this->genericArray[$keyGroup][$subGroup][$key] = [];
 	}
 
 	/**
@@ -2673,10 +1387,10 @@ Loaded includes:
 			// Already initialized
 			trigger_error(__METHOD__ . ':keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ',element=' . $element . ' already initialized.');
 			exit;
-		} // END - if
+		}
 
 		// Initialize it
-		$this->genericArray[$keyGroup][$subGroup][$key][$element] = array();
+		$this->genericArray[$keyGroup][$subGroup][$key][$element] = [];
 	}
 
 	/**
@@ -2696,7 +1410,7 @@ Loaded includes:
 		if (!$this->isGenericArrayKeySet($keyGroup, $subGroup, $key)) {
 			// Initialize array
 			$this->initGenericArrayKey($keyGroup, $subGroup, $key);
-		} // END - if
+		}
 
 		// Then push it
 		$count = array_push($this->genericArray[$keyGroup][$subGroup][$key], $value);
@@ -2725,7 +1439,7 @@ Loaded includes:
 		if (!$this->isGenericArrayElementSet($keyGroup, $subGroup, $key, $element)) {
 			// Initialize array
 			$this->initGenericArrayElement($keyGroup, $subGroup, $key, $element);
-		} // END - if
+		}
 
 		// Then push it
 		$count = array_push($this->genericArray[$keyGroup][$subGroup][$key][$element], $value);
@@ -2753,7 +1467,7 @@ Loaded includes:
 			// Not found
 			trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ' not found.');
 			exit;
-		} // END - if
+		}
 
 		// Then "pop" it
 		$value = array_pop($this->genericArray[$keyGroup][$subGroup][$key]);
@@ -2781,7 +1495,7 @@ Loaded includes:
 			// Not found
 			trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ' not found.');
 			exit;
-		} // END - if
+		}
 
 		// Then "shift" it
 		$value = array_shift($this->genericArray[$keyGroup][$subGroup][$key]);
@@ -2807,7 +1521,7 @@ Loaded includes:
 			// Abort here
 			trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ' not found.');
 			exit;
-		} // END - if
+		}
 
 		// Then count it
 		$count = count($this->genericArray[$keyGroup]);
@@ -2835,7 +1549,7 @@ Loaded includes:
 			// Abort here
 			trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ' not found.');
 			exit;
-		} // END - if
+		}
 
 		// Then count it
 		$count = count($this->genericArray[$keyGroup][$subGroup]);
@@ -2895,7 +1609,7 @@ Loaded includes:
 			// Then abort here
 			trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ' does not exist.');
 			exit;
-		} // END - if
+		}
 
 		// Return it
 		return $this->genericArray[$keyGroup];
@@ -2935,7 +1649,7 @@ Loaded includes:
 			// Then abort here
 			trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ' does not exist.');
 			exit;
-		} // END - if
+		}
 
 		// Return it
 		return $this->genericArray[$keyGroup][$subGroup][$key];
@@ -2977,7 +1691,7 @@ Loaded includes:
 			// Then abort here
 			trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ',element=' . $element . ' does not exist.');
 			exit;
-		} // END - if
+		}
 
 		// Return it
 		return $this->genericArray[$keyGroup][$subGroup][$key][$element];
@@ -3042,7 +1756,7 @@ Loaded includes:
 	 * @param	$boolean		Boolean value
 	 * @return	$translated		Translated boolean value
 	 */
-	public static final function translateBooleanToYesNo ($boolean) {
+	public static final function translateBooleanToYesNo (bool $boolean) {
 		// Make sure it is really boolean
 		assert(is_bool($boolean));
 
@@ -3053,74 +1767,6 @@ Loaded includes:
 		return $translated;
 	}
 
-	/**
-	 * Encodes raw data (almost any type) by "serializing" it and then pack it
-	 * into a "binary format".
-	 *
-	 * @param	$rawData	Raw data (almost any type)
-	 * @return	$encoded	Encoded data
-	 */
-	protected function encodeData ($rawData) {
-		// Make sure no objects or resources pass through
-		assert(!is_object($rawData));
-		assert(!is_resource($rawData));
-
-		// First "serialize" it (json_encode() is faster than serialize())
-		$encoded = $this->packString(json_encode($rawData));
-
-		// And return it
-		return $encoded;
-	}
-
-	/**
-	 * Pack a string into a "binary format". Please execuse me that this is
-	 * widely undocumented. :-(
-	 *
-	 * @param	$str		Unpacked string
-	 * @return	$packed		Packed string
-	 * @todo	Improve documentation
-	 */
-	protected function packString ($str) {
-		// Debug message
-		//* NOISY-DEBUG */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('str=' . $str . ' - CALLED!');
-
-		// First compress the string (gzcompress is okay)
-		$str = gzcompress($str);
-
-		// Init variable
-		$packed = '';
-
-		// And start the "encoding" loop
-		for ($idx = 0; $idx < strlen($str); $idx += $this->packingData[$this->archArrayElement]['step']) {
-			$big = 0;
-			for ($i = 0; $i < $this->packingData[$this->archArrayElement]['step']; $i++) {
-				$factor = ($this->packingData[$this->archArrayElement]['step'] - 1 - $i);
-
-				if (($idx + $i) <= strlen($str)) {
-					$ord = ord(substr($str, ($idx + $i), 1));
-
-					$add = $ord * pow(256, $factor);
-
-					$big += $add;
-
-					//print 'idx=' . $idx . ',i=' . $i . ',ord=' . $ord . ',factor=' . $factor . ',add=' . $add . ',big=' . $big . PHP_EOL;
-				} // END - if
-			} // END - for
-
-			$l = ($big & $this->packingData[$this->archArrayElement]['left']) >>$this->packingData[$this->archArrayElement]['factor'];
-			$r = $big & $this->packingData[$this->archArrayElement]['right'];
-
-			$chunk = str_pad(pack($this->packingData[$this->archArrayElement]['format'], $l, $r), 8, '0', STR_PAD_LEFT);
-			//* NOISY-DEBUG */ print 'big=' . $big . ',chunk('.strlen($chunk) . ')='.md5($chunk).PHP_EOL;
-
-			$packed .= $chunk;
-		} // END - for
-
-		// Return it
-		//* NOISY-DEBUG */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('packed=' . $packed . ' - EXIT!');
-		return $packed;
-	}
-
 	/**
 	 * Creates a full-qualified file name (FQFN) for given file name by adding
 	 * a configured temporary file path to it.
@@ -3138,7 +1784,7 @@ Loaded includes:
 		if (!is_writable($basePath)) {
 			// Path is write-protected
 			throw new PathWriteProtectedException($infoInstance, self::EXCEPTION_PATH_CANNOT_BE_WRITTEN);
-		} // END - if
+		}
 
 		// Add it
 		$tempInstance = new SplFileInfo($basePath . DIRECTORY_SEPARATOR . $infoInstance->getBasename());
@@ -3147,7 +1793,7 @@ Loaded includes:
 		if (!FrameworkBootstrap::isReachableFilePath($tempInstance)) {
 			// Not reachable
 			throw new FileIoException($tempInstance, self::EXCEPTION_FILE_NOT_REACHABLE);
-		} // END - if
+		}
 
 		// Return it
 		return $tempInstance;
@@ -3169,7 +1815,7 @@ Loaded includes:
 		if ($stateInstance instanceof Stateable) {
 			// Then use that state name
 			$stateName = $stateInstance->getStateName();
-		} // END - if
+		}
 
 		// Return result
 		return $stateName;