fixed the __invoke() and __call() methods: the return value of the C++ function was not passed to php space

Author: EmielBruijntjes

zend/classimpl.cpp

@@ -106,18 +106,17 @@ void ClassImpl::callMethod(INTERNAL_FUNCTION_PARAMETERS)
     // the function could throw an exception
     try
     {
-        // wrap the return value
-        Value result(return_value, true);
-
         // construct parameters
         ParametersImpl params(getThis(), ZEND_NUM_ARGS());
 
         // retrieve the base object
         Base *base = params.object();
 
         // is this a static, or a non-static call?
-        if (base) result = meta->callCall(base, name, params);
-        else result = meta->callCallStatic(name, params);
+        Php::Value result = base ? meta->callCall(base, name, params) : meta->callCallStatic(name, params);
+
+        // return a full copy of the zval, and do not destruct it
+        RETVAL_ZVAL(result._val, 1, 0);
     }
     catch (const NotImplemented &exception)
     {
@@ -151,17 +150,17 @@ void ClassImpl::callInvoke(INTERNAL_FUNCTION_PARAMETERS)
     // the function could throw an exception
     try
     {
-        // wrap the return value
-        Value result(return_value, true);
-
         // construct parameters
         ParametersImpl params(getThis(), ZEND_NUM_ARGS());
 
         // retrieve the base object
         Base *base = params.object();
 
         // call the actual __invoke method on the base object
-        result = meta->callInvoke(base, params);
+        auto result = meta->callInvoke(base, params);
+
+        // return a full copy of the zval, and do not destruct it
+        RETVAL_ZVAL(result._val, 1, 0);
     }
     catch (const NotImplemented &exception)
     {
@@ -212,7 +211,7 @@ zend_function *ClassImpl::getMethod(zend_object **object, zend_string *method, c
     auto *function = &data->func;
 
     // set all properties
-    function->type = ZEND_INTERNAL_FUNCTION;
+    function->type              = ZEND_INTERNAL_FUNCTION;
     function->arg_flags[0]      = 0;
     function->arg_flags[1]      = 0;
     function->arg_flags[2]      = 0;
@@ -256,7 +255,7 @@ zend_function *ClassImpl::getStaticMethod(zend_class_entry *entry, zend_string *
     auto *function = &data->func;
 
     // set all properties for the function
-    function->type = ZEND_INTERNAL_FUNCTION;
+    function->type              = ZEND_INTERNAL_FUNCTION;
     function->arg_flags[0]      = 0;
     function->arg_flags[1]      = 0;
     function->arg_flags[2]      = 0;
@@ -300,7 +299,7 @@ int ClassImpl::getClosure(zval *object, zend_class_entry **entry_ptr, zend_funct
     auto *function = &data->func;
 
     // we're going to set all properties of the zend_internal_function struct
-    function->type = ZEND_INTERNAL_FUNCTION;
+    function->type              = ZEND_INTERNAL_FUNCTION;
     function->arg_flags[0]      = 0;
     function->arg_flags[1]      = 0;
     function->arg_flags[2]      = 0;

zend/classimpl.h

@@ -5,7 +5,7 @@
  *  exist for a class.
  *
  *  @author Emiel Bruijntjes <[email protected]>
- *  @copyright 2014 Copernica BV
+ *  @copyright 2014 - 2019 Copernica BV
  */
 
 /**
@@ -303,10 +303,10 @@ class ClassImpl
 
     /**
      *  Method that returns information about the __invoke() method
-     *  @param  object
-     *  @param  entry
-     *  @param  func
-     *  @param  object_ptr
+     *  @param  object      The object on which the method is called
+     *  @param  entry       Class entry holding class properties
+     *  @param  func        Function to be filled
+     *  @param  object_ptr  To be filled with the object on which the method is to be called
      *  @return int
      */
     static int getClosure(zval *object, zend_class_entry **entry, zend_function **func, zend_object **object_ptr);

zend/constantimpl.h

@@ -4,7 +4,7 @@
  *  Implementation file for the constant class
  *
  *  @author Emiel Bruijntjes <[email protected]>
- *  @copyright 2015 Copernica BV
+ *  @copyright 2015 - 2019 Copernica BV
  */
 
 /**
@@ -188,7 +188,7 @@ class ConstantImpl
 
             // copy the entire namespace name, separator and constant name
             ::strncpy(ZSTR_VAL(_constant.name), prefix.c_str(), prefix.size());
-            ::strncpy(ZSTR_VAL(_constant.name) + prefix.size(), "\\", 1);
+            ::strcpy (ZSTR_VAL(_constant.name) + prefix.size(), "\\");
             ::strncpy(ZSTR_VAL(_constant.name) + prefix.size() + 1, _name, namelen + 1);
         }
         else