Merge pull request #9 from jmjoy/0.2.0-alpha.2-dev

Author: jmjoy

.github/workflows/ci.yml

@@ -40,7 +40,7 @@ jobs:
           tools: php-config
 
       - name: PHP version
-        run: php-config --version && php-config --phpapi && php --version
+        run: php-config || true
 
       - name: Install Rust Nightly
         uses: actions-rs/toolchain@v1

.gitignore

@@ -3,3 +3,4 @@
 Cargo.lock
 /.cargo
 /vendor
+/core

Cargo.toml

@@ -9,5 +9,7 @@ members = [
 
     # internal
     "examples/hello",
-#    "examples/mini-curl",
+    "examples/log",
+    "examples/http-client",
+    "tests/integration",
 ]

README.md

@@ -17,26 +17,35 @@ A library that allows us to write PHP extensions using pure Rust and using safe
 
 **os**
 
-- linux
+-[x] linux
+-[ ] macos
+-[ ] windows
 
 **php**
 
 *version*
 
-- 7.0
-- 7.1
-- 7.2
-- 7.3
-- 7.4
-- 8.0
+-[x] 7.0
+-[x] 7.1
+-[x] 7.2
+-[x] 7.3
+-[x] 7.4
+-[x] 8.0
 
 *mode*
 
-- nts
+-[x] nts
+-[ ] zts
 
 *sapi*
 
-- cli
+-[x] cli
+-[ ] fpm
+
+*debug*
+
+-[x] disable
+-[ ] enable
 
 ## Usage
 
@@ -79,13 +88,16 @@ fn main() {
 use phper::{php_get_module, modules::Module};
 
 #[php_get_module]
-pub fn get_module(module: &mut Module) {
-    // set module metadata
-    module.set_name(env!("CARGO_PKG_NAME"));
-    module.set_version(env!("CARGO_PKG_VERSION"));
-    module.set_author(env!("CARGO_PKG_AUTHORS"));
+pub fn get_module() -> Module {
+    let mut module = Module::new(
+        env!("CARGO_PKG_NAME"),
+        env!("CARGO_PKG_VERSION"),
+        env!("CARGO_PKG_AUTHORS"),
+    );
 
     // ...
+
+    module
 }
 ```
 

examples/hello/Cargo.toml

@@ -12,10 +12,10 @@ license = "Unlicense"
 crate-type = ["cdylib"]
 
 [dependencies]
-phper = { version = "0.2.0-alpha.1", path = "../../phper" }
+phper = { version = "0.2.0-alpha.2", path = "../../phper" }
 
 [dev-dependencies]
-phper-test = { version = "0.2.0-alpha.1", path = "../../phper-test" }
+phper-test = { version = "0.2.0-alpha.2", path = "../../phper-test" }
 
 [build-dependencies]
-phper-build = { version = "0.2.0-alpha.1", path = "../../phper-build" }
+phper-build = { version = "0.2.0-alpha.2", path = "../../phper-build" }

examples/hello/LICENSE

@@ -0,0 +1 @@
+../../LICENSE

examples/hello/README.md

@@ -26,3 +26,7 @@ cargo test --release
 ```bash
 cargo run --release -- install
 ```
+
+## License
+
+[Unlicense](https://github.com/jmjoy/phper/blob/master/LICENSE).

examples/hello/src/lib.rs

@@ -1,32 +1,35 @@
 use phper::{
+    alloc::EBox,
     arrays::Array,
-    classes::{StdClass, This},
+    classes::StdClass,
     functions::Argument,
     ini::Policy,
     modules::{Module, ModuleArgs},
+    objects::Object,
     php_get_module,
-    values::{SetVal, Val},
+    values::Val,
 };
 
 fn module_init(_args: ModuleArgs) -> bool {
     true
 }
 
-fn say_hello(arguments: &mut [Val]) -> impl SetVal {
-    let name = arguments[0].as_string();
-    format!("Hello, {}!\n", name)
+fn say_hello(arguments: &mut [Val]) -> phper::Result<String> {
+    let name = arguments[0].as_string_value()?;
+    Ok(format!("Hello, {}!\n", name))
 }
 
 fn throw_exception(_: &mut [Val]) -> phper::Result<()> {
     Err(phper::Error::other("I am sorry"))
 }
 
 #[php_get_module]
-pub fn get_module(module: &mut Module) {
-    // set module metadata
-    module.set_name(env!("CARGO_PKG_NAME"));
-    module.set_version(env!("CARGO_PKG_VERSION"));
-    module.set_author(env!("CARGO_PKG_AUTHORS"));
+pub fn get_module() -> Module {
+    let mut module = Module::new(
+        env!("CARGO_PKG_NAME"),
+        env!("CARGO_PKG_VERSION"),
+        env!("CARGO_PKG_AUTHORS"),
+    );
 
     // register module ini
     module.add_bool_ini("hello.enable", false, Policy::All);
@@ -48,35 +51,37 @@ pub fn get_module(module: &mut Module) {
         |_: &mut [Val]| {
             let mut arr = Array::new();
 
-            let mut hello_enable = Val::new(Module::get_bool_ini("hello.enable"));
-            arr.insert("hello.enable", &mut hello_enable);
+            let hello_enable = Val::new(Module::get_bool_ini("hello.enable"));
+            arr.insert("hello.enable", hello_enable);
 
-            let mut hello_description = Val::new(Module::get_str_ini("hello.description"));
-            arr.insert("hello.description", &mut hello_description);
+            let hello_description = Val::new(Module::get_str_ini("hello.description"));
+            arr.insert("hello.description", hello_description);
 
-            arr
+            EBox::new(arr)
         },
         vec![],
     );
 
     // register classes
     let mut foo_class = StdClass::new();
-    foo_class.add_property("foo", 100);
+    foo_class.add_property("foo", "100".to_string());
     foo_class.add_method(
         "getFoo",
-        |this: &mut This, _: &mut [Val]| {
+        |this: &mut Object, _: &mut [Val]| -> phper::Result<Val> {
             let prop = this.get_property("foo");
-            Val::from_val(prop)
+            Ok(Val::new(prop.as_string_value()?))
         },
         vec![],
     );
     foo_class.add_method(
         "setFoo",
-        |this: &mut This, arguments: &mut [Val]| {
-            let prop = this.get_property("foo");
-            prop.set(&arguments[0]);
+        |this: &mut Object, arguments: &mut [Val]| -> phper::Result<()> {
+            this.set_property("foo", arguments[0].as_string_value()?);
+            Ok(())
         },
         vec![Argument::by_val("foo")],
     );
     module.add_class("FooClass", foo_class);
+
+    module
 }

examples/hello/tests/integration.rs

@@ -5,7 +5,7 @@ use std::{env, path::Path};
 fn test_php() {
     test_php_scripts(
         env!("CARGO_BIN_EXE_hello"),
-        &[Path::new(env!("CARGO_MANIFEST_DIR"))
+        &[&Path::new(env!("CARGO_MANIFEST_DIR"))
             .join("tests")
             .join("php")
             .join("test.php")],

examples/hello/tests/php/test.php

@@ -6,11 +6,11 @@
 
 assert_eq(hello_say_hello("world"), "Hello, world!\n");
 
-assert_eq(class_exists("PHPerException"), true);
+assert_eq(class_exists("Phper\\OtherException"), true);
 
 try {
     hello_throw_exception();
-} catch (PHPerException $e) {
+} catch (Phper\OtherException $e) {
     assert_eq($e->getMessage(), "I am sorry");
 }
 
@@ -20,7 +20,8 @@
 ]);
 
 $foo = new FooClass();
-assert_eq($foo->getFoo(), 100);
+// TODO change '100' to 100.
+assert_eq($foo->getFoo(), '100');
 
 $foo->setFoo("Hello");
 assert_eq($foo->getFoo(), "Hello");