Downgrade to remove 7.0 support because of unresolved problem.

Author: jmjoy

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
         os:
           - ubuntu-latest
         php-version:
-          - "7.0"
+#          - "7.0"
           - "7.1"
           - "7.2"
           - "7.3"

README.md

@@ -25,7 +25,7 @@ A library that allows us to write PHP extensions using pure Rust and using safe
 
 *version*
 
-- [x] 7.0
+- [ ] 7.0
 - [x] 7.1
 - [x] 7.2
 - [x] 7.3

phper-sys/php_wrapper.c

@@ -90,28 +90,6 @@ void *phper_zend_hash_str_find_ptr(const HashTable *ht, const char *str, size_t
     return zend_hash_str_find_ptr(ht, str, len);
 }
 
-void phper_zend_hash_merge_with_key(HashTable *target, HashTable *source) {
-    uint32_t idx;
-    Bucket *p;
-    zval *s;
-
-    for (idx = 0; idx < source->nNumUsed; idx++) {
-        p = source->arData + idx;
-        s = &p->val;
-        if (UNEXPECTED(Z_TYPE_P(s) == IS_INDIRECT)) {
-            s = Z_INDIRECT_P(s);
-        }
-        if (UNEXPECTED(Z_TYPE_P(s) == IS_UNDEF)) {
-            continue;
-        }
-        if (p->key) {
-            zend_hash_str_update(target, ZSTR_VAL(p->key), ZSTR_LEN(p->key), s);
-        } else {
-            zend_hash_index_update(target, p->h, s);
-        }
-    }
-}
-
 void phper_zval_obj(zval *z, zend_object *o) {
     ZVAL_OBJ(z, o);
 }

phper-sys/php_wrapper.h

@@ -37,7 +37,6 @@ zval* phper_zend_hash_index_update(HashTable *ht, zend_ulong h, zval *pData);
 
 void phper_array_init(zval *arg);
 void *phper_zend_hash_str_find_ptr(const HashTable *ht, const char *str, size_t len);
-void phper_zend_hash_merge_with_key(HashTable *target, HashTable *source);
 
 void phper_zval_obj(zval *z, zend_object *o);
 

phper/src/arrays.rs

@@ -36,7 +36,7 @@ impl Array {
     pub fn new() -> Self {
         unsafe {
             let mut array = zeroed::<Array>();
-            _zend_hash_init(array.as_mut_ptr(), 0, None, false.into());
+            _zend_hash_init(array.as_mut_ptr(), 0, Some(_zval_ptr_dtor), false.into());
             array
         }
     }

phper/src/errors.rs

@@ -1,6 +1,6 @@
 //! The errors for crate and php.
 
-use crate::{classes::ClassEntry, Error::Other};
+use crate::{classes::ClassEntry, Error::Other, sys::*};
 use anyhow::anyhow;
 use std::{error, ffi::FromBytesWithNulError, io, str::Utf8Error};
 
@@ -132,6 +132,11 @@ impl ArgumentCountError {
 
 impl Throwable for ArgumentCountError {
     fn class_entry(&self) -> &ClassEntry {
-        ClassEntry::from_globals("ArgumentCountError").unwrap()
+        let class_name = if PHP_VERSION_ID >= 70100 {
+            "ArgumentCountError"
+        } else {
+            "TypeError"
+        };
+        ClassEntry::from_globals(class_name).unwrap()
     }
 }

tests/integration/src/arguments.rs

@@ -44,6 +44,7 @@ fn integrate_arguments(module: &mut Module) {
         |arguments: &mut [Val]| -> phper::Result<EBox<Array>> {
             let a = arguments[0].as_array()?;
             let mut a = a.clone();
+            a.insert("a", Val::new(1));
             a.insert("foo", Val::new("bar"));
             Ok(EBox::new(a))
         },

tests/integration/tests/php/_common.php

@@ -4,6 +4,11 @@
 ini_set("display_startup_errors", "On");
 error_reporting(E_ALL);
 
+if (!defined('PHP_VERSION_ID')) {
+    $version = explode('.', PHP_VERSION);
+    define('PHP_VERSION_ID', ($version[0] * 10000 + $version[1] * 100 + $version[2]));
+}
+
 function assert_eq($left, $right) {
     if ($left !== $right) {
         throw new AssertionError(sprintf("left != right,\n left: %s,\n right: %s", var_export($left, true), var_export($right, true)));

tests/integration/tests/php/arguments.php

@@ -2,8 +2,15 @@
 
 require_once __DIR__ . '/_common.php';
 
+if (PHP_VERSION_ID >= 70100) {
+    $argumentCountErrorName = "ArgumentCountError";
+} else {
+    $argumentCountErrorName = "TypeError";
+}
+
 assert_eq(integrate_arguments_null(null), null);
-assert_throw(function () { integrate_arguments_null(); }, "ArgumentCountError", 0, "integrate_arguments_null(): expects at least 1 parameter(s), 0 given");
+
+assert_throw(function () { integrate_arguments_null(); }, $argumentCountErrorName, 0, "integrate_arguments_null(): expects at least 1 parameter(s), 0 given");
 assert_throw(function () { integrate_arguments_null(1); }, "TypeError", 0, "type error: must be of type null, int given");
 
 assert_eq(integrate_arguments_long(1, 2), 3);
@@ -25,7 +32,7 @@
 assert_object(integrate_arguments_object($obj), "stdClass", ["a" => 1, "foo" => "bar"]);
 assert_throw(function () { integrate_arguments_object(1); }, "TypeError", 0, "type error: must be of type object, int given");
 
-assert_throw(function () { integrate_arguments_optional(); }, "ArgumentCountError", 0, "integrate_arguments_optional(): expects at least 1 parameter(s), 0 given");
+assert_throw(function () { integrate_arguments_optional(); }, $argumentCountErrorName, 0, "integrate_arguments_optional(): expects at least 1 parameter(s), 0 given");
 assert_eq(integrate_arguments_optional("foo"), "foo: false");
 assert_eq(integrate_arguments_optional("foo", true), "foo: true");
 assert_eq(integrate_arguments_optional("foo", true, "bar"), "foo: true");