Fix constant declare function getting called for non-const and vice-versa

5 files changed, 18 insertions, 18 deletions

diff --git a/src/boolmember.h b/src/boolmember.h
index d83a3cb..6a241a0 100644
--- a/src/boolmember.h
+++ b/src/boolmember.h
@@ -52,11 +52,11 @@ public:
     virtual void declare(struct _zend_class_entry *entry, const char *name, int size, int flags) override
     {
 #if PHP_VERSION_ID >= 50400
-        if (flags == constMember) zend_declare_property_bool(entry, name, size, _value, flags);
-        else zend_declare_class_constant_bool(entry, name, size, _value);
+        if (flags == constMember) zend_declare_class_constant_bool(entry, name, size, _value);
+        else zend_declare_property_bool(entry, name, size, _value, flags);
 #else
-        if (flags == constMember) zend_declare_property_bool(entry, (char *) name, size, _value, flags);
-        else zend_declare_class_constant_bool(entry, (char *) name, size, _value);
+        if (flags == constMember) zend_declare_class_constant_bool(entry, (char *) name, size, _value);
+        else zend_declare_property_bool(entry, (char *) name, size, _value, flags);
 #endif
     }
 };
diff --git a/src/doublemember.h b/src/doublemember.h
index 5a5e13f..2d5e89d 100644
--- a/src/doublemember.h
+++ b/src/doublemember.h
@@ -52,11 +52,11 @@ public:
     virtual void declare(struct _zend_class_entry *entry, const char *name, int size, int flags) override
     {
 #if PHP_VERSION_ID >= 50400
-        if (flags == constMember) zend_declare_property_double(entry, name, size, _value, flags);
-        else zend_declare_class_constant_double(entry, name, size, _value);
+        if (flags == constMember) zend_declare_class_constant_double(entry, name, size, _value);
+        else zend_declare_property_double(entry, name, size, _value, flags);
 #else
-        if (flags == constMember) zend_declare_property_double(entry, (char *)name, size, _value, flags);
-        else zend_declare_class_constant_double(entry, (char *)name, size, _value);
+        if (flags == constMember) zend_declare_class_constant_double(entry, (char *)name, size, _value);
+        else zend_declare_property_double(entry, (char *)name, size, _value, flags);
 #endif
     }
 };
diff --git a/src/longmember.h b/src/longmember.h
index ff4ccb3..2dafe5b 100644
--- a/src/longmember.h
+++ b/src/longmember.h
@@ -52,11 +52,11 @@ public:
     virtual void declare(struct _zend_class_entry *entry, const char *name, int size, int flags) override
     {
 #if PHP_VERSION_ID >= 50400
-        if (flags == constMember) zend_declare_property_long(entry, name, size, _value, flags);
-        else zend_declare_class_constant_long(entry, name, size, _value);
+        if (flags == constMember) zend_declare_class_constant_long(entry, name, size, _value);
+        else zend_declare_property_long(entry, name, size, _value, flags);
 #else
-        if (flags == constMember) zend_declare_property_long(entry, (char *) name, size, _value, flags);
-        else zend_declare_class_constant_long(entry, (char *) name, size, _value);
+        if (flags == constMember) zend_declare_class_constant_long(entry, (char *) name, size, _value);
+        else zend_declare_property_long(entry, (char *) name, size, _value, flags);
 #endif
     }
 };
diff --git a/src/nullmember.h b/src/nullmember.h
index 54285f0..9b8584f 100644
--- a/src/nullmember.h
+++ b/src/nullmember.h
@@ -44,11 +44,11 @@ public:
     virtual void declare(struct _zend_class_entry *entry, const char *name, int size, int flags) override
     {
 #if PHP_VERSION_ID >= 50400
-        if (flags == constMember) zend_declare_property_null(entry, name, size, flags);
-        else zend_declare_class_constant_null(entry, name, size);
+        if (flags == constMember) zend_declare_class_constant_null(entry, name, size);
+        else zend_declare_property_null(entry, name, size, flags);
 #else
-        if (flags == constMember) zend_declare_property_null(entry, (char *) name, size, flags);
-        else zend_declare_class_constant_null(entry, (char *) name, size);
+        if (flags == constMember) zend_declare_class_constant_null(entry, (char *) name, size);
+        else zend_declare_property_null(entry, (char *) name, size, flags);
 #endif
     }
 };
diff --git a/src/stringmember.h b/src/stringmember.h
index 8f0a1e9..bdc53c7 100644
--- a/src/stringmember.h
+++ b/src/stringmember.h
@@ -62,8 +62,8 @@ public:
         if (flags == constMember) zend_declare_class_constant_stringl(entry, name, size, _value.c_str(), _value.size());
         else zend_declare_property_stringl(entry, name, size, _value.c_str(), _value.size(), flags);
 #else
-        if (flags == constMember) zend_declare_property_stringl(entry, (char*) name, size, (char *) _value.c_str(), _value.size(), flags);
-        else zend_declare_class_constant_stringl(entry, (char*) name, size, (char *) _value.c_str(), _value.size());
+        if (flags == constMember) zend_declare_class_constant_stringl(entry, (char*) name, size, (char *) _value.c_str(), _value.size());
+        else zend_declare_property_stringl(entry, (char*) name, size, (char *) _value.c_str(), _value.size(), flags);
 #endif
     }
 };