helly Thu Sep 18 12:26:30 2003 EDT
Added files:
/spl/tests .cvsignore
Modified files:
/spl php_spl.c spl_array.c spl_directory.c
/spl/tests array_iterator.phpt foreach.phpt foreach_break.phpt
foreach_continue.phpt forward.phpt sequence.phpt
Log:
Go with studlyCaps
Index: spl/php_spl.c
diff -u spl/php_spl.c:1.15 spl/php_spl.c:1.16
--- spl/php_spl.c:1.15 Thu Sep 4 10:44:53 2003
+++ spl/php_spl.c Thu Sep 18 12:26:28 2003
@@ -117,14 +117,14 @@
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}
};
Index: spl/spl_array.c
diff -u spl/spl_array.c:1.20 spl/spl_array.c:1.21
--- spl/spl_array.c:1.20 Thu Sep 4 10:44:53 2003
+++ spl/spl_array.c Thu Sep 18 12:26:28 2003
@@ -301,12 +301,12 @@
/* }}} */
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 @@
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 @@
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 @@
/* {{{ 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 @@
/* {{{ 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);
Index: spl/spl_directory.c
diff -u spl/spl_directory.c:1.9 spl/spl_directory.c:1.10
--- spl/spl_directory.c:1.9 Thu Sep 4 10:44:53 2003
+++ spl/spl_directory.c Thu Sep 18 12:26:28 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.9 2003/09/04 14:44:53 helly Exp $ */
+/* $Id: spl_directory.c,v 1.10 2003/09/18 16:26:28 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -40,8 +40,8 @@
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 @@
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 @@
/* {{{ 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 @@
/* {{{ 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);
Index: spl/tests/array_iterator.phpt
diff -u spl/tests/array_iterator.phpt:1.2 spl/tests/array_iterator.phpt:1.3
--- spl/tests/array_iterator.phpt:1.2 Thu Sep 4 10:44:55 2003
+++ spl/tests/array_iterator.phpt Thu Sep 18 12:26:29 2003
@@ -130,9 +130,9 @@
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
Index: spl/tests/foreach.phpt
diff -u spl/tests/foreach.phpt:1.5 spl/tests/foreach.phpt:1.6
--- spl/tests/foreach.phpt:1.5 Thu Sep 4 10:44:55 2003
+++ spl/tests/foreach.phpt Thu Sep 18 12:26:29 2003
@@ -76,127 +76,127 @@
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
Index: spl/tests/foreach_break.phpt
diff -u spl/tests/foreach_break.phpt:1.4 spl/tests/foreach_break.phpt:1.5
--- spl/tests/foreach_break.phpt:1.4 Thu Sep 4 10:44:55 2003
+++ spl/tests/foreach_break.phpt Thu Sep 18 12:26:29 2003
@@ -58,33 +58,33 @@
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
Index: spl/tests/foreach_continue.phpt
diff -u spl/tests/foreach_continue.phpt:1.2 spl/tests/foreach_continue.phpt:1.3
--- spl/tests/foreach_continue.phpt:1.2 Thu Sep 4 10:44:55 2003
+++ spl/tests/foreach_continue.phpt Thu Sep 18 12:26:29 2003
@@ -64,38 +64,38 @@
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
Index: spl/tests/forward.phpt
diff -u spl/tests/forward.phpt:1.6 spl/tests/forward.phpt:1.7
--- spl/tests/forward.phpt:1.6 Thu Sep 4 10:44:55 2003
+++ spl/tests/forward.phpt Thu Sep 18 12:26:29 2003
@@ -86,51 +86,51 @@
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
Index: spl/tests/sequence.phpt
diff -u spl/tests/sequence.phpt:1.5 spl/tests/sequence.phpt:1.6
--- spl/tests/sequence.phpt:1.5 Thu Sep 4 10:44:55 2003
+++ spl/tests/sequence.phpt Thu Sep 18 12:26:29 2003
@@ -67,7 +67,7 @@
print "Done\n";
?>
--EXPECT--
-c::newiterator
+c::newIterator
Array
(
[c] => Array
@@ -102,37 +102,37 @@
)
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
Index: spl/tests/.cvsignore
+++ spl/tests/.cvsignore
phpt.*
*.diff
*.log
*.exp
*.out
*.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
