8 files changed, 20 insertions, 20 deletions

diff --git a/ext/spl/examples/cachingiterator.inc b/ext/spl/examples/cachingiterator.inc
index d828b88e7b..6a20652341 100644
--- a/ext/spl/examples/cachingiterator.inc
+++ b/ext/spl/examples/cachingiterator.inc
@@ -26,7 +26,7 @@ class CachingIterator
 	
 	function next()
 	{
-		if ($this->more = $this->it->hasMore()) {
+		if ($this->more = $this->it->valid()) {
 			$this->current = $this->it->current();
 			$this->key = $this->it->key();
 			if ($this->flags & CIT_CALL_TOSTRING) {
@@ -44,14 +44,14 @@ class CachingIterator
 		$this->it->next();
 	}
 	
-	function hasMore()
+	function valid()
 	{
 		return $this->more;
 	}
 
 	function hasNext()
 	{
-		return $this->it->hasMore();
+		return $this->it->valid();
 	}
 	
 	function current()
diff --git a/ext/spl/examples/dba_reader.inc b/ext/spl/examples/dba_reader.inc
index d21db45613..fa8fd3d854 100755
--- a/ext/spl/examples/dba_reader.inc
+++ b/ext/spl/examples/dba_reader.inc
@@ -64,7 +64,7 @@ class DbaReader implements Iterator
 	/**
 	 * @return Whether more elements are available.
 	 */
-	function hasMore() {
+	function valid() {
 		if ($this->db && $this->key !== false) {
 			return true;
 		} else {
diff --git a/ext/spl/examples/filteriterator.inc b/ext/spl/examples/filteriterator.inc
index ac8236aa36..7040c4bef9 100755
--- a/ext/spl/examples/filteriterator.inc
+++ b/ext/spl/examples/filteriterator.inc
@@ -47,7 +47,7 @@ abstract class FilterIterator implements Iterator
 	 * @return void
 	 */
 	protected function fetch() {
-		while ($this->it->hasMore()) {
+		while ($this->it->valid()) {
 			if ($this->accept()) {
 				return;
 			}
@@ -68,8 +68,8 @@ abstract class FilterIterator implements Iterator
 	/**
 	 * @return Whether more elements are available
 	 */
-	function hasMore() {
-		return $this->it->hasMore();
+	function valid() {
+		return $this->it->valid();
 	}
 	
 	/**
diff --git a/ext/spl/examples/key_filter.inc b/ext/spl/examples/key_filter.inc
index 6dfd19c85b..2acfc69a34 100755
--- a/ext/spl/examples/key_filter.inc
+++ b/ext/spl/examples/key_filter.inc
@@ -53,7 +53,7 @@ class KeyFilter implements Iterator
 	protected function fetch() {
 		$this->key = false;
 		$this->curr = false;
-		while ($this->it->hasMore()) {
+		while ($this->it->valid()) {
 			$key = $this->it->key();
 			if (ereg($this->regex, $key)) {
 				$this->key = $key;
@@ -77,7 +77,7 @@ class KeyFilter implements Iterator
 	/**
 	 * @return Whether more elements are available
 	 */
-	function hasMore() {
+	function valid() {
 		return $this->key !== false;
 	}
 	
diff --git a/ext/spl/examples/limititerator.inc b/ext/spl/examples/limititerator.inc
index e471f5d0e4..9a87f6874f 100755
--- a/ext/spl/examples/limititerator.inc
+++ b/ext/spl/examples/limititerator.inc
@@ -33,7 +33,7 @@ class LimitIterator implements Iterator
 			$this->it->seek($position);
 			$this->pos = $position;
 		} else {
-			while($this->pos < $position && $this->it->hasMore()) {
+			while($this->pos < $position && $this->it->valid()) {
 				$this->next();
 			}
 		}
@@ -46,9 +46,9 @@ class LimitIterator implements Iterator
 		$this->seek($this->offset);
 	}
 	
-	function hasMore() {
+	function valid() {
 		return ($this->count == -1 || $this->pos < $this->offset + $this->count)
-			 && $this->it->hasMore();
+			 && $this->it->valid();
 	}
 	
 	function key() {
diff --git a/ext/spl/examples/recursiveiteratoriterator.inc b/ext/spl/examples/recursiveiteratoriterator.inc
index b48efb2b3b..05e31df464 100755
--- a/ext/spl/examples/recursiveiteratoriterator.inc
+++ b/ext/spl/examples/recursiveiteratoriterator.inc
@@ -26,12 +26,12 @@ class RecursiveIteratorIterator implements Iterator
 		$this->ait[0]->recursed = false;
 	}
 	
-	function hasMore()
+	function valid()
 	{
 		$count = $this->count;
 		while ($count) {
 			$it = $this->ait[$count];
-			if ($it->hasMore()) {
+			if ($it->valid()) {
 				return true;
 			}
 			$count--;
@@ -55,13 +55,13 @@ class RecursiveIteratorIterator implements Iterator
 	{
 		while ($this->count) {
 			$it = $this->ait[$this->count];
-			if ($it->hasMore()) {
+			if ($it->valid()) {
 				if (!$it->recursed && $it->hasChildren()) {
 					$it->recursed = true;
 					$sub = $it->getChildren();
 					$sub->recursed = false;
 					$sub->rewind();
-					if ($sub->hasMore()) {
+					if ($sub->valid()) {
 						$this->ait[++$this->count] = $sub;
 						if (!$sub instanceof RecursiveIterator) {
 							throw new Exception(get_class($sub).'::getChildren() must return an object that implements RecursiveIterator');
@@ -72,7 +72,7 @@ class RecursiveIteratorIterator implements Iterator
 				}
 				$it->next();
 				$it->recursed = false;
-				if ($it->hasMore()) {
+				if ($it->valid()) {
 					return;
 				}
 				$it->recursed = false;
diff --git a/ext/spl/examples/searchiterator.inc b/ext/spl/examples/searchiterator.inc
index 1ce5a2eebd..a9ba9df171 100755
--- a/ext/spl/examples/searchiterator.inc
+++ b/ext/spl/examples/searchiterator.inc
@@ -9,8 +9,8 @@ abstract class SearchIterator extends FilterIterator
 		$this->done = false;
 	}
 
-	function hasMore() {
-		return !$this->done && parent::hasMore();
+	function valid() {
+		return !$this->done && parent::valid();
 	}
 	
 	function next() {
diff --git a/ext/spl/examples/seekableiterator.inc b/ext/spl/examples/seekableiterator.inc
index 7e47009260..3012155771 100755
--- a/ext/spl/examples/seekableiterator.inc
+++ b/ext/spl/examples/seekableiterator.inc
@@ -19,7 +19,7 @@ interface SeekableIterator implements Iterator
 	function seek($index);
 /*		$this->rewind();
 		$position = 0;
-		while($position < $index && $this->hasMore()) {
+		while($position < $index && $this->valid()) {
 			$this->next();
 			$position++;
 		}