Fixes for PHP 7.4 and 8.0 compatibility

- ZEND_ACC_DTOR and ZEND_ACC_SHADOW can be undefined
- Run nix tests against PHP 7.3
- Nix derivation needs pname parameter

Closes #55
Closes #56

.travis.yml

@@ -25,6 +25,10 @@ matrix:
     env:
     - NIX_CHANNEL=18.09
     - NIX_PHP_ATTR=php72
+  - language: nix
+    env:
+    - NIX_CHANNEL=19.03
+    - NIX_PHP_ATTR=php73
   - language: nix
     env:
     - NIX_CHANNEL=unstable

derivation.nix

@@ -12,6 +12,7 @@ let
 in
 
 buildPecl rec {
+  pname = "mustache";
   name = "mustache-${version}";
   version = orDefault phpMustacheVersion "v0.7.4";
   src = orDefault phpMustacheSrc (fetchurl {

mustache_data.cpp

@@ -107,9 +107,14 @@ static zend_always_inline bool is_invokable_object(const zend_class_entry * ce)
 /* {{{ is_valid_function */
 static zend_always_inline bool is_valid_function(const zend_function * f)
 {
-  return (f->common.fn_flags & ZEND_ACC_CTOR) == 0 &&
+  return (f->common.fn_flags & ZEND_ACC_STATIC) == 0 &&
+#ifdef ZEND_ACC_CTOR
+          (f->common.fn_flags & ZEND_ACC_CTOR) == 0 &&
+#endif
+#ifdef ZEND_ACC_DTOR
           (f->common.fn_flags & ZEND_ACC_DTOR) == 0 &&
-          (f->common.fn_flags & ZEND_ACC_STATIC) == 0 &&
+#endif
+
           (f->common.fn_flags & ZEND_ACC_PROTECTED) == 0 &&
           (f->common.fn_flags & ZEND_ACC_PRIVATE) == 0;
 }
@@ -118,8 +123,10 @@ static zend_always_inline bool is_valid_function(const zend_function * f)
 /* {{{ is_valid_property */
 static zend_always_inline bool is_valid_property(const zend_property_info * prop)
 {
-  return (prop->flags & ZEND_ACC_SHADOW) == 0 &&
-          (prop->flags & ZEND_ACC_PROTECTED) == 0 &&
+  return (prop->flags & ZEND_ACC_PROTECTED) == 0 &&
+#ifdef ZEND_ACC_SHADOW
+          (prop->flags & ZEND_ACC_SHADOW) == 0 &&
+#endif
           (prop->flags & ZEND_ACC_PRIVATE) == 0;
 }
 /* }}} */
@@ -237,7 +244,11 @@ static zend_always_inline void mustache_data_from_object_properties_zval(mustach
   node->type = mustache::Data::TypeNone;
 
   if( Z_OBJ_HT_P(current)->get_properties != NULL ) {
+#if PHP_VERSION_ID >= 80000
+    data_hash = Z_OBJ_HT_P(current)->get_properties(Z_OBJ_P(current));
+#else
     data_hash = Z_OBJ_HT_P(current)->get_properties(current);
+#endif
   }
   if( data_hash != NULL && zend_hash_num_elements(data_hash) > 0 ) {
 #if PHP_VERSION_ID < 70300

package.xml

@@ -237,7 +237,7 @@
   <required>
    <php>
     <min>7.0.0</min>
-    <max>7.3.99</max>
+    <max>7.4.99</max>
    </php>
    <pearinstaller>
     <min>1.4.1</min>