Add ref traits.

Author: jmjoy

examples/http-server/src/server.rs

@@ -18,7 +18,7 @@ use hyper::{
     Body, Request, Response, Server, StatusCode,
 };
 use phper::{
-    alloc::EBox,
+    alloc::{EBox, RefClone},
     classes::{ClassEntry, DynamicClass, StatelessClassEntry, Visibility},
     errors::Error::Throw,
     functions::Argument,
@@ -75,9 +75,7 @@ pub fn make_server_class() -> DynamicClass<Option<Builder<AddrIncoming>>> {
             static HANDLE: AtomicPtr<ZVal> = AtomicPtr::new(null_mut());
 
             let builder = replace(this.as_mut_state(), None).unwrap();
-            let handle = this
-                .duplicate_property("onRequestHandle")
-                .map_err(phper::Error::NotRefCountedType)?;
+            let handle = EBox::new(this.get_mut_property("onRequestHandle").ref_clone());
             HANDLE.store(EBox::into_raw(handle), Ordering::SeqCst);
 
             let make_svc = make_service_fn(move |_conn| async move {

phper-alloc/src/lib.rs

@@ -16,6 +16,7 @@ mod macros;
 
 use phper_sys::*;
 use std::{
+    borrow::Borrow,
     convert::TryInto,
     mem::{forget, size_of},
     ops::{Deref, DerefMut},
@@ -90,3 +91,17 @@ impl<T> Drop for EBox<T> {
         }
     }
 }
+
+/// Duplicate an object without deep copy, but to only add the refcount, for php
+/// refcount struct.
+pub trait ToRefOwned {
+    type Owned: Borrow<Self>;
+
+    fn to_ref_owned(&mut self) -> Self::Owned;
+}
+
+/// Duplicate an object without deep copy, but to only add the refcount, for php
+/// refcount struct.
+pub trait RefClone {
+    fn ref_clone(&mut self) -> Self;
+}

phper-sys/build.rs

@@ -21,51 +21,6 @@ fn main() {
     let includes = execute_command(&[php_config.as_str(), "--includes"]);
     let includes = includes.split(' ').collect::<Vec<_>>();
 
-    // Generate php const.
-
-    let php_bin = execute_command(&[php_config.as_str(), "--php-binary"]);
-    let php_info = execute_command(&[php_bin.as_str(), "-i"]);
-
-    println!(
-        "cargo:rustc-env=ZEND_MODULE_BUILD_ID={}",
-        php_info
-            .lines()
-            .find_map(|line| {
-                if line.starts_with("Zend Extension Build") {
-                    Some(
-                        line.chars()
-                            .skip_while(|c| *c != 'A')
-                            .collect::<String>()
-                            .trim()
-                            .to_owned(),
-                    )
-                } else {
-                    None
-                }
-            })
-            .expect("Can't found the field `Zend Extension Build`")
-    );
-
-    println!(
-        "cargo:rustc-env=PHP_MODULE_BUILD_ID={}",
-        php_info
-            .lines()
-            .find_map(|line| {
-                if line.starts_with("PHP Extension Build") {
-                    Some(
-                        line.chars()
-                            .skip_while(|c| *c != 'A')
-                            .collect::<String>()
-                            .trim()
-                            .to_owned(),
-                    )
-                } else {
-                    None
-                }
-            })
-            .expect("Can't found the field `PHP Extension Build`")
-    );
-
     // Generate libphpwrapper.a.
 
     let mut builder = cc::Build::new();

phper-sys/php_wrapper.c

@@ -289,3 +289,11 @@ zend_string *phper_z_str_p(const zval *zv) {
 zend_resource *phper_z_res_p(const zval *zv) {
     return Z_RES_P(zv);
 }
+
+zend_string *phper_zend_string_copy(zend_string *s) {
+    return zend_string_copy(s);
+}
+
+const char *phper_get_zend_module_build_id() {
+    return ZEND_MODULE_BUILD_ID;
+}

phper-sys/src/lib.rs

@@ -20,8 +20,3 @@
 use std::os::raw::c_char;
 
 include!(concat!(env!("OUT_DIR"), "/php_bindings.rs"));
-
-pub const PHP_MODULE_BUILD_ID: *const c_char =
-    concat!(env!("PHP_MODULE_BUILD_ID"), "\0").as_ptr().cast();
-pub const ZEND_MODULE_BUILD_ID: *const c_char =
-    concat!(env!("ZEND_MODULE_BUILD_ID"), "\0").as_ptr().cast();

phper/build.rs

@@ -12,10 +12,6 @@ use phper_sys::*;
 
 fn main() {
     phper_build::register_configures();
-    assert_eq!(
-        PHP_DEBUG, 0,
-        "PHPER not support DEBUG mode now (php built with `--enable-debug`)."
-    );
     assert_eq!(
         USING_ZTS, 0,
         "PHPER not support ZTS mode now (php built with `--enable-maintainer-zts` or \

phper/src/arrays.rs

@@ -17,6 +17,7 @@ use crate::{
     values::ZVal,
 };
 use derive_more::From;
+use phper_alloc::ToRefOwned;
 use std::{
     borrow::Borrow,
     convert::TryInto,
@@ -188,6 +189,14 @@ impl ToOwned for ZArr {
     }
 }
 
+impl ToRefOwned for ZArr {
+    type Owned = ZArray;
+
+    fn to_ref_owned(&mut self) -> Self::Owned {
+        todo!()
+    }
+}
+
 /// Wrapper of [crate::sys::zend_array].
 #[repr(transparent)]
 pub struct ZArray {

phper/src/modules.rs

@@ -198,7 +198,7 @@ impl Module {
             type_: 0,
             handle: null_mut(),
             module_number: 0,
-            build_id: PHP_MODULE_BUILD_ID,
+            build_id: phper_get_zend_module_build_id(),
         });
 
         let entry = Box::into_raw(entry);

phper/src/objects.rs

@@ -87,14 +87,8 @@ impl<T: 'static> Object<T> {
         self.get_mut_property(name)
     }
 
-    pub fn duplicate_property(
-        &mut self, name: impl AsRef<str>,
-    ) -> Result<EBox<ZVal>, NotRefCountedTypeError> {
-        self.get_mut_property(name).duplicate()
-    }
-
     #[allow(clippy::useless_conversion)]
-    fn get_mut_property(&mut self, name: impl AsRef<str>) -> &mut ZVal {
+    pub fn get_mut_property(&mut self, name: impl AsRef<str>) -> &mut ZVal {
         let name = name.as_ref();
 
         let prop = unsafe {

phper/src/strings.rs

@@ -11,6 +11,7 @@
 //! Apis relate to [crate::sys::zend_string].
 
 use crate::{alloc::EBox, sys::*};
+use phper_alloc::ToRefOwned;
 use std::{
     borrow::Borrow,
     convert::TryInto,
@@ -84,6 +85,17 @@ impl ToOwned for ZStr {
     }
 }
 
+impl ToRefOwned for ZStr {
+    type Owned = ZString;
+
+    fn to_ref_owned(&mut self) -> Self::Owned {
+        unsafe {
+            let ptr = phper_zend_string_copy(self.as_mut_ptr());
+            ZString::from_raw(ptr)
+        }
+    }
+}
+
 /// Like String, CString for [crate::sys::zend_string].
 pub struct ZString {
     inner: *mut ZStr,