Use repalce to resolve the problem about taking filed ownership of mut ref PropertyEntity.

Author: jmjoy

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ on:
 env:
   RUST_LOG: debug
   CARGO_TERM_COLOR: always
-  RUST_BACKTRACE: full
+  RUST_BACKTRACE: "1"
   RUSTFLAGS: "-D warnings"
 
 jobs:

examples/hello/src/lib.rs

@@ -63,7 +63,7 @@ pub fn get_module() -> Module {
 
     // register classes
     let mut foo_class = DynamicClass::new("FooClass");
-    foo_class.add_property("foo", "100".to_string());
+    foo_class.add_property("foo", Visibility::Public, "100".to_string());
     foo_class.add_method(
         "getFoo",
         Visibility::Public,

phper-sys/php_wrapper.c

@@ -94,10 +94,6 @@ void phper_zval_obj(zval *z, zend_object *o) {
     ZVAL_OBJ(z, o);
 }
 
-void phper_zval_obj_copy(zval *z, zend_object *o) {
-    ZVAL_OBJ_COPY(z, o);
-}
-
 #if PHP_VERSION_ID < 80000
 static zend_string *phper_zend_string_concat3(
         const char *str1, size_t str1_len,

phper-sys/php_wrapper.h

@@ -39,7 +39,6 @@ void phper_array_init(zval *arg);
 void *phper_zend_hash_str_find_ptr(const HashTable *ht, const char *str, size_t len);
 
 void phper_zval_obj(zval *z, zend_object *o);
-void phper_zval_obj_copy(zval *z, zend_object *o);
 
 zend_string *phper_get_function_or_method_name(const zend_function *func);
 

phper/src/classes.rs

@@ -6,15 +6,14 @@ use crate::{
     functions::{Argument, Function, FunctionEntity, FunctionEntry, Method},
     objects::{ExtendObject, Object},
     sys::*,
-    utils::ensure_end_with_zero,
     values::{SetVal, Val},
 };
 use dashmap::DashMap;
 use once_cell::sync::OnceCell;
 use std::{
     any::{Any, TypeId},
     marker::PhantomData,
-    mem::{size_of, zeroed, ManuallyDrop},
+    mem::{replace, size_of, zeroed, ManuallyDrop},
     os::raw::c_int,
     ptr::null_mut,
     sync::{
@@ -119,9 +118,14 @@ impl<T: Send + 'static> DynamicClass<T> {
         ));
     }
 
-    pub fn add_property(&mut self, name: impl ToString, value: String) {
+    pub fn add_property(
+        &mut self,
+        name: impl ToString,
+        vis: Visibility,
+        value: impl SetVal + Clone,
+    ) {
         self.property_entities
-            .push(PropertyEntity::new(name, value));
+            .push(PropertyEntity::new(name, vis, value));
     }
 
     pub fn extends(&mut self, name: impl ToString) {
@@ -271,31 +275,18 @@ impl ClassEntity {
         *phper_get_create_object(class.cast()) = Some(create_object);
 
         get_registered_class_type_map().insert(class as usize, self.classifiable.state_type_id());
-
-        // let classifiable = self.classifiable.clone();
-        // get_class_constructor_map().insert(class as usize, Box::new(move || classifiable.state_constructor()));
-
-        // let methods = self.class.methods();
-        // for method in methods {
-        //     match &method.handler {
-        //         Callable::Method(_, class) => {
-        //             class.store(ptr, Ordering::SeqCst);
-        //         }
-        //         _ => unreachable!(),
-        //     }
-        // }
     }
 
     pub(crate) unsafe fn declare_properties(&mut self) {
         let properties = self.classifiable.properties();
         for property in properties {
-            let value = ensure_end_with_zero(property.value.clone());
+            let val = replace(&mut property.value, None).unwrap();
             zend_declare_property_string(
                 self.entry.load(Ordering::SeqCst).cast(),
                 property.name.as_ptr().cast(),
                 property.name.len(),
-                value.as_ptr().cast(),
-                Visibility::Public as c_int,
+                EBox::into_raw(val).cast(),
+                property.visibility as c_int,
             );
         }
     }
@@ -331,15 +322,16 @@ impl ClassEntity {
 
 pub struct PropertyEntity {
     name: String,
-    // TODO to be a SetVal
-    value: String,
+    visibility: Visibility,
+    value: Option<EBox<Val>>,
 }
 
 impl PropertyEntity {
-    pub fn new(name: impl ToString, value: String) -> Self {
+    pub fn new(name: impl ToString, visibility: Visibility, value: impl SetVal) -> Self {
         Self {
             name: name.to_string(),
-            value,
+            visibility,
+            value: Some(EBox::new(Val::new(value))),
         }
     }
 }

phper/src/functions.rs

@@ -1,4 +1,6 @@
 //! Apis relate to [crate::sys::zend_function_entry].
+//!
+//! TODO Add php function call.
 
 use std::{mem::zeroed, os::raw::c_char};
 

tests/integration/src/classes.rs

@@ -1,10 +1,44 @@
-use phper::modules::Module;
+use phper::{
+    classes::{DynamicClass, Visibility},
+    functions::Argument,
+    modules::Module,
+    values::Val,
+};
 
 pub fn integrate(module: &mut Module) {
     integrate_a(module);
 }
 
-// TODO Write class tests.
-fn integrate_a(_module: &mut Module) {
-    // let class = DynamicClass::new_with_constructor("IntegrationTest\\A", ||);
+fn integrate_a(module: &mut Module) {
+    let mut class = DynamicClass::new("IntegrationTest\\A");
+
+    class.add_property("name", Visibility::Private, "default");
+    class.add_property("number", Visibility::Private, 100);
+
+    class.add_method(
+        "__construct",
+        Visibility::Public,
+        |this, arguments| {
+            let name = arguments[0].as_string()?;
+            let number = arguments[1].as_long()?;
+            this.set_property("name", Val::new(name));
+            this.set_property("number", Val::new(number));
+            Ok::<_, phper::Error>(())
+        },
+        vec![Argument::by_val("name"), Argument::by_val("number")],
+    );
+
+    class.add_method(
+        "speak",
+        Visibility::Public,
+        |this, _arguments| {
+            let name = this.get_property("name").as_string()?;
+            let number = this.get_property("number").as_long()?;
+
+            Ok::<_, phper::Error>(format!("name: {}, number: {}", name, number))
+        },
+        vec![],
+    );
+
+    module.add_class(class);
 }

tests/integration/tests/php/_common.php

@@ -9,6 +9,14 @@
     define('PHP_VERSION_ID', ($version[0] * 10000 + $version[1] * 100 + $version[2]));
 }
 
+function assert_true($value) {
+    assert_eq($value, true);
+}
+
+function assert_false($value) {
+    assert_eq($value, false);
+}
+
 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/classes.php

@@ -0,0 +1,13 @@
+<?php
+
+require_once __DIR__ . '/_common.php';
+
+assert_throw(function () { new \IntegrationTest\A(); }, "ArgumentCountError", 0, "IntegrationTest\\A::__construct(): expects at least 2 parameter(s), 0 given");
+
+$a = new \IntegrationTest\A("foo", 99);
+assert_eq($a->speak(), "name: foo, number: 99");
+
+$reflection_class = new ReflectionClass(\IntegrationTest\A::class);
+
+$property_name = $reflection_class->getProperty("name");
+assert_true($property_name->isPrivate());