Merge pull request #19 from pinepain/drop_php_7.0.2_support

Drop php 7.0.2 support

Author: pinepain

README.md

@@ -9,6 +9,8 @@ This extension adds [Soft Reference](https://en.wikipedia.org/wiki/Soft_referenc
 data structures that require advanced referencing model.
 
 
+**PHP >= 7.0.3 required**
+
 ## Usage
 
 ```php

appveyor.yml

@@ -4,10 +4,15 @@ platform:
 
 environment:
   matrix:
-    - PHP_VERSION: 7.0.11
+    - PHP_VERSION: 7.0.15
       THREAD_SAFE: true
-    - PHP_VERSION: 7.0.0
+    - PHP_VERSION: 7.0.15
       THREAD_SAFE: false
+    - PHP_VERSION: 7.1.1
+      THREAD_SAFE: true
+    - PHP_VERSION: 7.1.1
+      THREAD_SAFE: false
+
 
   PHP_SDK: c:\projects\php-sdk
 

config.m4

@@ -7,6 +7,18 @@ dnl Make sure that the comment is aligned:
 
 if test "$PHP_REF" != "no"; then
 
+  AC_MSG_CHECKING([Check for supported PHP versions])
+  PHP_REF_FOUND_VERSION=`${PHP_CONFIG} --version`
+  PHP_REF_FOUND_VERNUM=`echo "${PHP_REF_FOUND_VERSION}" | $AWK 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 100 + [$]2) * 100 + [$]3;}'`
+  
+  if test "$PHP_REF_FOUND_VERNUM" -lt "70003"; then
+    AC_MSG_ERROR([not supported. Need a PHP version >= 7.0.3 (found $PHP_REF_FOUND_VERSION)])
+  else
+    AC_MSG_RESULT([supported ($PHP_REF_FOUND_VERSION)])
+  fi
+
+    echo "$PHP_VERSION_ID"
+
     if test -z "$TRAVIS" ; then
         type git &>/dev/null
 

package.xml

@@ -155,7 +155,7 @@
     <dependencies>
         <required>
             <php>
-                <min>7.0</min>
+                <min>7.0.3</min>
             </php>
             <pearinstaller>
                 <min>1.4.0</min>

php_ref.h

@@ -26,8 +26,9 @@ extern zend_module_entry php_ref_module_entry;
 #define PHP_REF_REVISION "dev"
 #endif
 
-#if PHP_VERSION_ID <= 70002
-#define PHP_REF_PATCH_SPL_OBJECT_HASH
+#if PHP_VERSION_ID < 70003
+// should never get her, but just in case
+#error PHP >= 7.0.3 required
 #endif
 
 #define PHP_REF_NS "Ref"
@@ -46,9 +47,6 @@ extern zend_module_entry php_ref_module_entry;
 
 ZEND_BEGIN_MODULE_GLOBALS(ref)
     HashTable *referents;
-#ifdef PHP_REF_PATCH_SPL_OBJECT_HASH
-    zend_bool spl_hash_replaced;
-#endif
 ZEND_END_MODULE_GLOBALS(ref)
 
 ZEND_EXTERN_MODULE_GLOBALS(ref);

php_ref_reference.c

@@ -16,10 +16,6 @@
 #include "zend_exceptions.h"
 #include "zend_interfaces.h"
 
-#ifdef PHP_REF_PATCH_SPL_OBJECT_HASH
-#include "ext/spl/spl_observer.h"
-#endif
-
 zend_class_entry *php_ref_abstract_reference_class_entry;
 zend_class_entry *php_ref_soft_reference_class_entry;
 zend_class_entry *php_ref_weak_reference_class_entry;
@@ -28,10 +24,6 @@ zend_class_entry *php_ref_weak_reference_class_entry;
 
 zend_object_handlers php_ref_reference_object_handlers;
 
-#ifdef PHP_REF_PATCH_SPL_OBJECT_HASH
-static zend_object_get_debug_info_t spl_object_storage_get_debug_info_orig_handler;
-#endif
-
 php_ref_reference_t *php_ref_reference_init(zval *this_ptr, zval *referent_zv, zval *notifier_zv);
 
 static inline void php_ref_store_exceptions(zval *exceptions, zval *tmp);
@@ -52,110 +44,6 @@ php_ref_referent_t *php_ref_referent_find_ptr(zend_ulong h) /* {{{ */
     return (php_ref_referent_t *) zend_hash_index_find_ptr(PHP_REF_G(referents), h);
 } /* }}} */
 
-#ifdef PHP_REF_PATCH_SPL_OBJECT_HASH
-static HashTable* spl_object_storage_debug_info(zval *obj, int *is_temp) /* {{{ */
-{
-    HashTable* debug_info;
-    zend_string *md5str;
-    zend_string *zname;
-    zval *val;
-    zval *val_obj;
-
-    zval tmp_storage;
-
-    zname = zend_mangle_property_name(ZSTR_VAL(spl_ce_SplObjectStorage->name), ZSTR_LEN(spl_ce_SplObjectStorage->name), "storage", sizeof("storage")-1, 0);
-
-    debug_info = spl_object_storage_get_debug_info_orig_handler(obj, is_temp);
-
-    zval *storage = zend_hash_find(debug_info, zname);
-
-    assert(NULL != storage);
-    array_init(&tmp_storage);
-
-    ZEND_HASH_FOREACH_VAL(Z_ARR_P(storage), val) {
-        val_obj = zend_hash_str_find(Z_ARR_P(val), "obj", sizeof("obj") - 1);
-        assert(NULL != val_obj);
-
-        php_ref_referent_t *referent = php_ref_referent_find_ptr((zend_ulong)Z_OBJ_HANDLE_P(val_obj));
-
-        if (NULL != referent) {
-            Z_OBJ_P(val_obj)->handlers = referent->original_handlers;
-            md5str = php_spl_object_hash(val_obj);
-            Z_OBJ_P(val_obj)->handlers = &referent->custom_handlers;
-        } else {
-            md5str = php_spl_object_hash(val_obj);
-        }
-
-        zend_hash_update(Z_ARRVAL(tmp_storage), md5str, val);
-        zval_add_ref(val);
-        zend_string_release(md5str);
-    } ZEND_HASH_FOREACH_END();
-
-    zend_symtable_update(debug_info, zname, &tmp_storage);
-    zend_string_release(zname);
-
-    return debug_info;
-} /* }}} */
-#endif
-
-#ifdef PHP_REF_PATCH_SPL_OBJECT_HASH
-static PHP_FUNCTION(spl_object_hash_patched)
-{
-    zval *obj;
-    zend_string *hash = NULL;
-
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &obj) == FAILURE) {
-        return;
-    }
-
-    php_ref_referent_t *referent = php_ref_referent_find_ptr((zend_ulong)Z_OBJ_HANDLE_P(obj));
-
-    if (NULL != referent) {
-        Z_OBJ_P(obj)->handlers = referent->original_handlers;
-        hash = php_spl_object_hash(obj);
-        Z_OBJ_P(obj)->handlers = &referent->custom_handlers;
-    }
-
-    if (NULL == hash) {
-        hash = php_spl_object_hash(obj);
-    }
-
-    RETURN_NEW_STR(hash);
-} /* }}} */
-#endif
-
-#ifdef PHP_REF_PATCH_SPL_OBJECT_HASH
-static void php_ref_patch_spl_hash() /* {{{ */
-{
-    if (PHP_REF_G(spl_hash_replaced)) {
-        return;
-    }
-
-    /* Replace spl_object_hash() */
-    zend_function *spl_object_hash = zend_hash_str_find_ptr(EG(function_table), "spl_object_hash", sizeof("spl_object_hash")-1);
-    assert(NULL != spl_object_hash);
-    spl_object_hash->internal_function.handler = zif_spl_object_hash_patched;
-
-    /* Replace SplObjectStorage::getHash() */
-
-    zend_function *spl_object_storage_getHash =  zend_hash_str_find_ptr(&spl_ce_SplObjectStorage->function_table, "gethash", sizeof("gethash") - 1);
-    assert(NULL != spl_object_storage_getHash);
-    spl_object_storage_getHash->internal_function.handler = zif_spl_object_hash_patched;
-
-    /* Replace SplObjectStorage get_debug_info object handler */
-    zval tmp;
-    object_init_ex(&tmp, spl_ce_SplObjectStorage);
-
-    spl_object_storage_get_debug_info_orig_handler = Z_OBJ(tmp)->handlers->get_debug_info;
-    /* Casting const to non-const type is undefined behavior by C standard, but it should works in our case */
-    ((zend_object_handlers *) Z_OBJ(tmp)->handlers)->get_debug_info = spl_object_storage_debug_info;
-
-    zval_ptr_dtor(&tmp);
-
-    PHP_REF_G(spl_hash_replaced) = 1;
-} /* }}} */
-#endif
-
 void php_ref_reference_call_notifier(zval *reference, zval *notifier) /* {{{ */
 {
     zval args;
@@ -337,10 +225,6 @@ php_ref_referent_t *php_ref_referent_get_or_create(zval *referent_zv) /* {{{ */
         return referent;
     }
 
-#ifdef PHP_REF_PATCH_SPL_OBJECT_HASH
-    php_ref_patch_spl_hash();
-#endif
-
     referent = (php_ref_referent_t *) ecalloc(1, sizeof(php_ref_referent_t));
 
     zend_hash_init(&referent->soft_references, 0, NULL, NULL, 0);

ref.c

@@ -73,28 +73,10 @@ PHP_MINFO_FUNCTION(ref) /* {{{ */
 static PHP_GINIT_FUNCTION(ref) /* {{{ */
 {
     ref_globals->referents = NULL;
-#ifdef PHP_REF_PATCH_SPL_OBJECT_HASH
-    ref_globals->spl_hash_replaced = 0;
-#endif
-
 } /* }}} */
 
-#ifdef PHP_REF_PATCH_SPL_OBJECT_HASH
-static const zend_module_dep php_ref_deps[] = {
-    ZEND_MOD_REQUIRED("spl")
-    ZEND_MOD_CONFLICTS("weakref")
-    ZEND_MOD_END
-};
-#endif
-
 zend_module_entry php_ref_module_entry = { /* {{{ */
-#ifdef PHP_REF_PATCH_SPL_OBJECT_HASH
-    STANDARD_MODULE_HEADER_EX,  /* size, zend_api, zend_debug, zts*/
-    NULL,                       /* ini_entry */
-    php_ref_deps,               /* deps */
-#else
     STANDARD_MODULE_HEADER,
-#endif
     "ref",
     php_ref_functions,
     PHP_MINIT(ref),