Removed unnecessary function declareConst and made the declare function for memberinfo descendants override

1 files changed, 5 insertions, 19 deletions

diff --git a/src/nullmember.h b/src/nullmember.h
index e5fdd62..54285f0 100644
--- a/src/nullmember.h
+++ b/src/nullmember.h
@@ -41,30 +41,16 @@ public:
      *  @param  size        Size of the name
      *  @param  flags       Additional flags
      */
-    virtual void declare(struct _zend_class_entry *entry, const char *name, int size, int flags)
+    virtual void declare(struct _zend_class_entry *entry, const char *name, int size, int flags) override
     {
 #if PHP_VERSION_ID >= 50400
-        zend_declare_property_null(entry, name, size, flags);
+        if (flags == constMember) zend_declare_property_null(entry, name, size, flags);
+        else zend_declare_class_constant_null(entry, name, size);
 #else
-        zend_declare_property_null(entry, (char *) name, size, flags);
+        if (flags == constMember) zend_declare_property_null(entry, (char *) name, size, flags);
+        else zend_declare_class_constant_null(entry, (char *) name, size);
 #endif
     }
-
-    /**
-     *  Virtual method to declare the class constant
-     *  @param  entry       Class entry
-     *  @param  name        Name of the member
-     *  @param  size        Size of the name
-     *  @param  flags       Additional flags
-     */
-    virtual void declareConst(struct _zend_class_entry *entry, const char *name, int size)
-    {
-#if PHP_VERSION_ID >= 50400
-        zend_declare_class_constant_null(entry, name, size);
-#else
-        zend_declare_class_constant_null(entry, (char *) name, size);
-#endif
-    };
 };
 
 /**