Revert "Fix zend_test interned strings loaded via dl()"

This reverts commit 7435ab3375ad1ef313e13ac3b0658c948f2f4dac.

It looks like we can't access EG(current_module) here in ZTS builds.
As the problematic asserts have now been disabled outside RC_DEBUG,
I'm just reverting this commit and leaving things as they were.

diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c
index d7ba96ad985e580b018e223f4e91e7811bbc7136..53af862d244925dab1aa43b1502d8648639777f1 100644 (file)
--- a/ext/zend_test/test.c
+++ b/ext/zend_test/test.c
@@ -192,7 +192,6 @@ static const zend_function_entry zend_test_trait_methods[] = {
 PHP_MINIT_FUNCTION(zend_test)
 {
        zend_class_entry class_entry;
-       zend_bool persistent_str = EG(current_module)->type == MODULE_PERSISTENT;
 
        INIT_CLASS_ENTRY(class_entry, "_ZendTestInterface", NULL);
        zend_test_interface = zend_register_internal_interface(&class_entry);
@@ -206,7 +205,7 @@ PHP_MINIT_FUNCTION(zend_test)
        zend_declare_property_null(zend_test_class, "_StaticProp", sizeof("_StaticProp") - 1, ZEND_ACC_STATIC);
 
        {
-               zend_string *name = zend_string_init("intProp", sizeof("intProp") - 1, persistent_str);
+               zend_string *name = zend_string_init("intProp", sizeof("intProp") - 1, 1);
                zval val;
                ZVAL_LONG(&val, 123);
                zend_declare_typed_property(
@@ -215,7 +214,7 @@ PHP_MINIT_FUNCTION(zend_test)
        }
 
        {
-               zend_string *name = zend_string_init("classProp", sizeof("classProp") - 1, persistent_str);
+               zend_string *name = zend_string_init("classProp", sizeof("classProp") - 1, 1);
                zend_string *class_name = zend_string_init("stdClass", sizeof("stdClass") - 1, 1);
                zval val;
                ZVAL_NULL(&val);
@@ -226,7 +225,7 @@ PHP_MINIT_FUNCTION(zend_test)
        }
 
        {
-               zend_string *name = zend_string_init("staticIntProp", sizeof("staticIntProp") - 1, persistent_str);
+               zend_string *name = zend_string_init("staticIntProp", sizeof("staticIntProp") - 1, 1);
                zval val;
                ZVAL_LONG(&val, 123);
                zend_declare_typed_property(