Remove the implement of From<Result> to ZVal. (#92)

Author: jmjoy

examples/complex/src/lib.rs

@@ -18,7 +18,7 @@ use phper::{
     php_get_module,
     values::ZVal,
 };
-use std::ffi::CStr;
+use std::{convert::Infallible, ffi::CStr};
 
 fn say_hello(arguments: &mut [ZVal]) -> phper::Result<String> {
     let name = &mut arguments[0];
@@ -68,8 +68,7 @@ pub fn get_module() -> Module {
 
         let complex_description = ZVal::from(ini_get::<Option<&CStr>>("complex.description"));
         arr.insert("complex.description", complex_description);
-
-        arr
+        Ok::<_, Infallible>(arr)
     });
 
     // register classes

examples/http-client/src/client.rs

@@ -15,7 +15,7 @@ use phper::{
     functions::Argument,
 };
 use reqwest::blocking::{Client, ClientBuilder};
-use std::{mem::take, time::Duration};
+use std::{convert::Infallible, mem::take, time::Duration};
 
 const HTTP_CLIENT_BUILDER_CLASS_NAME: &str = "HttpClient\\HttpClientBuilder";
 const HTTP_CLIENT_CLASS_NAME: &str = "HttpClient\\HttpClient";
@@ -66,7 +66,9 @@ pub fn make_client_class() -> ClassEntity<Option<Client>> {
     let mut class =
         ClassEntity::<Option<Client>>::new_with_default_state_constructor(HTTP_CLIENT_CLASS_NAME);
 
-    class.add_method("__construct", Visibility::Private, |_, _| {});
+    class.add_method("__construct", Visibility::Private, |_, _| {
+        Ok::<_, Infallible>(())
+    });
 
     class
         .add_method("get", Visibility::Public, |this, arguments| {

examples/http-client/src/request.rs

@@ -14,7 +14,7 @@ use phper::{
     errors::ThrowObject,
 };
 use reqwest::blocking::RequestBuilder;
-use std::mem::take;
+use std::{convert::Infallible, mem::take};
 
 pub const REQUEST_BUILDER_CLASS_NAME: &str = "HttpClient\\RequestBuilder";
 
@@ -23,7 +23,9 @@ pub fn make_request_builder_class() -> ClassEntity<Option<RequestBuilder>> {
         REQUEST_BUILDER_CLASS_NAME,
     );
 
-    class.add_method("__construct", Visibility::Private, |_, _| {});
+    class.add_method("__construct", Visibility::Private, |_, _| {
+        Ok::<_, Infallible>(())
+    });
 
     class.add_method("send", Visibility::Public, |this, _arguments| {
         let state = take(this.as_mut_state());

phper-build/src/lib.rs

@@ -13,6 +13,11 @@
 
 use phper_sys::*;
 
+pub fn register_all() {
+    register_link_args();
+    register_configures();
+}
+
 /// Register useful rust cfg for project using phper.
 pub fn register_configures() {
     // versions
@@ -37,3 +42,11 @@ pub fn register_configures() {
         println!("cargo:rustc-cfg=phper_zts");
     }
 }
+
+pub fn register_link_args() {
+    #[cfg(target_os = "macos")]
+    {
+        println!("cargo:rustc-link-arg=-undefined");
+        println!("cargo:rustc-link-arg=dynamic_lookup");
+    }
+}

phper-doc/doc/_04_zval/index.md

@@ -40,9 +40,6 @@ Otherwise, there are also composite types that implement `From`.
 - `From<Option<T>>`: if Some(T), T will be converted to PHP type like `From<T>`,
   or `None` wll be converted to `null`.
 
-- `From<Result<T, E>>`: if Ok(T), T will be converted to PHP type like `From<T>`,
-  or `Err(e)` will throw an Exception by calling `zend_throw_exception`.
-
 ### Example
 
 ```rust,no_run

phper-sys/build.rs

@@ -59,7 +59,7 @@ fn main() {
     builder
         .generate()
         .expect("Unable to generate bindings")
-        .write_to_file(&generated_path)
+        .write_to_file(generated_path)
         .expect("Unable to write output file");
 }
 

phper-test/src/cli.rs

@@ -69,7 +69,7 @@ pub fn test_php_scripts_with_condition(
             stderr.push_str("<empty>");
         }
 
-        println!(
+        eprintln!(
             "===== command =====\n{} {}\n===== stdout ======\n{}\n===== stderr ======\n{}",
             &context.php_bin,
             cmd.get_args().join(" "),
@@ -79,7 +79,7 @@ pub fn test_php_scripts_with_condition(
         #[cfg(target_os = "linux")]
         if output.status.code().is_none() {
             use std::os::unix::process::ExitStatusExt;
-            println!(
+            eprintln!(
                 "===== signal ======\nExitStatusExt is None, the signal is: {:?}",
                 output.status.signal()
             );

phper-test/src/fpm.rs

@@ -66,11 +66,11 @@ pub fn setup(lib_path: impl AsRef<Path>) {
             "-y",
             fpm_conf_file.path().to_str().unwrap(),
         ];
-        println!("===== setup php-fpm =====\n{}", argv.join(" "));
+        eprintln!("===== setup php-fpm =====\n{}", argv.join(" "));
 
         let child = spawn_command(&argv, Some(Duration::from_secs(3)));
         let log = fs::read_to_string("/tmp/.php-fpm.log").unwrap();
-        println!("===== php-fpm log =====\n{}", log);
+        eprintln!("===== php-fpm log =====\n{}", log);
         // fs::remove_file("/tmp/.php-fpm.log").unwrap();
 
         Mutex::new(FpmHandle {
@@ -165,7 +165,7 @@ pub fn test_fpm_request(
                     .unwrap_or_else(|_| "<not utf8 string>".to_owned())
             };
 
-            println!(
+            eprintln!(
                 "===== request =====\n{}\n===== stdout ======\n{}\n===== stderr ======\n{}",
                 request_uri,
                 f(stdout),

phper/src/arrays.rs

@@ -375,6 +375,7 @@ pub enum IterKey<'a> {
     ZStr(&'a ZStr),
 }
 
+#[allow(clippy::unnecessary_cast)]
 unsafe extern "C" fn for_each_callback(
     idx: zend_ulong, key: *mut zend_string, val: *mut zval, argument: *mut c_void,
 ) {

phper/src/classes.rs

@@ -12,7 +12,7 @@
 
 use crate::{
     arrays::ZArr,
-    errors::{ClassNotFoundError, InitializeObjectError},
+    errors::{ClassNotFoundError, InitializeObjectError, Throwable},
     functions::{Function, FunctionEntry, Method, MethodEntity},
     objects::{StateObj, StateObject, ZObj, ZObject},
     strings::ZStr,
@@ -206,24 +206,26 @@ impl<T: 'static> ClassEntity<T> {
         }
     }
 
-    pub fn add_method<F, R>(
+    pub fn add_method<F, Z, E>(
         &mut self, name: impl Into<String>, vis: Visibility, handler: F,
     ) -> &mut MethodEntity
     where
-        F: Fn(&mut StateObj<T>, &mut [ZVal]) -> R + Send + Sync + 'static,
-        R: Into<ZVal> + 'static,
+        F: Fn(&mut StateObj<T>, &mut [ZVal]) -> Result<Z, E> + 'static,
+        Z: Into<ZVal> + 'static,
+        E: Throwable + 'static,
     {
         self.method_entities
             .push(MethodEntity::new(name, Rc::new(Method::new(handler)), vis));
         self.method_entities.last_mut().unwrap()
     }
 
-    pub fn add_static_method<F, R>(
+    pub fn add_static_method<F, Z, E>(
         &mut self, name: impl Into<String>, vis: Visibility, handler: F,
     ) -> &mut MethodEntity
     where
-        F: Fn(&mut [ZVal]) -> R + Send + Sync + 'static,
-        R: Into<ZVal> + 'static,
+        F: Fn(&mut [ZVal]) -> Result<Z, E> + 'static,
+        Z: Into<ZVal> + 'static,
+        E: Throwable + 'static,
     {
         let mut entity = MethodEntity::new(name, Rc::new(Function::new(handler)), vis);
         entity.r#static(true);