Continued a bit:

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

diff --git a/framework/main/classes/registry/class_BaseRegistry.php b/framework/main/classes/registry/class_BaseRegistry.php
index 9a2af7497f87582b2d3fbe15d9fb2e7413911d06..7c79ce3b3e40898ddce87bcd399c80b24b21bcc2 100644 (file)
--- a/framework/main/classes/registry/class_BaseRegistry.php
+++ b/framework/main/classes/registry/class_BaseRegistry.php
@@ -3,9 +3,13 @@
 namespace CoreFramework\Registry;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\NullPointerException;
 use CoreFramework\Object\BaseFrameworkSystem;
 
+// Import SPL stuff
+use \IteratorAggregate;
+
 /**
  * A general Registry
  *
@@ -28,7 +32,7 @@ use CoreFramework\Object\BaseFrameworkSystem;
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-class BaseRegistry extends BaseFrameworkSystem implements Registerable {
+class BaseRegistry extends BaseFrameworkSystem implements Register, Registerable, IteratorAggregate {
        /**
         * Glue for generating a registry key
         */
@@ -49,8 +53,19 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
                // Call parent constructor
                parent::__construct($className);
 
-               // Init raw array
+               // Init generic arrays
                $this->initGenericArrayGroup('raw', 'generic');
+               $this->initGenericArrayGroup('raw', 'instance');
+       }
+
+       /**
+        * Returns an iterator for this whole registry.
+        *
+        * @return      $iteratorInstance       An instance of a Iterator class
+        */
+       public function getIterator () {
+               // Instance + return it
+               return ObjectFactory::createObjectByConfiguredName('registry_iterator_class', array($this));
        }
 
        /**