X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fregistry%2Fclass_BaseRegistry.php;h=629c9a1179f0e7a3f141e1cd47513d6def4513f6;hp=e16ded285d03062011f626211db1ef56eb5b1cac;hb=9426b8e41b45893487226c45b75ea30c9d09232e;hpb=aae25237f01ddf26dda0b93779a0d3c231b5b789

diff --git a/inc/classes/main/registry/class_BaseRegistry.php b/inc/classes/main/registry/class_BaseRegistry.php
index e16ded28..629c9a11 100644
--- a/inc/classes/main/registry/class_BaseRegistry.php
+++ b/inc/classes/main/registry/class_BaseRegistry.php
@@ -32,16 +32,6 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	 */
 	private static $registryInstance = NULL;
 
-	/**
-	 * Instance registry
-	 */
-	private $instanceRegistry = array();
-
-	/**
-	 * Raw data entries (non-objects)
-	 */
-	private $rawEntries = array();
-
 	/**
 	 * Protected constructor
 	 *
@@ -61,7 +51,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	 */
 	public function instanceExists ($instanceKey) {
 		// Does this key exists?
-		$exists = (isset($this->instanceRegistry[$instanceKey]));
+		$exists = $this->isGenericArrayKeySet('registry', 'instance', $instanceKey);
 
 		// Return the result
 		return $exists;
@@ -75,7 +65,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	 * @return	void
 	 */
 	public function addInstance ($instanceKey, Registerable $objectInstance) {
-		$this->instanceRegistry[$instanceKey] = $objectInstance;
+		$this->setGenericArrayKey('registry', 'instance', $instanceKey, $objectInstance);
 	}
 
 	/**
@@ -84,7 +74,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	 * @return	$instanceRegistry	The whole instance registry array
 	 */
 	public final function getInstanceRegistry () {
-		return $this->instanceRegistry;
+		return $this->getGenericSubArray('registry', 'instance');
 	}
 
 	/**
@@ -96,8 +86,11 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	 * @return	void
 	 */
 	public final function addEntry ($key, $value) {
-		// Simply add it
-		$this->rawEntries[$key][] = $value;
+		// Key must not be an array
+		assert(!is_array($key));
+
+		// Push it
+		$this->pushValueToGenericArrayElement('raw', 'generic', $key, $value);
 	}
 
 	/**
@@ -106,13 +99,16 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	 * @return	$entries	An array with entries from this registry
 	 */
 	public final function getEntries ($key = NULL) {
+		// Key must not be an array
+		assert(!is_array($key));
+
 		// Default is whole array
-		$entries = $this->rawEntries;
+		$entries = $this->getGenericArray('raw');
 
 		// Is $key set?
 		if (!is_null($key)) {
 			// Then use this entry
-			$entries = $this->rawEntries[$key];
+			$entries = $this->getGenericArrayKey('raw', 'generic', $key);
 		} // END - if
 
 		// Return the array
@@ -127,28 +123,46 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	 * @return	$entry		An array with all keys
 	 */
 	public function getArrayFromKey ($arrayKey, $lookFor) {
+		// Key must not be an array
+		assert(!is_array($arrayKey));
+
 		// Init array
 		$entry = array();
 
+		// Debug message
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Checking arrayKey=' . $arrayKey . ',lookFor=' . $lookFor);
+
 		// "Walk" over all entries
 		foreach ($this->getEntries($arrayKey) as $key => $value) {
 			// Debug message
-			//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY: Checking key=' . $key . ',value=' . $value . ',lookFor=' . $lookFor);
+			//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Checking key=' . $key . ',value=' . $value . ',lookFor=' . $lookFor);
 
 			// If $value matches the $lookFor, we need to look for more entries for this!
 			if ($lookFor == $value) {
 				// Look for more entries
 				foreach ($this->getEntries() as $key2 => $value2) {
-					// Debug message
-					//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY: Checking key2=' . $key2 . ',value2=' . print_r($value2, true) . ',lookFor=' . $lookFor);
-
-					// Both keys must match!
-					if (($key == $key2) || (isset($value2[$key]))) {
+					// Now "walk" through all entries, if an array is returned
+					if (is_array($value2)) {
 						// Debug message
-						//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY: Adding ' . $value2[$key] . ' ...');
+						//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Checking key2=' . $key2 . ',value2()=' . count($value2) . ',lookFor=' . $lookFor);
+
+						// "Walk" through all of them
+						foreach ($value2 as $key3 => $value3) {
+							// $value3 needs to be an array
+							assert(is_array($value3));
 
-						// Then add it
-						$entry[$key2] = $value2[$key];
+							// Debug message
+							//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Checking key=' . $key . ',key3=' . $key3 . ',isset()=' . isset($value3[$key]) . ' ...');
+
+							// Both keys must match!
+							if (($key == $key3) || (isset($value3[$key]))) {
+								// Debug message
+								//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Adding ' . $value3[$key] . ' ...');
+
+								// Then add it
+								$entry[$key3] = $value3[$key];
+							} // END - if
+						} // END - foreach
 					} // END - if
 				} // END - foreach
 
@@ -157,6 +171,9 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 			} // END - if
 		} // END - foreach
 
+		// Debug message
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Returning entry(' . count($entry) . ')=' . print_r($entry, TRUE));
+
 		// Return it
 		return $entry;
 	}
@@ -176,7 +193,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 		} // END - if
 
 		// Get the instance
-		$objectInstance = $this->instanceRegistry[$instanceKey];
+		$objectInstance = $this->getGenericArrayKey('registry', 'instance', $instanceKey);
 
 		// Return the result
 		return $objectInstance;