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

Author: jmjoy

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
         os:
           - ubuntu-latest
         php-version:
-          - "7.0"
+#          - "7.0"
           - "7.1"
           - "7.2"
           - "7.3"

Cargo.toml

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

README.md

@@ -1,7 +1,7 @@
 # PHPer
 
 [![crates](https://img.shields.io/crates/v/phper?style=flat-square)](https://crates.io/crates/phper)
-[![](https://img.shields.io/docsrs/phper?style=flat-square)](https://docs.rs/phper)
+[![docs](https://img.shields.io/docsrs/phper?style=flat-square)](https://docs.rs/phper)
 
 A library that allows us to write PHP extensions using pure Rust and using safe Rust whenever possible.
 
@@ -17,35 +17,35 @@ A library that allows us to write PHP extensions using pure Rust and using safe
 
 **os**
 
--[x] linux
--[ ] macos
--[ ] windows
+- [x] linux
+- [ ] macos
+- [ ] windows
 
 **php**
 
 *version*
 
--[x] 7.0
--[x] 7.1
--[x] 7.2
--[x] 7.3
--[x] 7.4
--[x] 8.0
+- [ ] 7.0
+- [x] 7.1
+- [x] 7.2
+- [x] 7.3
+- [x] 7.4
+- [x] 8.0
 
 *mode*
 
--[x] nts
--[ ] zts
+- [x] nts
+- [ ] zts
 
 *sapi*
 
--[x] cli
--[ ] fpm
+- [x] cli
+- [ ] fpm
 
 *debug*
 
--[x] disable
--[ ] enable
+- [x] disable
+- [ ] enable
 
 ## Usage
 

examples/hello/src/lib.rs

@@ -1,7 +1,6 @@
 use phper::{
-    alloc::EBox,
     arrays::Array,
-    classes::StdClass,
+    classes::DynamicClass,
     functions::Argument,
     ini::Policy,
     modules::{Module, ModuleArgs},
@@ -57,26 +56,26 @@ pub fn get_module() -> Module {
             let hello_description = Val::new(Module::get_str_ini("hello.description"));
             arr.insert("hello.description", hello_description);
 
-            EBox::new(arr)
+            arr
         },
         vec![],
     );
 
     // register classes
-    let mut foo_class = StdClass::new();
+    let mut foo_class = DynamicClass::new();
     foo_class.add_property("foo", "100".to_string());
     foo_class.add_method(
         "getFoo",
-        |this: &mut Object, _: &mut [Val]| -> phper::Result<Val> {
+        |this: &mut Object<()>, _: &mut [Val]| -> phper::Result<Val> {
             let prop = this.get_property("foo");
             Ok(Val::new(prop.as_string_value()?))
         },
         vec![],
     );
     foo_class.add_method(
         "setFoo",
-        |this: &mut Object, arguments: &mut [Val]| -> phper::Result<()> {
-            this.set_property("foo", arguments[0].as_string_value()?);
+        |this: &mut Object<()>, arguments: &mut [Val]| -> phper::Result<()> {
+            this.set_property("foo", Val::new(arguments[0].as_string_value()?));
             Ok(())
         },
         vec![Argument::by_val("foo")],

examples/hello/tests/php/test.php

@@ -6,11 +6,9 @@
 
 assert_eq(hello_say_hello("world"), "Hello, world!\n");
 
-assert_eq(class_exists("Phper\\OtherException"), true);
-
 try {
     hello_throw_exception();
-} catch (Phper\OtherException $e) {
+} catch (ErrorException $e) {
     assert_eq($e->getMessage(), "I am sorry");
 }
 

examples/http-client/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "mini-curl"
+name = "http-client"
 version = "0.0.0"
 authors = ["jmjoy <918734043@qq.com>"]
 edition = "2018"

examples/http-client/src/lib.rs

@@ -1,4 +1,4 @@
-use phper::{classes::StdClass, modules::Module, php_get_module};
+use phper::{classes::DynamicClass, modules::Module, php_get_module};
 
 pub mod http_client;
 
@@ -11,7 +11,7 @@ pub fn get_module() -> Module {
     );
 
     // let client = HttpClient::new();
-    let client_class = StdClass::new();
+    let client_class: DynamicClass<()> = DynamicClass::new();
     module.add_class("HttpClient", client_class);
 
     module

examples/log/Cargo.toml renamed to examples/logging/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "log"
+name = "logging"
 version = "0.0.0"
 authors = ["jmjoy <918734043@qq.com>"]
 edition = "2018"