Go with studlyCaps

9 files changed, 94 insertions, 94 deletions

diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index 1eef9e085a..7617f3fa9e 100755
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -117,14 +117,14 @@ ZEND_BEGIN_ARG_INFO(arginfo_two_params, 0)
 ZEND_END_ARG_INFO();
 
 function_entry spl_funcs_iterator[] = {
-	SPL_ABSTRACT_FE(iterator, newiterator, NULL)
+	SPL_ABSTRACT_FE(iterator, newIterator, NULL)
 	{NULL, NULL, NULL}
 };
 
 function_entry spl_funcs_forward[] = {
 	SPL_ABSTRACT_FE(forward, current,  NULL)
 	SPL_ABSTRACT_FE(forward, next,     NULL)
-	SPL_ABSTRACT_FE(forward, hasmore,  NULL)
+	SPL_ABSTRACT_FE(forward, hasMore,  NULL)
 	{NULL, NULL, NULL}
 };
 
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index e052c503e1..95132cb6c2 100755
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -301,12 +301,12 @@ ZEND_EXECUTE_HOOK_FUNCTION(ZEND_UNSET_DIM_OBJ)
 /* }}} */
 
 SPL_CLASS_FUNCTION(array, __construct);
-SPL_CLASS_FUNCTION(array, newiterator);
+SPL_CLASS_FUNCTION(array, newIterator);
 SPL_CLASS_FUNCTION(array, rewind);
 SPL_CLASS_FUNCTION(array, current);
 SPL_CLASS_FUNCTION(array, key);
 SPL_CLASS_FUNCTION(array, next);
-SPL_CLASS_FUNCTION(array, hasmore);
+SPL_CLASS_FUNCTION(array, hasMore);
 
 static
 ZEND_BEGIN_ARG_INFO(arginfo_array___construct, 0)
@@ -315,7 +315,7 @@ ZEND_END_ARG_INFO();
 
 static zend_function_entry spl_array_class_functions[] = {
 	SPL_CLASS_FE(array, __construct,   arginfo_array___construct, ZEND_ACC_PUBLIC)
-	SPL_CLASS_FE(array, newiterator,   NULL, ZEND_ACC_PUBLIC)
+	SPL_CLASS_FE(array, newIterator,   NULL, ZEND_ACC_PUBLIC)
 	{NULL, NULL, NULL}
 };
 
@@ -325,7 +325,7 @@ static zend_function_entry spl_array_it_class_functions[] = {
 	SPL_CLASS_FE(array, current,       NULL, ZEND_ACC_PUBLIC)
 	SPL_CLASS_FE(array, key,           NULL, ZEND_ACC_PUBLIC)
 	SPL_CLASS_FE(array, next,          NULL, ZEND_ACC_PUBLIC)
-	SPL_CLASS_FE(array, hasmore,       NULL, ZEND_ACC_PUBLIC)
+	SPL_CLASS_FE(array, hasMore,       NULL, ZEND_ACC_PUBLIC)
 	{NULL, NULL, NULL}
 };
 
@@ -600,7 +600,7 @@ SPL_CLASS_FUNCTION(array, __construct)
 
 /* {{{ proto spl_array_it|NULL spl_array::newIterator()
    Create a new iterator from a spl_array instance */
-SPL_CLASS_FUNCTION(array, newiterator)
+SPL_CLASS_FUNCTION(array, newIterator)
 {
 	zval *object = getThis();
 	spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
@@ -742,7 +742,7 @@ SPL_CLASS_FUNCTION(array, next)
 
 /* {{{ proto bool spl_array_it::hasMore()
    Check whether array contains more entries */
-SPL_CLASS_FUNCTION(array, hasmore)
+SPL_CLASS_FUNCTION(array, hasMore)
 {
 	zval *object = getThis();
 	spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index a698d36a2e..045e5d4368 100755
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -40,8 +40,8 @@ SPL_CLASS_FUNCTION(dir, __construct);
 SPL_CLASS_FUNCTION(dir, rewind);
 SPL_CLASS_FUNCTION(dir, current);
 SPL_CLASS_FUNCTION(dir, next);
-SPL_CLASS_FUNCTION(dir, hasmore);
-SPL_CLASS_FUNCTION(dir, getpath);
+SPL_CLASS_FUNCTION(dir, hasMore);
+SPL_CLASS_FUNCTION(dir, getPath);
 
 static
 ZEND_BEGIN_ARG_INFO(arginfo_dir___construct, 0)
@@ -53,8 +53,8 @@ static zend_function_entry spl_dir_class_functions[] = {
 	SPL_CLASS_FE(dir, rewind,        NULL, ZEND_ACC_PUBLIC)
 	SPL_CLASS_FE(dir, current,       NULL, ZEND_ACC_PUBLIC)
 	SPL_CLASS_FE(dir, next,          NULL, ZEND_ACC_PUBLIC)
-	SPL_CLASS_FE(dir, hasmore,       NULL, ZEND_ACC_PUBLIC)
-	SPL_CLASS_FE(dir, getpath,       NULL, ZEND_ACC_PUBLIC)
+	SPL_CLASS_FE(dir, hasMore,       NULL, ZEND_ACC_PUBLIC)
+	SPL_CLASS_FE(dir, getPath,       NULL, ZEND_ACC_PUBLIC)
 	{NULL, NULL, NULL}
 };
 
@@ -245,7 +245,7 @@ SPL_CLASS_FUNCTION(dir, next)
 
 /* {{{ proto string hasMore()
    Check whether dir contains more entries */
-SPL_CLASS_FUNCTION(dir, hasmore)
+SPL_CLASS_FUNCTION(dir, hasMore)
 {
 	zval *object = getThis();
 	spl_dir_object *intern = (spl_dir_object*)zend_object_store_get_object(object TSRMLS_CC);
@@ -256,7 +256,7 @@ SPL_CLASS_FUNCTION(dir, hasmore)
 
 /* {{{ proto string getPath()
    Return directory path */
-SPL_CLASS_FUNCTION(dir, getpath)
+SPL_CLASS_FUNCTION(dir, getPath)
 {
 	zval *object = getThis();
 	spl_dir_object *intern = (spl_dir_object*)zend_object_store_get_object(object TSRMLS_CC);
diff --git a/ext/spl/tests/array_iterator.phpt b/ext/spl/tests/array_iterator.phpt
index 167498a19d..751e623d1c 100755
--- a/ext/spl/tests/array_iterator.phpt
+++ b/ext/spl/tests/array_iterator.phpt
@@ -130,9 +130,9 @@ Notice: spl_array_it::next(): Array was modified outside object and internal pos
 
 Notice: spl_array_it::next(): Array was modified outside object and is no longer an array in %sarray_iterator.php on line %d
 
-Notice: spl_array_it::hasmore(): Array was modified outside object and is no longer an array in %sarray_iterator.php on line %d
+Notice: spl_array_it::hasMore(): Array was modified outside object and is no longer an array in %sarray_iterator.php on line %d
 
 Notice: spl_array_it::next(): Array was modified outside object and is no longer an array in %sarray_iterator.php on line %d
 
-Notice: spl_array_it::hasmore(): Array was modified outside object and is no longer an array in %sarray_iterator.php on line %d
+Notice: spl_array_it::hasMore(): Array was modified outside object and is no longer an array in %sarray_iterator.php on line %d
 Done
diff --git a/ext/spl/tests/foreach.phpt b/ext/spl/tests/foreach.phpt
index c6b8b1c4ec..0a4cd91fb7 100755
--- a/ext/spl/tests/foreach.phpt
+++ b/ext/spl/tests/foreach.phpt
@@ -76,127 +76,127 @@ foreach($t as $i => $v) {
 print "Done\n";
 ?>
 --EXPECT--
-c::newiterator
+c::newIterator
 c_iter::__construct
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 0
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 1
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 2
 c_iter::next
-c_iter::hasmore = false
+c_iter::hasMore = false
 array:0
 array:1
 array:2
-c::newiterator
+c::newIterator
 c_iter::__construct
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 object:0
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 object:1
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 object:2
 c_iter::next
-c_iter::hasmore = false
-c::newiterator
+c_iter::hasMore = false
+c::newIterator
 c_iter::__construct
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
-c::newiterator
+c::newIterator
 c_iter::__construct
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 double:0:0
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 double:0:1
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 double:0:2
 c_iter::next
-c_iter::hasmore = false
+c_iter::hasMore = false
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
-c::newiterator
+c::newIterator
 c_iter::__construct
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 double:1:0
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 double:1:1
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 double:1:2
 c_iter::next
-c_iter::hasmore = false
+c_iter::hasMore = false
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
-c::newiterator
+c::newIterator
 c_iter::__construct
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 double:2:0
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 double:2:1
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 double:2:2
 c_iter::next
-c_iter::hasmore = false
+c_iter::hasMore = false
 c_iter::next
-c_iter::hasmore = false
-c::newiterator
+c_iter::hasMore = false
+c::newIterator
 c_iter::__construct
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 object:1st=>0
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 object:2nd=>1
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 object:3rd=>2
 c_iter::next
-c_iter::hasmore = false
+c_iter::hasMore = false
 Done
diff --git a/ext/spl/tests/foreach_break.phpt b/ext/spl/tests/foreach_break.phpt
index 82fdc03527..184b762b84 100755
--- a/ext/spl/tests/foreach_break.phpt
+++ b/ext/spl/tests/foreach_break.phpt
@@ -58,33 +58,33 @@ foreach($t as $v) {
 print "Done\n";
 ?>
 --EXPECT--
-c::newiterator
-c_iter::hasmore = true
+c::newIterator
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
-c::newiterator
-c_iter::hasmore = true
+c::newIterator
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 double:0:0
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
-c::newiterator
-c_iter::hasmore = true
+c::newIterator
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 double:1:0
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
-c::newiterator
-c_iter::hasmore = true
+c::newIterator
+c_iter::hasMore = true
 c_iter::current
 c_iter::key
 double:2:0
 c_iter::next
-c_iter::hasmore = false
+c_iter::hasMore = false
 Done
diff --git a/ext/spl/tests/foreach_continue.phpt b/ext/spl/tests/foreach_continue.phpt
index 760460d2f4..289f67e0a6 100755
--- a/ext/spl/tests/foreach_continue.phpt
+++ b/ext/spl/tests/foreach_continue.phpt
@@ -64,38 +64,38 @@ foreach($t as $v) {
 print "Done\n";
 ?>
 --EXPECT--
-c::newiterator
-c_iter::hasmore = true
+c::newIterator
+c_iter::hasMore = true
 c_iter::current
 continue outer
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
-c::newiterator
-c_iter::hasmore = true
+c::newIterator
+c_iter::hasMore = true
 c_iter::current
 double:1:0
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 continue inner
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 break inner
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
-c::newiterator
-c_iter::hasmore = true
+c::newIterator
+c_iter::hasMore = true
 c_iter::current
 double:2:0
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 continue inner
 c_iter::next
-c_iter::hasmore = true
+c_iter::hasMore = true
 c_iter::current
 break inner
 break outer
diff --git a/ext/spl/tests/forward.phpt b/ext/spl/tests/forward.phpt
index 6acb697f89..cdf7c304b4 100755
--- a/ext/spl/tests/forward.phpt
+++ b/ext/spl/tests/forward.phpt
@@ -86,51 +86,51 @@ Array
 Array
 (
     [0] => current
-    [1] => hasmore
+    [1] => hasMore
     [2] => key
     [3] => next
 )
 Array
 (
     [0] => current
-    [1] => hasmore
+    [1] => hasMore
     [2] => key
     [3] => next
 )
 1st try
-c::hasmore
+c::hasMore
 c::current
 c::key
 object:0
 c::next
-c::hasmore
+c::hasMore
 c::current
 c::key
 object:1
 c::next
-c::hasmore
+c::hasMore
 c::current
 c::key
 object:2
 c::next
-c::hasmore
+c::hasMore
 2nd try
-c::hasmore
+c::hasMore
 3rd try
-c::hasmore
+c::hasMore
 c::current
 c::key
 object:1st=>0
 c::next
-c::hasmore
+c::hasMore
 c::current
 c::key
 object:2nd=>1
 c::next
-c::hasmore
+c::hasMore
 c::current
 c::key
 object:3rd=>2
 c::next
-c::hasmore
+c::hasMore
 Done
diff --git a/ext/spl/tests/sequence.phpt b/ext/spl/tests/sequence.phpt
index e6d9da2e12..0d0c030ac4 100755
--- a/ext/spl/tests/sequence.phpt
+++ b/ext/spl/tests/sequence.phpt
@@ -67,7 +67,7 @@ foreach($i as $v => $w) {
 print "Done\n";
 ?>
 --EXPECT--
-c::newiterator
+c::newIterator
 Array
 (
     [c] => Array
@@ -102,37 +102,37 @@ Array
 
 )
 c_iter::rewind
-c_iter::hasmore
+c_iter::hasMore
 c_iter::current
 c_iter::key
 object:0
 c_iter::next
-c_iter::hasmore
+c_iter::hasMore
 c_iter::current
 c_iter::key
 object:1
 c_iter::next
-c_iter::hasmore
+c_iter::hasMore
 c_iter::current
 c_iter::key
 object:2
 c_iter::next
-c_iter::hasmore
+c_iter::hasMore
 c_iter::rewind
-c_iter::hasmore
+c_iter::hasMore
 c_iter::current
 c_iter::key
 object:1st=>0
 c_iter::next
-c_iter::hasmore
+c_iter::hasMore
 c_iter::current
 c_iter::key
 object:2nd=>1
 c_iter::next
-c_iter::hasmore
+c_iter::hasMore
 c_iter::current
 c_iter::key
 object:3rd=>2
 c_iter::next
-c_iter::hasmore
+c_iter::hasMore
 Done
\ No newline at end of file