Passing tests.

Author: jmjoy

.github/workflows/ci.yml

@@ -75,9 +75,3 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: doc
-
-      - name: Cargo test example simple
-        uses: actions-rs/cargo@v1
-        with:
-          command: make
-          args: test-php --cwd examples/simple --profile production

examples/simple/src/lib.rs

@@ -35,7 +35,7 @@ static INI_ENTRIES: IniEntries<2> = IniEntries::new([
 fn m_init_simple(args: ModuleArgs) -> bool {
     args.register_ini_entries(&INI_ENTRIES);
     MY_CLASS_CE.init(c_str_ptr!("MyClass"), &MY_CLASS_METHODS);
-    MY_CLASS_CE.declare_property("foo", 3, ZEND_ACC_PUBLIC);
+    MY_CLASS_CE.declare_property("foo", "3", ZEND_ACC_PUBLIC);
     true
 }
 
@@ -125,15 +125,14 @@ static MY_CLASS_METHODS: FunctionEntries<1> = FunctionEntries::new([zend_functio
 pub fn my_class_foo(execute_data: ExecuteData) -> impl SetVal {
     execute_data.parse_parameters::<&str>().map(|prefix| {
         let this = execute_data.get_this();
+        assert_ne!(this as *mut _, null_mut());
 
         let foo = unsafe {
             zend_read_property(MY_CLASS_CE.get(), this, c_str_ptr!("foo"), 3, 1, null_mut())
         };
-        // let foo = Val::from_raw(foo);
-        // let foo = foo.as_c_str().unwrap().to_str().unwrap();
-        // format!("{}{}", prefix, foo)
-
-        ""
+        let foo = Val::from_raw(foo);
+        let foo = foo.as_c_str().unwrap().to_str().unwrap();
+        format!("{}{}", prefix, foo)
     })
 }
 

examples/simple/tests/integration.rs

@@ -1,5 +1,5 @@
 use phper_test::test_php_scripts;
-use std::{env, ffi::OsStr, fmt::Debug, path::Path, process::Command, sync::Once};
+use std::{env, path::Path};
 
 #[test]
 fn test_php() {

examples/simple/tests/php/test.php

@@ -4,6 +4,12 @@
 ini_set("display_startup_errors", "On");
 error_reporting(E_ALL);
 
-var_dump(get_extension_funcs('simple'));
-var_dump(test_simple("aaa", "bbb"));
-var_dump((new MyClass())->foo("foo-"));
+assert_eq(get_extension_funcs('simple'), ["test_simple"]);
+assert_eq(test_simple("aaa", "bbb"), "a = aaa, a_len = 3, b = bbb, b_len = 3");
+assert_eq((new MyClass())->foo("foo-"), "foo-3");
+
+function assert_eq($left, $right) {
+    if ($left !== $right) {
+        throw new Exception("left != right,\n left: {$left},\n right: {$right};");
+    }
+}

phper-test/Cargo.toml

@@ -12,5 +12,4 @@ keywords = ["php", "binding"]
 
 [dependencies]
 once_cell = "1.5.2"
-serde_json = "1.0.59"
 tempfile = "3.1.0"

phper-test/src/lib.rs

@@ -1,9 +1,8 @@
 use once_cell::sync::OnceCell;
-use serde_json::Value;
 use std::{
-    env, ffi::OsStr, fmt::Debug, fs::read_to_string, io, io::Write, path::Path, process::Command,
+    env, ffi::OsStr, fmt::Debug, fs::read_to_string, io::Write, path::Path, process::Command,
 };
-use tempfile::{tempfile, NamedTempFile};
+use tempfile::NamedTempFile;
 
 pub fn test_php_scripts(
     target_dir: impl AsRef<Path>,
@@ -12,7 +11,7 @@ pub fn test_php_scripts(
 ) {
     let context = php_context();
 
-    let mut lib_path = target_dir
+    let lib_path = target_dir
         .as_ref()
         .join(if cfg!(debug_assertions) {
             "debug"
@@ -39,19 +38,21 @@ pub fn test_php_scripts(
             .arg(out_ini_temp_file.path())
             .arg(script);
         let output = cmd.output().unwrap();
+        let path = script.to_str().unwrap();
+
+        println!(
+            "test php file: {}\nstdout: {}\nstderr: {}",
+            path,
+            String::from_utf8(output.stdout).unwrap(),
+            String::from_utf8(output.stderr).unwrap()
+        );
         if !output.status.success() {
-            eprintln!(
-                "stdout: {}\nstderr: {}",
-                String::from_utf8(output.stdout).unwrap(),
-                String::from_utf8(output.stderr).unwrap()
-            );
-            panic!("test php file `{}` failed", script.to_str().unwrap());
+            panic!("test php file `{}` failed", path);
         }
     }
 }
 
 struct Context {
-    php_config: String,
     php_bin: String,
     ini_content: String,
 }
@@ -85,7 +86,6 @@ fn php_context() -> &'static Context {
         }
 
         Context {
-            php_config,
             php_bin,
             ini_content,
         }