Php::Constant objects can now also be added to a Php::Class to create class constants

3 files changed, 73 insertions, 1 deletions

diff --git a/zend/constant.cpp b/zend/constant.cpp
index 83a4de0..102e4f7 100644
--- a/zend/constant.cpp
+++ b/zend/constant.cpp
@@ -79,6 +79,32 @@ Constant::Constant(const char *name, const std::string &value) :
     _impl(new ConstantImpl(name, value)) {}
 
 /**
+ *  Add the constant to a class
+ * 
+ *  You normally do not have to call this method yourself. You can simply
+ *  do one of the following method calls to create class constants:
+ * 
+ *      myclass.property("MY_CONSTANT", "value", Php::Const);
+ *      myclass.constant("MY_CONSTANT", "value");
+ *      myclass.add(Php::Constant("MY_CONSTANT", "value"));
+ * 
+ *  All of the calls have the same result, it is up to you to decide which
+ *  one suits you most. If you use the last one - using a Php::Constant
+ *  class - the PHP-CPP library will call this "addTo()" method internally
+ *  to forward the call to one of the other methods.
+ * 
+ *  @param  clss        Class to which the constant is added
+ *  @internal
+ */
+void Constant::addTo(ClassBase &clss)
+{
+    // pass on to the implementation
+    _impl->addTo(clss);
+}
+
+
+
+/**
  *  End of namespace
  */
 }
diff --git a/zend/constantimpl.h b/zend/constantimpl.h
index bf2ac25..bfae410 100644
--- a/zend/constantimpl.h
+++ b/zend/constantimpl.h
@@ -113,6 +113,52 @@ public:
     virtual ~ConstantImpl() {}
 
     /**
+     *  Add the constant to a class
+     *  @param  clss        The class to add it to
+     */
+    void addTo(ClassBase &clss)
+    {
+        // check the zval type
+        switch (Z_TYPE(_constant.value)) {
+
+        case IS_NULL:       
+            // set a null constant
+            clss.property(_name, nullptr, Php::Const);
+            break;
+        
+        case IS_LONG:
+            // set a long constant
+            clss.property(_name, Z_LVAL(_constant.value), Php::Const);
+            break;
+        
+        case IS_DOUBLE:
+            // set a double constant
+            clss.property(_name, Z_DVAL(_constant.value), Php::Const);
+            break;
+        
+        case IS_BOOL:
+            // set a boolean constant
+            clss.property(_name, Z_BVAL(_constant.value), Php::Const);
+            break;
+        
+        case IS_STRING:
+            // set a string constant
+            clss.property(_name, std::string(Z_STRVAL(_constant.value), Z_STRLEN(_constant.value)), Php::Const);
+            break;
+        
+        default:
+            // this should not happen, the constant can only be constructed as one
+            // of the above types, so it should be impossible to end up here. But
+            // for completeness, we convert the constant to a string, here
+            convert_to_string(&_constant.value);
+            
+            // set as string constant
+            clss.property(_name, std::string(Z_STRVAL(_constant.value), Z_STRLEN(_constant.value)), Php::Const);
+            break;
+        }
+    }
+    
+    /**
      *  Initialize the constant
      *  @param  prefix          Namespace prefix
      *  @param  module_number   The module number
diff --git a/zend/includes.h b/zend/includes.h
index e4dd6b9..874b0b1 100644
--- a/zend/includes.h
+++ b/zend/includes.h
@@ -77,8 +77,8 @@
 #include "../include/classtype.h"
 #include "../include/classbase.h"
 #include "../include/interface.h"
-#include "../include/class.h"
 #include "../include/constant.h"
+#include "../include/class.h"
 #include "../include/namespace.h"
 #include "../include/extension.h"
 #include "../include/call.h"