diff options
| author | ctrlaltca@gmail.com <> | 2011-05-21 18:14:36 +0000 |
|---|---|---|
| committer | ctrlaltca@gmail.com <> | 2011-05-21 18:14:36 +0000 |
| commit | 0892b27e326f14bd3f6229b55077ef5f9d5280b4 (patch) | |
| tree | 24039ec47ba8977bf14ba435c058e758e901f185 /framework/Collections | |
| parent | 6f00b28a1d9c7409c956a83866eac48a9493e83c (diff) | |
branch/3.1: merged bugfixes from trunk/ up to current
Diffstat (limited to 'framework/Collections')
| -rw-r--r-- | framework/Collections/TList.php | 5 | ||||
| -rw-r--r-- | framework/Collections/TMap.php | 3 | ||||
| -rw-r--r-- | framework/Collections/TQueue.php | 2 | ||||
| -rw-r--r-- | framework/Collections/TStack.php | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/framework/Collections/TList.php b/framework/Collections/TList.php index 50cbaf01..206e59a0 100644 --- a/framework/Collections/TList.php +++ b/framework/Collections/TList.php @@ -90,7 +90,7 @@ class TList extends TComponent implements IteratorAggregate,ArrayAccess,Countabl */
public function getIterator()
{
- return new TListIterator($this->_d);
+ return new ArrayIterator( $this->_d );
}
/**
@@ -346,7 +346,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 56748ea2..51ed7b1c 100644 --- a/framework/Collections/TMap.php +++ b/framework/Collections/TMap.php @@ -80,7 +80,7 @@ class TMap extends TComponent implements IteratorAggregate,ArrayAccess,Countable */
public function getIterator()
{
- return new TMapIterator($this->_d);
+ return new ArrayIterator( $this->_d );
}
/**
@@ -272,6 +272,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/TQueue.php b/framework/Collections/TQueue.php index 581a7109..bbf8de66 100644 --- a/framework/Collections/TQueue.php +++ b/framework/Collections/TQueue.php @@ -151,7 +151,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 3c8d5fc6..42b10674 100644 --- a/framework/Collections/TStack.php +++ b/framework/Collections/TStack.php @@ -150,7 +150,7 @@ class TStack extends TComponent implements IteratorAggregate,Countable */
public function getIterator()
{
- return new TStackIterator($this->_d);
+ return new ArrayIterator( $this->_d );
}
/**
@@ -180,6 +180,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
|