Upgrade MSRV and dependencies

Author: jmjoy

Cargo.toml

@@ -30,7 +30,7 @@ authors = ["PHPER Framework Team", "jmjoy <[email protected]>"]
 edition = "2021"
 license = "MulanPSL-2.0"
 repository = "https://github.com/phper-framework/phper"
-rust-version = "1.65"
+rust-version = "1.79"
 
 [workspace.dependencies]
 phper = { version = "0.13.1", path = "./phper" }

examples/http-client/Cargo.toml

@@ -23,8 +23,8 @@ crate-type = ["lib", "cdylib"]
 
 [dependencies]
 phper = { workspace = true }
-reqwest = { version = "0.11.18", features = ["blocking", "cookies"] }
-thiserror = "1.0.43"
+reqwest = { version = "0.12.5", features = ["blocking", "cookies"] }
+thiserror = "1.0.63"
 
 [dev-dependencies]
 phper-test = { workspace = true }

examples/http-server/Cargo.toml

@@ -22,13 +22,13 @@ name = "http_server"
 crate-type = ["lib", "cdylib"]
 
 [dependencies]
-hyper = { version = "0.14.27", features = ["http1", "runtime", "server"] }
-axum = "0.6.19"
+hyper = { version = "1.4.1", features = ["http1", "server"] }
+axum = "0.7.5"
 phper = { workspace = true }
-thiserror = "1.0.43"
-tokio = { version = "1.29.1", features = ["full"] }
-reqwest = { version = "0.11.18", features = ["blocking"] }
+thiserror = "1.0.63"
+tokio = { version = "1.39.2", features = ["full"] }
+reqwest = { version = "0.12.5", features = ["blocking"] }
 
 [dev-dependencies]
 phper-test = { workspace = true }
-reqwest = "0.11.18"
+reqwest = "0.12.5"

examples/http-server/src/server.rs

@@ -10,20 +10,19 @@
 
 use crate::{errors::HttpServerError, request::new_request_object, response::new_response_object};
 use axum::{
-    body::Body,
+    body::{self, Body},
     http::{Request, Response, StatusCode},
     routing::any,
-    Router, Server,
+    Router,
 };
-use hyper::body;
 use phper::{
     alloc::ToRefOwned,
     classes::{ClassEntity, Visibility},
     functions::Argument,
     values::ZVal,
 };
-use std::{cell::RefCell, collections::HashMap, net::SocketAddr};
-use tokio::runtime::{self};
+use std::{cell::RefCell, collections::HashMap, error::Error, net::SocketAddr};
+use tokio::{net::TcpListener, runtime};
 
 const HTTP_SERVER_CLASS_NAME: &str = "HttpServer\\HttpServer";
 
@@ -95,7 +94,9 @@ pub fn make_server_class() -> ClassEntity<()> {
                         let (parts, body) = req.into_parts();
 
                         // Read all request body content.
-                        let body = body::to_bytes(body).await.map_err(HttpServerError::new)?;
+                        let body = body::to_bytes(body, usize::MAX)
+                            .await
+                            .map_err(HttpServerError::new)?;
 
                         // Create PHP `HttpServer\HttpRequest` object.
                         let mut request = new_request_object()?;
@@ -148,9 +149,9 @@ pub fn make_server_class() -> ClassEntity<()> {
             );
 
             // Start the http server.
-            let server = Server::bind(&addr).serve(app.into_make_service());
-
-            server.await
+            let listener = TcpListener::bind(addr).await?;
+            axum::serve(listener, app).await?;
+            Ok::<_, Box<dyn Error>>(())
         };
 
         // Build the tokio runtime, with the current thread scheduler, block on

phper-doc/Cargo.toml

@@ -23,5 +23,5 @@ license = { workspace = true }
 phper = { workspace = true }
 
 [dev-dependencies]
-thiserror = "1.0.43"
-reqwest = { version = "0.11.18", features = ["blocking", "cookies"] }
+thiserror = "1.0.63"
+reqwest = { version = "0.12.5", features = ["blocking", "cookies"] }

phper-macros/Cargo.toml

@@ -23,9 +23,9 @@ license = { workspace = true }
 proc-macro = true
 
 [dependencies]
-quote = "1.0.31"
-syn = { version = "2.0.26", features = ["full"] }
-proc-macro2 = "1.0.66"
+quote = "1.0.36"
+syn = { version = "2.0.72", features = ["full"] }
+proc-macro2 = "1.0.86"
 
 [dev-dependencies]
-syn = { version = "2.0.26", features = ["full", "extra-traits"] }
+syn = { version = "2.0.72", features = ["full", "extra-traits"] }

phper-sys/Cargo.toml

@@ -20,6 +20,6 @@ repository = { workspace = true }
 license = { workspace = true }
 
 [build-dependencies]
-bindgen = "0.69.1"
-cc = "1.0.79"
-regex = "1.5.6"
+bindgen = "0.69.4"
+cc = "1.1.7"
+regex = "1.10.6"

phper-test/Cargo.toml

@@ -21,11 +21,11 @@ license = { workspace = true }
 
 [dependencies]
 fastcgi-client = "0.9.0"
-libc = "0.2.147"
-once_cell = "1.18.0"
+libc = "0.2.155"
+once_cell = "1.19.0"
 phper-macros = { workspace = true }
-tempfile = "3.6.0"
-tokio = { version = "1.29.1", features = ["full"] }
+tempfile = "3.11.0"
+tokio = { version = "1.39.2", features = ["full"] }
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]

phper-test/src/context.rs

@@ -22,6 +22,7 @@ use tempfile::NamedTempFile;
 
 pub struct Context {
     pub php_bin: String,
+    #[allow(dead_code)]
     pub ini_content: String,
 }
 

phper/Cargo.toml

@@ -22,13 +22,13 @@ repository = { workspace = true }
 license = { workspace = true }
 
 [dependencies]
-derive_more = "0.99.17"
-indexmap = "2.0.0"
-once_cell = "1.18.0"
+derive_more = "0.99.18"
+indexmap = "2.3.0"
+once_cell = "1.19.0"
 phper-alloc = { workspace = true }
 phper-macros = { workspace = true }
 phper-sys = { workspace = true }
-thiserror = "1.0.43"
+thiserror = "1.0.63"
 
 [build-dependencies]
 phper-build = { workspace = true }

phper/src/functions.rs

@@ -25,7 +25,7 @@ use phper_alloc::ToRefOwned;
 use std::{
     ffi::{CStr, CString},
     marker::PhantomData,
-    mem::{transmute, zeroed},
+    mem::{transmute, zeroed, ManuallyDrop},
     ptr::{self, null_mut},
     rc::Rc,
 };
@@ -473,7 +473,11 @@ unsafe extern "C" fn invoke(execute_data: *mut zend_execute_data, return_value:
     let mut arguments = execute_data.get_parameters_array();
     let arguments = arguments.as_mut_slice();
 
-    handler.call(execute_data, transmute(arguments), return_value);
+    handler.call(
+        execute_data,
+        transmute::<&mut [ManuallyDrop<ZVal>], &mut [ZVal]>(arguments),
+        return_value,
+    );
 }
 
 /// Call user function by name.

phper/src/modules.rs

@@ -193,7 +193,8 @@ impl Module {
 
     /// Register class to module.
     pub fn add_class<T>(&mut self, class: ClassEntity<T>) {
-        self.class_entities.push(unsafe { transmute(class) });
+        self.class_entities
+            .push(unsafe { transmute::<ClassEntity<T>, ClassEntity<()>>(class) });
     }
 
     /// Register interface to module.

rust-toolchain.toml

@@ -9,5 +9,5 @@
 # See the Mulan PSL v2 for more details.
 
 [toolchain]
-channel = "1.65"
+channel = "1.79"
 components = ["clippy", "rustfmt"]

tests/integration/Cargo.toml

@@ -21,7 +21,7 @@ license = { workspace = true }
 crate-type = ["lib", "cdylib"]
 
 [dependencies]
-indexmap = "2.0.0"
+indexmap = "2.3.0"
 phper = { workspace = true }
 
 [dev-dependencies]

tests/integration/src/classes.rs

@@ -104,7 +104,7 @@ fn integrate_foo(module: &mut Module) {
         .add_method("offsetExists", Visibility::Public, |this, arguments| {
             let offset = arguments[0].expect_long()?;
             let state = this.as_state();
-            Ok::<_, phper::Error>(state.array.get(&offset).is_some())
+            Ok::<_, phper::Error>(state.array.contains_key(&offset))
         })
         .argument(Argument::by_val("offset"));