From 9be85680cfb74fbb5a566822aeb7d38f7c2dc8ca Mon Sep 17 00:00:00 2001
From: uacaman <>
Date: Tue, 10 May 2011 20:02:10 +0000
Subject: Issue 264 : Changed Collection to use PHP native ArrayIterator

---
 framework/Collections/TList.php         | 5 +++--
 framework/Collections/TMap.php          | 3 ++-
 framework/Collections/TPriorityList.php | 5 +++--
 framework/Collections/TQueue.php        | 2 +-
 framework/Collections/TStack.php        | 3 ++-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/framework/Collections/TList.php b/framework/Collections/TList.php
index 891fd1b6..af9922d7 100644
--- a/framework/Collections/TList.php
+++ b/framework/Collections/TList.php
@@ -91,7 +91,7 @@ class TList extends TComponent implements IteratorAggregate,ArrayAccess,Countabl
 	 */
 	public function getIterator()
 	{
-		return new TListIterator($this->_d);
+		return new ArrayIterator( $this->_d );
 	}
 
 	/**
@@ -403,7 +403,8 @@ class TList extends TComponent implements IteratorAggregate,ArrayAccess,Countabl
  *
  * TListIterator is used by TList. It allows TList to return a new iterator
  * for traversing the items in the list.
- *
+ * 
+ * @deprecated Issue 264 : ArrayIterator should be used instead 
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @version $Id$
  * @package System.Collections
diff --git a/framework/Collections/TMap.php b/framework/Collections/TMap.php
index 2630172c..ce55c3aa 100644
--- a/framework/Collections/TMap.php
+++ b/framework/Collections/TMap.php
@@ -81,7 +81,7 @@ class TMap extends TComponent implements IteratorAggregate,ArrayAccess,Countable
 	 */
 	public function getIterator()
 	{
-		return new TMapIterator($this->_d);
+		return new ArrayIterator( $this->_d );
 	}
 
 	/**
@@ -273,6 +273,7 @@ class TMap extends TComponent implements IteratorAggregate,ArrayAccess,Countable
  * TMapIterator is used by TMap. It allows TMap to return a new iterator
  * for traversing the items in the map.
  *
+ * @deprecated Issue 264 : ArrayIterator should be used instead 
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @version $Id$
  * @package System.Collections
diff --git a/framework/Collections/TPriorityList.php b/framework/Collections/TPriorityList.php
index 41d6a03f..c1c635b5 100644
--- a/framework/Collections/TPriorityList.php
+++ b/framework/Collections/TPriorityList.php
@@ -169,7 +169,7 @@ class TPriorityList extends TList
 	 */
 	public function getIterator()
 	{
-		return new TPriorityListIterator($this->flattenPriorities());
+		return new ArrayIterator( $this->flattenPriorities() );
 	}
 	
 	/**
@@ -708,7 +708,8 @@ class TPriorityList extends TList
  *
  * TPriorityListIterator is used by TPriorityList. It allows TPriorityList to return a new iterator
  * for traversing the items in the priority list.
- *
+ * 
+ * @deprecated Issue 264 : ArrayIterator should be used instead  
  * @author Brad Anderson <javalizard@gmail.com>
  * @version $Id: TPriorityList.php 2541 2010-10-03 15:05:13Z javalizard $
  * @package System.Collections
diff --git a/framework/Collections/TQueue.php b/framework/Collections/TQueue.php
index dc580d1e..469be018 100644
--- a/framework/Collections/TQueue.php
+++ b/framework/Collections/TQueue.php
@@ -152,7 +152,7 @@ class TQueue extends TComponent implements IteratorAggregate,Countable
 	 */
 	public function getIterator()
 	{
-		return new TQueueIterator($this->_d);
+		return new ArrayIterator( $this->_d );
 	}
 
 	/**
diff --git a/framework/Collections/TStack.php b/framework/Collections/TStack.php
index 16bd6fca..9fd045e4 100644
--- a/framework/Collections/TStack.php
+++ b/framework/Collections/TStack.php
@@ -151,7 +151,7 @@ class TStack extends TComponent implements IteratorAggregate,Countable
 	 */
 	public function getIterator()
 	{
-		return new TStackIterator($this->_d);
+		return new ArrayIterator( $this->_d );
 	}
 
 	/**
@@ -181,6 +181,7 @@ class TStack extends TComponent implements IteratorAggregate,Countable
  * TStackIterator is used by TStack. It allows TStack to return a new iterator
  * for traversing the items in the list.
  *
+ * @deprecated Issue 264 : ArrayIterator should be used instead 
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @version $Id$
  * @package System.Collections
-- 
cgit v1.2.3