Patches for making new generic array working

[core.git] / inc / classes / main / registry / class_BaseRegistry.php

diff --git a/inc/classes/main/registry/class_BaseRegistry.php b/inc/classes/main/registry/class_BaseRegistry.php
index df0f9798fdf75a2d070da93182b4dc016397356b..f39457cf07f4f5b32085ececa9abbfc45dedccd5 100644 (file)
--- a/inc/classes/main/registry/class_BaseRegistry.php
+++ b/inc/classes/main/registry/class_BaseRegistry.php
@@ -65,7 +65,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
         * @return      void
         */
        public function addInstance ($instanceKey, Registerable $objectInstance) {
-               $this->pushValueToGenericArrayElement('registry', 'instance', $instanceKey, $objectInstance);
+               $this->setGenericArrayKey('registry', 'instance', $instanceKey, $objectInstance);
        }
 
        /**
@@ -86,6 +86,9 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
         * @return      void
         */
        public final function addEntry ($key, $value) {
+               // Key must not be an array
+               assert(!is_array($key));
+
                // Push it
                $this->pushValueToGenericArrayElement('raw', 'generic', $key, $value);
        }
@@ -96,6 +99,9 @@ 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->getGenericArray('raw');
 
@@ -117,6 +123,9 @@ 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();