From: Roland Häder <roland@mxchange.org>
Date: Wed, 11 Mar 2009 02:26:03 +0000 (+0000)
Subject: Rewrite of all static instances to Registry class
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c8a4397d3236e0e190be52e62a3d2504658d5f8a;p=core.git

Rewrite of all static instances to Registry class
---

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 4160867e..5cc9d811 100644
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -23,21 +23,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
-	/**
-	 * Instance to an application helper class
-	 */
-	private static $applicationInstance = null;
-
-	/**
-	 * The language instance for the template loader
-	 */
-	private static $langInstance = null;
-
-	/**
-	 * Debug instance
-	 */
-	private static $debugInstance = null;
-
 	/**
 	 * Instance of a request class
 	 */
@@ -189,9 +174,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		"GzipCompressor",				// GZIP compressor
 	);
 
-	/* No longer used:
-	*/
-
 	/**
 	 * Private super constructor
 	 *
@@ -434,7 +416,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * @return	void
 	 */
 	public final function setDebugInstance (DebugMiddleware $debugInstance) {
-		self::$debugInstance = $debugInstance;
+		Registry::getRegistry()->addInstance('debug', $debugInstance);
 	}
 
 	/**
@@ -443,7 +425,8 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * @return	$debugInstance	Instance to class DebugConsoleOutput or DebugWebOutput
 	 */
 	public final function getDebugInstance () {
-		return self::$debugInstance;
+		$debugInstance = Registry::getRegistry()->getInstance('debug');
+		return $debugInstance;
 	}
 
 	/**
@@ -459,10 +442,11 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	/**
 	 * Getter for web output instance
 	 *
-	 * @return	$webOutput - Instance to class WebOutput
+	 * @return	$webOutputInstance - Instance to class WebOutput
 	 */
 	public final function getWebOutputInstance () {
-		return Registry::getRegistry()->getInstance('web_output');
+		$webOutputInstance = Registry::getRegistry()->getInstance('web_output');
+		return $webOutputInstance;
 	}
 
 	/**
@@ -473,7 +457,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * @return	void
 	 */
 	public final function setDatabaseInstance (DatabaseConnection $dbInstance) {
-		Registry::getRegistry()->addInstance('dbInstance', $dbInstance);
+		Registry::getRegistry()->addInstance('db_instance', $dbInstance);
 	}
 
 	/**
@@ -487,7 +471,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 
 		// Is the registry there and initialized?
 		if ((class_exists('Registry')) && (Registry::isInitialized() === true)) {
-			$dbInstance = Registry::getRegistry()->getInstance('dbInstance');
+			$dbInstance = Registry::getRegistry()->getInstance('db_instance');
 		} // END - if
 
 		// Return instance
@@ -497,20 +481,21 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	/**
 	 * Setter for compressor channel
 	 *
-	 * @param		$compressorChannel	An instance of CompressorChannel
+	 * @param		$compressorInstance		An instance of CompressorChannel
 	 * @return	void
 	 */
-	public final function setCompressorChannel (CompressorChannel $compressorChannel) {
-		Registry::getRegistry()->addInstance('compressor', $compressorChannel);
+	public final function setCompressorChannel (CompressorChannel $compressorInstance) {
+		Registry::getRegistry()->addInstance('compressor', $compressorInstance);
 	}
 
 	/**
 	 * Getter for compressor channel
 	 *
-	 * @return	$compressor	The compressor channel
+	 * @return	$compressorInstance		The compressor channel
 	 */
 	public final function getCompressorChannel () {
-		return Registry::getRegistry()->getInstance('compressor');
+		$compressorInstance = Registry::getRegistry()->getInstance('compressor');
+		return $compressorInstance;
 	}
 
 	/**
@@ -519,7 +504,8 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * @return	$applicationInstance	An instance of a manageable application helper class
 	 */
 	protected final function getApplicationInstance () {
-		return self::$applicationInstance;
+		$applicationInstance = Registry::getRegistry()->getInstance('application');
+		return $applicationInstance;
 	}
 
 	/**
@@ -529,7 +515,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * @return	void
 	 */
 	public final function setApplicationInstance (ManageableApplication $applicationInstance) {
-		self::$applicationInstance = $applicationInstance;
+		Registry::getRegistry()->addInstance('application', $applicationInstance);
 	}
 
 	/**
@@ -672,7 +658,8 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * @return	$langInstance	An instance to the language sub-system
 	 */
 	protected final function getLanguageInstance () {
-		return self::$langInstance;
+		$langInstance = Registry::getRegistry()->getInstance('language');
+		return $langInstance;
 	}
 
 	/**
@@ -683,7 +670,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * @see		LanguageSystem
 	 */
 	public final function setLanguageInstance (ManageableLanguage $langInstance) {
-		self::$langInstance = $langInstance;
+		Registry::getRegistry()->addInstance('language', $langInstance);
 	}
 
 	/**