Rename ArrayClass to ArrayObject

diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index c5941d7c07545ddcf88fbf22f5c317041d3b74e6..3f179dc9f7f371f7fd627133cc91c5d0b5ac00a9 100755 (executable)
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -211,7 +211,7 @@ PHP_FUNCTION(spl_classes)
        array_init(return_value);
 
        SPL_ADD_CLASS(ArrayAccess);
-       SPL_ADD_CLASS(ArrayClass);
+       SPL_ADD_CLASS(ArrayObject);
        SPL_ADD_CLASS(ArrayIterator);
        SPL_ADD_CLASS(ArrayRead);
        SPL_ADD_CLASS(DirectoryIterator);

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 2529d450758c69f00447c47e7d99803a44bdf99e..9c1a6cd3345920db29c69cd149cf4a96699e297b 100755 (executable)
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -67,7 +67,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_array___construct, 0)
        ZEND_ARG_INFO(0, array)
 ZEND_END_ARG_INFO();
 
-static zend_function_entry spl_funcs_ArrayClass[] = {
+static zend_function_entry spl_funcs_ArrayObject[] = {
        SPL_ME(Array, __construct,   arginfo_array___construct, ZEND_ACC_PUBLIC)
        SPL_ME(Array, getIterator,   NULL, ZEND_ACC_PUBLIC)
        {NULL, NULL, NULL}
@@ -86,8 +86,8 @@ static zend_function_entry spl_funcs_ArrayIterator[] = {
 zend_class_entry *   spl_ce_ArrayRead;
 zend_class_entry *   spl_ce_ArrayAccess;
 
-zend_object_handlers spl_handler_ArrayClass;
-zend_class_entry *   spl_ce_ArrayClass;
+zend_object_handlers spl_handler_ArrayObject;
+zend_class_entry *   spl_ce_ArrayObject;
 
 zend_object_handlers spl_handler_ArrayIterator;
 zend_class_entry *   spl_ce_ArrayIterator;
@@ -141,7 +141,7 @@ static zend_object_value spl_array_object_new_ex(zend_class_entry *class_type, s
        if (class_type == spl_ce_ArrayIterator) {
                retval.handlers = &spl_handler_ArrayIterator;
        } else {
-               retval.handlers = &spl_handler_ArrayClass;
+               retval.handlers = &spl_handler_ArrayObject;
        }
        return retval;
 }
@@ -315,19 +315,19 @@ PHP_MINIT_FUNCTION(spl_array)
        REGISTER_SPL_INTERFACE(ArrayAccess);
        zend_class_implements(spl_ce_ArrayAccess TSRMLS_CC, 1, spl_ce_ArrayRead);
 
-       REGISTER_SPL_STD_CLASS_EX(ArrayClass, spl_array_object_new, spl_funcs_ArrayClass);
-       zend_class_implements(spl_ce_ArrayClass TSRMLS_CC, 1, zend_ce_aggregate);
-       memcpy(&spl_handler_ArrayClass, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
-       spl_handler_ArrayClass.clone_obj = spl_array_object_clone;
-       spl_handler_ArrayClass.read_dimension = spl_array_read_dimension;
-       spl_handler_ArrayClass.write_dimension = spl_array_write_dimension;
-       spl_handler_ArrayClass.unset_dimension = spl_array_unset_dimension;
-       spl_handler_ArrayClass.has_dimension = spl_array_has_dimension;
-       spl_handler_ArrayClass.get_properties = spl_array_get_properties;
+       REGISTER_SPL_STD_CLASS_EX(ArrayObject, spl_array_object_new, spl_funcs_ArrayObject);
+       zend_class_implements(spl_ce_ArrayObject TSRMLS_CC, 1, zend_ce_aggregate);
+       memcpy(&spl_handler_ArrayObject, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       spl_handler_ArrayObject.clone_obj = spl_array_object_clone;
+       spl_handler_ArrayObject.read_dimension = spl_array_read_dimension;
+       spl_handler_ArrayObject.write_dimension = spl_array_write_dimension;
+       spl_handler_ArrayObject.unset_dimension = spl_array_unset_dimension;
+       spl_handler_ArrayObject.has_dimension = spl_array_has_dimension;
+       spl_handler_ArrayObject.get_properties = spl_array_get_properties;
 
        REGISTER_SPL_STD_CLASS_EX(ArrayIterator, spl_array_object_new, spl_funcs_ArrayIterator);
        zend_class_implements(spl_ce_ArrayIterator TSRMLS_CC, 1, zend_ce_iterator);
-       memcpy(&spl_handler_ArrayIterator, &spl_handler_ArrayClass, sizeof(zend_object_handlers));
+       memcpy(&spl_handler_ArrayIterator, &spl_handler_ArrayObject, sizeof(zend_object_handlers));
 
        return SUCCESS;
 }
@@ -368,8 +368,8 @@ SPL_METHOD(Array, __construct)
 }
 /* }}} */
 
-/* {{{ proto spl_array_it|NULL ArrayClass::getIterator()
-   Create a new iterator from a ArrayClass instance */
+/* {{{ proto spl_array_it|NULL ArrayObject::getIterator()
+   Create a new iterator from a ArrayObject instance */
 SPL_METHOD(Array, getIterator)
 {
        zval *object = getThis();

diff --git a/ext/spl/spl_array.h b/ext/spl/spl_array.h
index d4bc03d87657617883cc7f1b63f00df5cacd69d3..cbc8397f0f2ed4df67b8efc1e4ead03d8104c3ff 100755 (executable)
--- a/ext/spl/spl_array.h
+++ b/ext/spl/spl_array.h
@@ -24,7 +24,7 @@
 
 extern zend_class_entry *spl_ce_ArrayRead;
 extern zend_class_entry *spl_ce_ArrayAccess;
-extern zend_class_entry *spl_ce_ArrayClass;
+extern zend_class_entry *spl_ce_ArrayObject;
 extern zend_class_entry *spl_ce_ArrayIterator;
 
 PHP_MINIT_FUNCTION(spl_array);

diff --git a/ext/spl/tests/array.phpt b/ext/spl/tests/array.phpt
index 1474564dc05184ae039ace52a499f5b835608ab1..fcaaa65ee583221f23a3f09b3f099615a6b22fc9 100755 (executable)
--- a/ext/spl/tests/array.phpt
+++ b/ext/spl/tests/array.phpt
@@ -6,7 +6,7 @@ SPL: array
 <?php
 
 $ar = array(0=>0, 1=>1);
-$ar = new spl_array($ar);
+$ar = new ArrayObject($ar);
 
 var_dump($ar);
 
@@ -33,7 +33,7 @@ var_dump($ar);
 echo "Done\n";
 ?>
 --EXPECTF--
-object(spl_array)#1 (2) {
+object(ArrayObject)#1 (2) {
   [0]=>
   int(0)
   [1]=>
@@ -56,7 +56,7 @@ array(6) {
   int(5)
 }
 string(1) "a"
-object(spl_array)#1 (5) {
+object(ArrayObject)#1 (5) {
   [0]=>
   int(0)
   [1]=>
@@ -79,7 +79,7 @@ NULL
 Notice: Undefined offset:  7 in %sarray.php on line %d
 
 Notice: Undefined index:  c in %sarray.php on line %d
-object(spl_array)#1 (2) {
+object(ArrayObject)#1 (2) {
   [0]=>
   int(0)
   [2]=>

diff --git a/ext/spl/tests/array_access_001.phpt b/ext/spl/tests/array_access_001.phpt
index 2292749db2f565957b78fdb2b723343e524748a4..2c81204f54625d83f5a08ace98bc9307f683ca92 100755 (executable)
--- a/ext/spl/tests/array_access_001.phpt
+++ b/ext/spl/tests/array_access_001.phpt
@@ -3,11 +3,11 @@ SPL: array_access
 --SKIPIF--
 <?php
        if (!extension_loaded("spl")) die("skip");
-       if (!in_array("spl_array_access", spl_classes())) die("skip spl_array_access not present");
+       if (!in_array("ArrayAccess", spl_classes())) die("skip spl_array_access not present");
 ?>
 --FILE--
 <?php
-class c implements spl_array_access {
+class c implements ArrayAccess {
 
        public $a = array('1st', 1, 2=>'3rd', '4th'=>4);
        function exists($index) {