Separate into two examples.

Author: jmjoy

Cargo.toml

@@ -8,5 +8,6 @@ members = [
     "phper-test",
 
     # internal
-    "examples/simple",
+    "examples/hello",
+    "examples/hello-class",
 ]

examples/hello-class/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "hello_class"
+version = "0.2.0"
+authors = ["jmjoy <[email protected]>"]
+edition = "2018"
+publish = false
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+phper = { version = "0.2", path = "../../phper" }
+
+[dev-dependencies]
+phper-test = { version = "0.2", path = "../../phper-test" }
+
+[build-dependencies]
+phper-build = { version = "0.2", path = "../../phper-build" }

examples/simple/Makefile.toml renamed to examples/hello-class/Makefile.toml

@@ -19,7 +19,6 @@ args = ["build", "${BUILD_ARGS}"]
 [tasks.test]
 command = "cargo"
 args = ["test", "${TEST_ARGS}", "--", "--nocapture"]
-env = { "LIB_SO" = "${TARGET_BUILD_DIR}/lib${CARGO_MAKE_CRATE_NAME}.so" }
 
 [tasks.install]
 dependencies = ["build"]

examples/simple/build.rs renamed to examples/hello-class/build.rs

@@ -0,0 +1,146 @@
+use phper::{
+    c_str_ptr, php_fn, php_function, php_minfo, php_minfo_function, php_minit, php_minit_function,
+    php_mshutdown, php_mshutdown_function, php_rinit, php_rinit_function, php_rshutdown,
+    php_rshutdown_function,
+    sys::{
+        php_info_print_table_end, php_info_print_table_row, php_info_print_table_start,
+        zend_function_entry, OnUpdateBool, OnUpdateString, PHP_INI_SYSTEM,
+    },
+    zend::{
+        api::{FunctionEntries, ModuleGlobals},
+        compile::{create_zend_arg_info, MultiInternalArgInfo, Visibility},
+        ini::IniEntries,
+        modules::{create_zend_module_entry, ModuleArgs, ModuleEntry},
+        types::{ClassEntry, ExecuteData, SetVal, Value},
+    },
+    zend_get_module,
+};
+use std::{os::raw::c_char, ptr::null};
+
+static HELLO_CLASS_CE: ClassEntry = ClassEntry::new();
+
+static HELLO_CLASS_ENABLE: ModuleGlobals<bool> = ModuleGlobals::new(false);
+static HELLO_CLASS_DESCRIPTION: ModuleGlobals<*const c_char> = ModuleGlobals::new(null());
+
+static INI_ENTRIES: IniEntries<2> = IniEntries::new([
+    HELLO_CLASS_ENABLE.create_ini_entry_def(
+        "hello_class.enable",
+        "1",
+        Some(OnUpdateBool),
+        PHP_INI_SYSTEM,
+    ),
+    HELLO_CLASS_DESCRIPTION.create_ini_entry_def(
+        "hello_class.description",
+        "",
+        Some(OnUpdateString),
+        PHP_INI_SYSTEM,
+    ),
+]);
+
+#[php_minit_function]
+fn module_init(args: ModuleArgs) -> bool {
+    args.register_ini_entries(&INI_ENTRIES);
+    HELLO_CLASS_CE.init("HelloClass", &HELLO_CLASS_METHODS);
+    HELLO_CLASS_CE.declare_property("name", "world", Visibility::Public);
+    true
+}
+
+#[php_mshutdown_function]
+fn module_shutdown(args: ModuleArgs) -> bool {
+    args.unregister_ini_entries();
+    true
+}
+
+#[php_rinit_function]
+fn request_init(_args: ModuleArgs) -> bool {
+    true
+}
+
+#[php_rshutdown_function]
+fn request_shutdown(_args: ModuleArgs) -> bool {
+    true
+}
+
+#[php_minfo_function]
+fn module_info(module: &ModuleEntry) {
+    unsafe {
+        php_info_print_table_start();
+        php_info_print_table_row(
+            2,
+            c_str_ptr!("hello_class.version"),
+            (*module.as_ptr()).version,
+        );
+        php_info_print_table_row(
+            2,
+            c_str_ptr!("hello_class.build_id"),
+            (*module.as_ptr()).build_id,
+        );
+        php_info_print_table_row(
+            2,
+            c_str_ptr!("hello_class.enable"),
+            if HELLO_CLASS_ENABLE.get() {
+                c_str_ptr!("1")
+            } else {
+                c_str_ptr!("0")
+            },
+        );
+        php_info_print_table_row(
+            2,
+            c_str_ptr!("hello_class.description"),
+            HELLO_CLASS_DESCRIPTION.get(),
+        );
+        php_info_print_table_end();
+    }
+}
+
+static ARG_INFO_HELLO_CLASS_SAY_HELLO: MultiInternalArgInfo<1> =
+    MultiInternalArgInfo::new([create_zend_arg_info(c_str_ptr!("prefix"), false)], false);
+
+static HELLO_CLASS_METHODS: FunctionEntries<1> = FunctionEntries::new([zend_function_entry {
+    fname: c_str_ptr!("sayHello"),
+    handler: Some(php_fn!(hello_class_get_hello)),
+    arg_info: ARG_INFO_HELLO_CLASS_SAY_HELLO.as_ptr(),
+    num_args: 1,
+    flags: 0,
+}]);
+
+#[php_function]
+pub fn hello_class_get_hello(execute_data: &mut ExecuteData) -> impl SetVal {
+    execute_data.parse_parameters::<()>().map(|_| {
+        let this = execute_data.get_this();
+        let val = HELLO_CLASS_CE.read_property(this, "name");
+        let value = val.try_into_value().unwrap();
+
+        if let Value::CStr(value) = value {
+            Some(format!("Hello, {}!", value.to_str().unwrap()))
+        } else {
+            None
+        }
+    })
+}
+
+static FUNCTION_ENTRIES: FunctionEntries<1> = FunctionEntries::new([zend_function_entry {
+    fname: c_str_ptr!("hello_class_get_hello"),
+    handler: Some(php_fn!(hello_class_get_hello)),
+    arg_info: null(),
+    num_args: 0,
+    flags: 0,
+}]);
+
+static MODULE_ENTRY: ModuleEntry = ModuleEntry::new(create_zend_module_entry(
+    c_str_ptr!(env!("CARGO_PKG_NAME")),
+    c_str_ptr!(env!("CARGO_PKG_VERSION")),
+    FUNCTION_ENTRIES.as_ptr(),
+    Some(php_minit!(module_init)),
+    Some(php_mshutdown!(module_shutdown)),
+    Some(php_rinit!(request_init)),
+    Some(php_rshutdown!(request_shutdown)),
+    Some(php_minfo!(module_info)),
+    None,
+    None,
+));
+
+#[zend_get_module]
+pub fn get_module() -> &'static ModuleEntry {
+    &MODULE_ENTRY
+}

examples/hello-class/src/lib.rs

@@ -4,9 +4,7 @@
 ini_set("display_startup_errors", "On");
 error_reporting(E_ALL);
 
-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())->hello("hello, "), "hello, world");
+assert_eq((new HelloClass())->sayHello(), "Hello, world!");
 
 function assert_eq($left, $right) {
     if ($left !== $right) {

examples/simple/tests/integration.rs renamed to examples/hello-class/tests/integration.rs

@@ -1,5 +1,5 @@
 [package]
-name = "simple"
+name = "hello"
 version = "0.2.0"
 authors = ["jmjoy <[email protected]>"]
 edition = "2018"

examples/simple/tests/php/test.php renamed to examples/hello-class/tests/php/test.php

@@ -0,0 +1,30 @@
+[env]
+PHP_CONFIG = "php-config"
+TARGET_DIR = "${CARGO_MAKE_WORKING_DIRECTORY}/../../target"
+
+[env.development]
+TARGET_BUILD_DIR = "${TARGET_DIR}/debug"
+BUILD_ARGS = "--"
+TEST_ARGS = "--"
+
+[env.production]
+TARGET_BUILD_DIR = "${TARGET_DIR}/release"
+BUILD_ARGS = "--release"
+TEST_ARGS = "--release"
+
+[tasks.build]
+command = "cargo"
+args = ["build", "${BUILD_ARGS}"]
+
+[tasks.test]
+command = "cargo"
+args = ["test", "${TEST_ARGS}", "--", "--nocapture"]
+
+[tasks.install]
+dependencies = ["build"]
+script = [
+    """
+    cp ${TARGET_BUILD_DIR}/lib${CARGO_MAKE_CRATE_NAME}.so `${PHP_CONFIG} --extension-dir`/${CARGO_MAKE_CRATE_NAME}.so && \
+    echo Installing shared extensions:     `${PHP_CONFIG} --extension-dir`
+    """
+]

examples/simple/Cargo.toml renamed to examples/hello/Cargo.toml

@@ -0,0 +1,3 @@
+fn main() {
+    phper_build::register_configures();
+}