Php73 Support (#390)

* Added PHP7.3 support

Author: gnat42

zend/classimpl.cpp

@@ -1359,11 +1359,8 @@ zend_class_entry *ClassImpl::initialize(ClassBase *base, const std::string &pref
 #if PHP_VERSION_ID < 70300
         entry.iterator_funcs.funcs = IteratorImpl::functions();
 #else
-        // from 7.3 and up, we have to allocate it ourself
-        entry.iterator_funcs_ptr = calloc(1, sizeof(zend_class_iterator_funcs));
-
-        // and we finally include the pointer to the functions in the newly allocated structure
-        entry.iterator_funcs_ptr->funcs = IteratorImp::functions();
+        // from 7.3 and up, we may have to allocate it ourself
+        //entry.iterator_funcs_ptr = calloc(1, sizeof(zend_class_iterator_funcs));
 #endif
     }
 

zend/constantfuncs.cpp

@@ -97,7 +97,9 @@ bool define(const char *name, size_t size, const Value &value)
     constant.flags = CONST_CS;
     constant.module_number = PHP_USER_CONSTANT;
 #else
-    // from 7.3 onwards there is a macro for setting the constant flags and module number
+    // constants are case sensitive (but not persistent, because this is a user
+    // space constant!)
+    // as module number we use a fake module number
     ZEND_CONSTANT_SET_FLAGS(&constant, CONST_CS, PHP_USER_CONSTANT);
 #endif
 

zend/constantimpl.h

@@ -206,7 +206,7 @@ class ConstantImpl
         // from 7.3 onwards there is a macro for setting the constant flags and module number
         ZEND_CONSTANT_SET_FLAGS(&_constant, CONST_CS | CONST_PERSISTENT, module_number);
 #endif
-
+      
         // register the zval
         zend_register_constant(&_constant);
     }

zend/objectimpl.h

@@ -74,10 +74,13 @@ class ObjectImpl
 
         // install the handlers
         _mixed->php.handlers = handlers;
-
+#if PHP_VERSION_ID < 70300
         // set the initial refcount (if it is different than one, because one is the default)
         if (refcount != 1) GC_REFCOUNT(php()) = refcount;
-
+#else
+        // set the initial refcount (if it is different than one, because one is the default)
+        if (refcount != 1) GC_SET_REFCOUNT(php(),refcount);
+#endif
         // the object may remember that we are its implementation object
         base->_impl = this;
     }

zend/value.cpp

@@ -158,9 +158,13 @@ Value::Value(struct _zval_struct *val, bool ref)
         // retrieve the reference
         zend_reference *ref = Z_REF_P(val);
 
+#if PHP_VERSION_ID < 70300
         // increment refcount
         ++GC_REFCOUNT(ref);
-
+#else
+	// increment refcount
+        GC_ADDREF(ref);
+#endif
         // store the reference in our value
         ZVAL_REF(_val, ref);
     }
@@ -237,9 +241,13 @@ Value Value::makeReference()
     // retriece the reference
     zend_reference *ref = Z_REF_P(from);
 
+#if PHP_VERSION_ID < 70300
     // increment reference count
     GC_REFCOUNT(ref)++;
-
+#else
+    // increment reference count
+    GC_ADDREF(ref);
+#endif
     // copy the reference
     ZVAL_REF(to, ref);