Rename hasMore() to valid() as discussed. (Part I)

5 files changed, 51 insertions, 51 deletions

diff --git a/tests/classes/iterators_001.phpt b/tests/classes/iterators_001.phpt
index a759b947bb..b032cb8e95 100755
--- a/tests/classes/iterators_001.phpt
+++ b/tests/classes/iterators_001.phpt
@@ -17,7 +17,7 @@ class c_iter implements Iterator {
 	}
 	function rewind() {
 	}
-	function hasMore() {
+	function valid() {
 		$more = $this->num < $this->obj->max;
 		echo __METHOD__ . ' = ' .($more ? 'true' : 'false') . "\n";
 		return $more;
@@ -60,7 +60,7 @@ foreach($a as $v) {
 
 echo "===Manual===\n";
 $t = new c();
-for ($iter = $t->getIterator(); $iter->hasMore(); $iter->next()) {
+for ($iter = $t->getIterator(); $iter->valid(); $iter->next()) {
 	echo $iter->current() . "\n";
 }
 
@@ -92,125 +92,125 @@ array:2
 ===Manual===
 c::getIterator
 c_iter::__construct
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 0
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 1
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 2
 c_iter::next
-c_iter::hasMore = false
+c_iter::valid = false
 ===foreach/std===
 c::getIterator
 c_iter::__construct
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 object:0
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 object:1
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 object:2
 c_iter::next
-c_iter::hasMore = false
+c_iter::valid = false
 ===foreach/rec===
 c::getIterator
 c_iter::__construct
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 c::getIterator
 c_iter::__construct
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 double:0:0
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 double:0:1
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 double:0:2
 c_iter::next
-c_iter::hasMore = false
+c_iter::valid = false
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 c::getIterator
 c_iter::__construct
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 double:1:0
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 double:1:1
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 double:1:2
 c_iter::next
-c_iter::hasMore = false
+c_iter::valid = false
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 c::getIterator
 c_iter::__construct
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 double:2:0
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 double:2:1
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 double:2:2
 c_iter::next
-c_iter::hasMore = false
+c_iter::valid = false
 c_iter::next
-c_iter::hasMore = false
+c_iter::valid = false
 ===foreach/key===
 c::getIterator
 c_iter::__construct
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 object:1st=>0
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 object:2nd=>1
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 object:3rd=>2
 c_iter::next
-c_iter::hasMore = false
+c_iter::valid = false
 Done
diff --git a/tests/classes/iterators_002.phpt b/tests/classes/iterators_002.phpt
index 537b2138bf..a8e564e843 100755
--- a/tests/classes/iterators_002.phpt
+++ b/tests/classes/iterators_002.phpt
@@ -18,7 +18,7 @@ class c_iter implements Iterator {
 		echo __METHOD__ . "\n";
 		$this->num = 0;
 	}
-	function hasMore() {
+	function valid() {
 		$more = $this->num < $this->obj->max;
 		echo __METHOD__ . ' = ' .($more ? 'true' : 'false') . "\n";
 		return $more;
@@ -75,43 +75,43 @@ print "Done\n";
 c::getIterator
 c_iter::__construct
 c_iter::rewind
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 c::getIterator
 c_iter::__construct
 c_iter::rewind
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 double:0:0
 c_iter::__destruct
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 c::getIterator
 c_iter::__construct
 c_iter::rewind
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 double:1:0
 c_iter::__destruct
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 c::getIterator
 c_iter::__construct
 c_iter::rewind
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c_iter::key
 double:2:0
 c_iter::__destruct
 c_iter::next
-c_iter::hasMore = false
+c_iter::valid = false
 c_iter::__destruct
 c::__destruct
 Done
diff --git a/tests/classes/iterators_003.phpt b/tests/classes/iterators_003.phpt
index dd27753ad0..d794782632 100755
--- a/tests/classes/iterators_003.phpt
+++ b/tests/classes/iterators_003.phpt
@@ -17,7 +17,7 @@ class c_iter implements Iterator {
 	function rewind() {
 		echo __METHOD__ . "\n";
 	}
-	function hasMore() {
+	function valid() {
 		$more = $this->num < $this->obj->max;
 		echo __METHOD__ . ' = ' .($more ? 'true' : 'false') . "\n";
 		return $more;
@@ -75,41 +75,41 @@ print "Done\n";
 c::getIterator
 c_iter::__construct
 c_iter::rewind
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 continue outer
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c::getIterator
 c_iter::__construct
 c_iter::rewind
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 double:1:0
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 continue inner
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 break inner
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 c::getIterator
 c_iter::__construct
 c_iter::rewind
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 double:2:0
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 continue inner
 c_iter::next
-c_iter::hasMore = true
+c_iter::valid = true
 c_iter::current
 break inner
 break outer
diff --git a/tests/classes/iterators_004.phpt b/tests/classes/iterators_004.phpt
index b67a1634e9..6555a656ab 100755
--- a/tests/classes/iterators_004.phpt
+++ b/tests/classes/iterators_004.phpt
@@ -31,7 +31,7 @@ class c2 {
 		echo __METHOD__ . "\n";
 		$this->num++;
 	}
-	function hasMore() {
+	function valid() {
 		echo __METHOD__ . "\n";
 		return $this->num < $this->max;
 	}
diff --git a/tests/classes/iterators_006.phpt b/tests/classes/iterators_006.phpt
index 5f85224b12..47fa69087a 100644
--- a/tests/classes/iterators_006.phpt
+++ b/tests/classes/iterators_006.phpt
@@ -18,7 +18,7 @@ class ai implements Iterator {
 		$this->next();
 	}
 
-	function hasMore() {
+	function valid() {
 		return $this->key !== NULL;
 	}
 
@@ -53,7 +53,7 @@ foreach ($array as $property => $value) {
 
 #$array = $array->getIterator();
 #$array->rewind();
-#$array->hasMore();
+#$array->valid();
 #var_dump($array->key());
 #var_dump($array->current());
 echo "===2nd===\n";