Update and adapt phper. (#66)

apache · Apr 15, 2023 · cbb98fe · cbb98fe
1 parent b3e7290
commit cbb98fe
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -44,7 +44,7 @@ futures-util = "0.3.27"
 hostname = "0.3.1"
 libc = "0.2.140"
 once_cell = "1.17.1"
-phper = "0.10.2"
+phper = "0.11.0"
 prost = "0.11.8"
 serde_json = { version = "1.0.94", features = ["preserve_order"] }
 skywalking = { version = "0.6.0", features = ["management"] }

diff --git a/dist-material/LICENSE b/dist-material/LICENSE
@@ -578,11 +578,11 @@ MulanPSL-2.0 licenses
 The following components are provided under the MulanPSL-2.0 License. See project link for details.
 The text of each license is also included in licenses/LICENSE-[project].txt.
 
-    https://crates.io/crates/phper/0.10.2 0.10.2 MulanPSL-2.0
-    https://crates.io/crates/phper-alloc/0.10.2 0.10.2 MulanPSL-2.0
-    https://crates.io/crates/phper-build/0.10.2 0.10.2 MulanPSL-2.0
-    https://crates.io/crates/phper-macros/0.10.2 0.10.2 MulanPSL-2.0
-    https://crates.io/crates/phper-sys/0.10.2 0.10.2 MulanPSL-2.0
+    https://crates.io/crates/phper/0.11.0 0.11.0 MulanPSL-2.0
+    https://crates.io/crates/phper-alloc/0.11.0 0.11.0 MulanPSL-2.0
+    https://crates.io/crates/phper-build/0.11.0 0.11.0 MulanPSL-2.0
+    https://crates.io/crates/phper-macros/0.11.0 0.11.0 MulanPSL-2.0
+    https://crates.io/crates/phper-sys/0.11.0 0.11.0 MulanPSL-2.0
 
 ========================================================================
 Unlicense licenses

diff --git a/src/execute.rs b/src/execute.rs
@@ -303,7 +303,7 @@ fn infer_request_id(execute_data: &mut ExecuteData) -> Option<i64> {
             prev_execute_data_ptr = unsafe { (*prev_execute_data_ptr).prev_execute_data };
             continue;
         }
-        let Some(request) = prev_execute_data.get_parameter(0).as_mut_z_obj() else {
+        let Some(request) = prev_execute_data.get_mut_parameter(0).as_mut_z_obj() else {
             return None;
         };
         match request.get_mut_property("fd").as_long() {

diff --git a/src/plugin/plugin_amqplib.rs b/src/plugin/plugin_amqplib.rs
@@ -143,7 +143,7 @@ impl AmqplibPlugin {
         let sw_header = RequestContext::try_get_sw_header(request_id)?;
 
         let message = execute_data
-            .get_parameter(0)
+            .get_mut_parameter(0)
             .as_mut_z_obj()
             .context("message isn't object")?;
 

diff --git a/src/plugin/plugin_curl.rs b/src/plugin/plugin_curl.rs
@@ -110,7 +110,7 @@ impl CurlPlugin {
                 let options = execute_data.get_parameter(1).as_long();
 
                 if options == Some(SKY_CURLOPT_HTTPHEADER) {
-                    *execute_data.get_parameter(1) = CURLOPT_HTTPHEADER.into();
+                    *execute_data.get_mut_parameter(1) = CURLOPT_HTTPHEADER.into();
                 } else if options == Some(CURLOPT_HTTPHEADER) {
                     let value = execute_data.get_parameter(2);
                     if value.get_type_info().is_array() {

diff --git a/src/plugin/plugin_predis.rs b/src/plugin/plugin_predis.rs
@@ -186,7 +186,7 @@ impl PredisPlugin {
                 let peer = format!("{}:{}", host, port);
 
                 let handle = this.handle();
-                let command = execute_data.get_parameter(0).expect_mut_z_obj()?;
+                let command = execute_data.get_mut_parameter(0).expect_mut_z_obj()?;
                 let command_class_name = command
                     .get_class()
                     .get_name()

diff --git a/src/plugin/plugin_redis.rs b/src/plugin/plugin_redis.rs
@@ -217,7 +217,7 @@ impl RedisPlugin {
                 }
 
                 let host = {
-                    let mut f = || {
+                    let f = || {
                         Ok::<_, anyhow::Error>(
                             execute_data
                                 .get_parameter(0)
@@ -236,7 +236,7 @@ impl RedisPlugin {
                     }
                 };
                 let port = {
-                    let mut f = || {
+                    let f = || {
                         execute_data
                             .get_parameter(1)
                             .as_long()

diff --git a/src/plugin/plugin_swoole.rs b/src/plugin/plugin_swoole.rs
@@ -58,7 +58,7 @@ impl SwooleServerPlugin {
 
                 // Hack the closure with the
                 // [`crate::request::skywalking_hack_swoole_on_request`].
-                let closure = execute_data.get_parameter(1);
+                let closure = execute_data.get_mut_parameter(1);
                 let ori_closure = replace(
                     closure,
                     ZVal::from(ZString::new(