If our zend value is a reference, pass through the reference to retrieve the object class entry

Author: raidiant

include/value.h

@@ -398,6 +398,7 @@ class PHPCPP_EXPORT Value : private HashParent
     bool isBool()       const;
     bool isString()     const;
     bool isFloat()      const;
+    bool isReference()  const;
     bool isObject()     const;
     bool isArray()      const;
     bool isScalar()     const { return isNull() || isNumeric() || isBool() || isString() || isFloat(); }

zend/value.cpp

@@ -1048,6 +1048,16 @@ bool Value::isFloat() const
     return ((Type) Z_TYPE_P(_val.dereference())) == Type::Float;
 }
 
+/**
+ *  Are we a reference?
+ *  @return bool
+ */
+bool Value::isReference() const
+{
+    // check our pointer if we are a reference
+    return Z_ISREF_P(_val);
+}
+
 /**
  *  Are we an object? This will also check if we're a reference to an object
  *  @return bool
@@ -1130,12 +1140,20 @@ bool Value::isCallable() const
  */
 zend_class_entry *Value::classEntry(bool allowString) const
 {
+    // are we a reference
+    if (isReference())
+    {
+        // we go through the reference to retrieve the object
+        return Z_OBJCE_P(Z_REFVAL_P(_val));
+    }
+
     // is this an object
-    if (isObject())
+    else if (isObject())
     {
         // class entry can be easily found
         return Z_OBJCE_P(_val);
     }
+
     else
     {
         // the value is not an object, is this allowed?
@@ -1777,11 +1795,14 @@ HashMember<std::string> Value::operator[](const char *key)
  */
 Base *Value::implementation() const
 {
+    // are we a reference
+    if (isReference()) return ObjectImpl::find(Z_REFVAL_P(_val))->object();
+
     // must be an object
-    if (!isObject()) return nullptr;
+    if (isObject()) return ObjectImpl::find(_val)->object();
 
     // retrieve the mixed object that contains the base
-    return ObjectImpl::find(_val)->object();
+    return nullptr;
 }
 
 /**