Remove interfaces implemented in engine now

diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index 3f179dc9f7f371f7fd627133cc91c5d0b5ac00a9..3ed11067cd72011e3b8c2762913d247d4ca42820 100755 (executable)
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -210,10 +210,8 @@ PHP_FUNCTION(spl_classes)
 {
        array_init(return_value);
 
-       SPL_ADD_CLASS(ArrayAccess);
        SPL_ADD_CLASS(ArrayObject);
        SPL_ADD_CLASS(ArrayIterator);
-       SPL_ADD_CLASS(ArrayRead);
        SPL_ADD_CLASS(DirectoryIterator);
        SPL_ADD_CLASS(RecursiveIterator);
        SPL_ADD_CLASS(RecursiveIteratorIterator);

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index cdd67ae16b50a711cfd24c79f238d37fe3abd85b..9ae571c47700b06fae6703ac11ebaceab9c66628 100755 (executable)
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -31,29 +31,6 @@
 #include "spl_array.h"
 
 
-static
-ZEND_BEGIN_ARG_INFO(arginfo_one_param, 0)
-       ZEND_ARG_INFO(0, index)
-ZEND_END_ARG_INFO();
-
-static
-ZEND_BEGIN_ARG_INFO(arginfo_two_params, 0)
-       ZEND_ARG_INFO(0, index)
-       ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO();
-
-function_entry spl_funcs_ArrayRead[] = {
-       SPL_ABSTRACT_ME(ArrayRead, get,     arginfo_one_param)
-       SPL_ABSTRACT_ME(ArrayRead, exists,  arginfo_one_param)
-       {NULL, NULL, NULL}
-};
-
-function_entry spl_funcs_ArrayAccess[] = {
-       SPL_ABSTRACT_ME(ArrayAccess, set,  arginfo_two_params)
-       SPL_ABSTRACT_ME(ArrayAccess, del,  arginfo_one_param)
-       {NULL, NULL, NULL}
-};
-
 SPL_METHOD(Array, __construct);
 SPL_METHOD(Array, getIterator);
 SPL_METHOD(Array, rewind);
@@ -83,8 +60,6 @@ static zend_function_entry spl_funcs_ArrayIterator[] = {
        {NULL, NULL, NULL}
 };
 
-zend_class_entry *   spl_ce_ArrayRead;
-zend_class_entry *   spl_ce_ArrayAccess;
 
 zend_object_handlers spl_handler_ArrayObject;
 zend_class_entry *   spl_ce_ArrayObject;
@@ -310,13 +285,6 @@ static HashTable *spl_array_get_properties(zval *object TSRMLS_DC)
 /* {{{ PHP_MINIT_FUNCTION(spl_array) */
 PHP_MINIT_FUNCTION(spl_array)
 {
-#if MBO_0
-       REGISTER_SPL_INTERFACE(ArrayRead);
-
-       REGISTER_SPL_INTERFACE(ArrayAccess);
-       zend_class_implements(spl_ce_ArrayAccess TSRMLS_CC, 1, spl_ce_ArrayRead);
-#endif
-
        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));

diff --git a/ext/spl/spl_array.h b/ext/spl/spl_array.h
index cbc8397f0f2ed4df67b8efc1e4ead03d8104c3ff..06bba29459a90f4dde48e2bb5e5d7b2b6844cf0b 100755 (executable)
--- a/ext/spl/spl_array.h
+++ b/ext/spl/spl_array.h
@@ -22,8 +22,6 @@
 #include "php.h"
 #include "php_spl.h"
 
-extern zend_class_entry *spl_ce_ArrayRead;
-extern zend_class_entry *spl_ce_ArrayAccess;
 extern zend_class_entry *spl_ce_ArrayObject;
 extern zend_class_entry *spl_ce_ArrayIterator;