[pull] master from CopernicaMarketingSoftware:master

include/classtype.h

@@ -4,7 +4,7 @@
  *  Internal class types enumeration.
  *
  *  @author Emiel Bruijntjes <[email protected]>
- *  @copyright 2014 Copernica BV
+ *  @copyright 2014 - 2022 Copernica BV
  */
 
 /**
@@ -13,22 +13,11 @@
 namespace Php {
 
 /**
- *  Enumeration definition.
- *
- *  The PHP-CPP library tries to hide the Zend engine internals completely from
- *  the user. Therefore, it does not include any of the Zend header files, nor
- *  can it refer to the constants defined in the Zend header files. The
- *  following constants have been copied from Zend. If the Zend engine ever
- *  changes (which we do not expect) we should also copy the constant values
- *  used here.
- *
+ *  Enumeration declaration
+ *  The definition of the variables can be found in the Zend directory,
+ *  so that we can use the macro's from the PHP header files.
  */
-enum class ClassType {
-    Regular     =   0x00,
-    Abstract    =   0x20,
-    Final       =   0x04,
-    Interface   =   0x40,
-};
+enum class ClassType;
 
 /**
  *  End namespace

include/interface.h

@@ -1,7 +1,7 @@
 /**
  *  Interface.h
  *
- *  @copyright 2014 Copernica BV
+ *  @copyright 2014 - 2022 Copernica BV
  *  @author Emiel Bruijntjes <[email protected]>
  */
 
@@ -20,12 +20,12 @@ class PHPCPP_EXPORT Interface : private ClassBase
      *  Constructor
      *  @param  name
      */
-    Interface(const char *name) : ClassBase(name, ClassType::Interface) {}
+    Interface(const char *name);
 
     /**
      *  Destructor
      */
-    virtual ~Interface() {}
+    virtual ~Interface() = default;
 
     /**
      *  Add a - of course abstract - method to the interface

zend/classtype.h

@@ -0,0 +1,34 @@
+/**
+ *  @file classtype.h
+ *
+ *  Internal class types enumeration.
+ *
+ *  @author Emiel Bruijntjes <[email protected]>
+ *  @copyright 2014 - 2022 Copernica BV
+ */
+
+/**
+ *  Include guard
+ */
+#pragma once
+
+/**
+ *  Set up namespace
+ */
+namespace Php {
+
+/**
+ *  Enumeration definition.
+ *  This is different for different PHP versions
+ */
+enum class ClassType {
+    Regular     =   0x00,
+    Interface   =   ZEND_ACC_INTERFACE,
+    Abstract    =   ZEND_ACC_ABSTRACT,
+    Final       =   ZEND_ACC_FINAL,
+};
+
+/**
+ *  End namespace
+ */
+}

zend/includes.h

@@ -4,7 +4,7 @@
  *  Startup include file to compile the phpcpp library
  *
  *  @author Emiel Bruijntjes <[email protected]>
- *  @copyright 2013 - 2019 Copernica BV
+ *  @copyright 2013 - 2022 Copernica BV
  */
 
 /**
@@ -117,6 +117,7 @@
  *  Specific zend implementation  files for internal use only
  */
 #include "init.h"
+#include "classtype.h"
 #include "callable.h"
 #include "nativefunction.h"
 #include "method.h"

zend/interface.cpp

@@ -0,0 +1,30 @@
+/**
+ *  Interface.cpp
+ * 
+ *  Implementation file for the Interface class
+ * 
+ *  @author Emiel Bruijntjes <[email protected]>
+ *  @copyright 2022 Copernica BV
+ */
+
+/**
+ *  Dependencies
+ */
+#include "includes.h"
+
+/**
+ *  Begin of namespace
+ */
+namespace Php {
+
+/**
+ *  Constructor
+ *  @param  name
+ */
+Interface::Interface(const char *name) : ClassBase(name, ClassType::Interface) {}
+
+/**
+ *  End of namespace
+ */
+}
+