Pass exmaples hello integation test.

Author: jmjoy

examples/hello/tests/integration.rs

@@ -3,17 +3,11 @@ use std::{env, path::Path};
 
 #[test]
 fn test_php() {
-    dbg!(env!("CARGO_BIN_EXE_hello"));
-    dbg!(env::current_exe());
-    // test_php_scripts(
-    //     Path::new(env!("CARGO_MANIFEST_DIR"))
-    //         .join("..")
-    //         .join("..")
-    //         .join("target"),
-    //     env!("CARGO_PKG_NAME"),
-    //     &[Path::new(env!("CARGO_MANIFEST_DIR"))
-    //         .join("tests")
-    //         .join("php")
-    //         .join("test.php")],
-    // );
+    test_php_scripts(
+        env!("CARGO_BIN_EXE_hello"),
+        &[Path::new(env!("CARGO_MANIFEST_DIR"))
+            .join("tests")
+            .join("php")
+            .join("test.php")],
+    );
 }

examples/hello/tests/php/test.php

@@ -4,8 +4,26 @@
 ini_set("display_startup_errors", "On");
 error_reporting(E_ALL);
 
-assert_eq(get_extension_funcs('hello'), ["say_hello"]);
-assert_eq(say_hello("world"), "Hello, world!");
+assert_eq(hello_say_hello("world"), "Hello, world!\n");
+
+assert_eq(class_exists("PHPerException"), true);
+
+try {
+    hello_throw_exception();
+} catch (PHPerException $e) {
+    assert_eq($e->getMessage(), "I am sorry");
+}
+
+assert_eq(hello_get_all_ini(), [
+    "hello.enable" => true,
+    "hello.description" => "hello world.",
+]);
+
+$foo = new FooClass();
+assert_eq($foo->getFoo(), 100);
+
+$foo->setFoo("Hello");
+assert_eq($foo->getFoo(), "Hello");
 
 function assert_eq($left, $right) {
     if ($left !== $right) {

phper-test/src/lib.rs

@@ -3,22 +3,17 @@ use std::{
     env, ffi::OsStr, fmt::Debug, fs::read_to_string, io::Write, path::Path, process::Command,
 };
 use tempfile::NamedTempFile;
+use std::ffi::OsString;
+use std::path::PathBuf;
+use std::error::Error;
 
 pub fn test_php_scripts(
-    target_dir: impl AsRef<Path>,
-    lib_name: &str,
+    exe_path: impl AsRef<Path>,
     scripts: &[impl AsRef<Path>],
 ) {
     let context = php_context();
 
-    let lib_path = target_dir
-        .as_ref()
-        .join(if cfg!(debug_assertions) {
-            "debug"
-        } else {
-            "release"
-        })
-        .join(format!("lib{}.so", lib_name));
+    let lib_path = get_lib_path(exe_path);
 
     let mut out_ini_temp_file = NamedTempFile::new().unwrap();
     let out_ini_file = out_ini_temp_file.as_file_mut();
@@ -117,3 +112,16 @@ fn execute_command<S: AsRef<OsStr> + Debug>(argv: &[S]) -> String {
         .stdout;
     String::from_utf8(output).unwrap().trim().to_owned()
 }
+
+fn get_lib_path(exe_path: impl AsRef<Path>) -> PathBuf {
+    let exe_path = exe_path.as_ref();
+    let exe_stem = exe_path.file_stem().expect("failed to get current exe stem");
+    let target_dir = exe_path.parent().expect("failed to get current exe directory");
+
+    let mut ext_name = OsString::new();
+    ext_name.push("lib");
+    ext_name.push(exe_stem);
+    ext_name.push(".so");
+
+    target_dir.join(ext_name)
+}

phper/src/arrays.rs

@@ -18,11 +18,15 @@ impl Array {
         Self { inner }
     }
 
+    pub fn as_ptr(&self) -> *const zend_array {
+        self.inner.deref()
+    }
+
     pub fn insert(&mut self, key: impl AsRef<str>, value: &mut Val) {
         let key = key.as_ref();
         unsafe {
             zend_hash_str_update(
-                &mut *self.inner,
+                self.inner.deref_mut(),
                 key.as_ptr().cast(),
                 key.len(),
                 value.as_mut(),

phper/src/errors.rs

@@ -39,7 +39,7 @@ pub trait Throwable: error::Error {
     fn code(&self) -> u64;
 }
 
-pub(crate) const EXCEPTION_CLASS_NAME: &'static str = "\\Phper\\Exception\\ErrorException";
+pub(crate) const EXCEPTION_CLASS_NAME: &'static str = "PHPerException";
 
 impl Throwable for Error {
     fn class_entity(&self) -> *const ClassEntity {

phper/src/values.rs

@@ -34,7 +34,7 @@ impl ExecuteData {
         &mut *(ptr as *mut Self)
     }
 
-    pub fn as_mut(&mut self) -> *mut zend_execute_data {
+    pub fn as_mut_ptr(&mut self) -> *mut zend_execute_data {
         &mut self.inner
     }
 
@@ -213,7 +213,7 @@ impl SetVal for String {
 impl SetVal for Array {
     fn set_val(&self, val: &mut Val) {
         unsafe {
-            phper_zval_arr(val.as_mut(), &self as *const _ as *mut _);
+            phper_zval_arr(val.as_mut(), self.as_ptr() as *mut _);
         }
     }
 }