MFH: remove cloning under ze1_compatibility_mode

 - minor BC break but doesnt work right under compat mode anyways

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index dd353a4a07e50cef23a1a7ac321f3a9d64cd6318..45d45f863f462f52fa891bffebb9e26fdea93909 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1081,6 +1081,37 @@ static zend_object_handlers sxe_object_handlers = {
        NULL
 };
 
+static zend_object_handlers sxe_ze1_object_handlers = {
+       ZEND_OBJECTS_STORE_HANDLERS,
+       sxe_property_read,
+       sxe_property_write,
+       sxe_dimension_read,
+       sxe_dimension_write,
+       NULL,
+       sxe_get_value,                  /* get */
+       NULL,
+       sxe_property_exists,
+       sxe_property_delete,
+       sxe_dimension_exists,
+       sxe_dimension_delete,
+       sxe_properties_get,
+       NULL, /* zend_get_std_object_handlers()->get_method,*/
+       NULL, /* zend_get_std_object_handlers()->call_method,*/
+       NULL, /* zend_get_std_object_handlers()->get_constructor, */
+       NULL, /* zend_get_std_object_handlers()->get_class_entry,*/
+       NULL, /* zend_get_std_object_handlers()->get_class_name,*/
+       sxe_objects_compare,
+       sxe_object_cast,
+       NULL
+};
+
+static zend_object_value sxe_object_ze1_clone(zval *zobject TSRMLS_DC)
+{
+       php_error(E_ERROR, "Cannot clone object of class %s due to 'zend.ze1_compatibility_mode'", Z_OBJCE_P(zobject)->name);
+       /* Return zobject->value.obj just to satisfy compiler */
+       return zobject->value.obj;
+}
+
 /* {{{ sxe_object_clone()
  */
 static void
@@ -1186,7 +1217,11 @@ php_sxe_register_object(php_sxe_object *intern TSRMLS_DC)
        zend_object_value rv;
 
        rv.handle = zend_objects_store_put(intern, sxe_object_dtor, (zend_objects_free_object_storage_t)sxe_object_free_storage, sxe_object_clone TSRMLS_CC);
+       if (EG(ze1_compatibility_mode)) {
+               rv.handlers = (zend_object_handlers *) &sxe_ze1_object_handlers;
+       } else {
        rv.handlers = (zend_object_handlers *) &sxe_object_handlers;
+       }
 
        return rv;
 }
@@ -1630,6 +1665,12 @@ PHP_MINIT_FUNCTION(simplexml)
        sxe_object_handlers.get_class_entry = zend_get_std_object_handlers()->get_class_entry;
        sxe_object_handlers.get_class_name = zend_get_std_object_handlers()->get_class_name;
 
+       sxe_ze1_object_handlers.get_method = zend_get_std_object_handlers()->get_method;
+       sxe_ze1_object_handlers.get_constructor = zend_get_std_object_handlers()->get_constructor;
+       sxe_ze1_object_handlers.get_class_entry = zend_get_std_object_handlers()->get_class_entry;
+       sxe_ze1_object_handlers.get_class_name = zend_get_std_object_handlers()->get_class_name;
+       sxe_ze1_object_handlers.clone_obj = sxe_object_ze1_clone;
+
 #if HAVE_SPL && !defined(COMPILE_DL_SPL)
        if (zend_get_module_started("spl") == SUCCESS) {
                PHP_MINIT(spl_sxe)(INIT_FUNC_ARGS_PASSTHRU);