Migrate to edition 2024

Cargo.toml

@@ -27,10 +27,10 @@ members = [
 [workspace.package]
 version = "0.14.1"
 authors = ["PHPER Framework Team", "jmjoy <jmjoy@apache.org>"]
-edition = "2021"
+edition = "2024"
 license = "MulanPSL-2.0"
 repository = "https://github.com/phper-framework/phper"
-rust-version = "1.79"
+rust-version = "1.85"
 
 [workspace.dependencies]
 phper = { version = "0.14.1", path = "./phper" }

README.md

@@ -18,36 +18,33 @@ The framework that allows us to write PHP extensions using pure and safe Rust wh
 
 ### Necessary
 
-- **rust** 1.79 or later
+- **rust** 1.85 or later
 - **libclang** 9.0 or later
 - **php** 7.0 or later
 
 ### Tested Support
 
-- **OS**
-  - [x] linux
-  - [x] macos
-  - [ ] ~~windows~~
-- **PHP**
-  - **version**
-    - [x] 7.0
-    - [x] 7.1
-    - [x] 7.2
-    - [x] 7.3
-    - [x] 7.4
-    - [x] 8.0
-    - [x] 8.1
-    - [x] 8.2
-    - [x] 8.3
-  - **mode**
-    - [x] nts
-    - [ ] ~~zts~~
-  - **sapi**
-    - [x] cli
-    - [x] fpm
-  - **debug**
-    - [x] disable
-    - [ ] ~~enable~~
+| **Category**    | **Item** | **Status** |
+| --------------- | -------- | ---------- |
+| **OS**          | Linux    | ✅          |
+|                 | macOS    | ✅          |
+|                 | Windows  | ❌          |
+| **PHP Version** | 7.0      | ✅          |
+|                 | 7.1      | ✅          |
+|                 | 7.2      | ✅          |
+|                 | 7.3      | ✅          |
+|                 | 7.4      | ✅          |
+|                 | 8.0      | ✅          |
+|                 | 8.1      | ✅          |
+|                 | 8.2      | ✅          |
+|                 | 8.3      | ✅          |
+|                 | 8.4      | ✅          |
+| **PHP Mode**    | NTS      | ✅          |
+|                 | ZTS      | ❌          |
+| **SAPI**        | CLI      | ✅          |
+|                 | FPM      | ✅          |
+| **Debug**       | Disable  | ✅          |
+|                 | Enable   | ❌          |
 
 ## Examples
 

examples/complex/src/lib.rs

@@ -12,7 +12,7 @@ use phper::{
     arrays::ZArray,
     classes::{ClassEntity, Visibility},
     functions::Argument,
-    ini::{ini_get, Policy},
+    ini::{Policy, ini_get},
     modules::Module,
     objects::StateObj,
     php_get_module,

examples/http-client/Cargo.toml

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

examples/http-client/src/errors.rs

@@ -10,7 +10,7 @@
 
 use phper::{
     classes::{ClassEntity, ClassEntry},
-    errors::{exception_class, Throwable},
+    errors::{Throwable, exception_class},
 };
 
 /// The exception class name of extension.

examples/http-server/Cargo.toml

@@ -22,13 +22,13 @@ name = "http_server"
 crate-type = ["lib", "cdylib"]
 
 [dependencies]
-hyper = { version = "1.4.1", features = ["http1", "server"] }
-axum = "0.7.5"
+hyper = { version = "1.6.0", features = ["http1", "server"] }
+axum = "0.8.1"
 phper = { workspace = true }
-thiserror = "1.0.63"
-tokio = { version = "1.39.2", features = ["full"] }
-reqwest = { version = "0.12.5", features = ["blocking"] }
+thiserror = "2.0.11"
+tokio = { version = "1.43.0", features = ["full"] }
+reqwest = { version = "0.12.12", features = ["blocking"] }
 
 [dev-dependencies]
 phper-test = { workspace = true }
-reqwest = "0.12.5"
+reqwest = "0.12.12"

examples/http-server/src/errors.rs

@@ -10,7 +10,7 @@
 
 use phper::{
     classes::{ClassEntity, ClassEntry},
-    errors::{exception_class, Throwable},
+    errors::{Throwable, exception_class},
 };
 use std::error::Error;
 

examples/http-server/src/server.rs

@@ -10,10 +10,10 @@
 
 use crate::{errors::HttpServerError, request::RequestClass, response::ResponseClass};
 use axum::{
+    Router,
     body::{self, Body},
     http::{Request, Response, StatusCode},
     routing::any,
-    Router,
 };
 use phper::{
     alloc::ToRefOwned,

phper-alloc/src/lib.rs

@@ -18,7 +18,7 @@ mod macros;
 use phper_sys::*;
 use std::{
     borrow::Borrow,
-    mem::{size_of, ManuallyDrop},
+    mem::{ManuallyDrop, size_of},
     ops::{Deref, DerefMut},
 };
 

phper-alloc/src/macros.rs

@@ -17,7 +17,5 @@
 /// ```
 #[macro_export]
 macro_rules! ebox {
-    ($arg:tt) => {{
-        $crate::EBox::new($arg)
-    }};
+    ($arg:tt) => {{ $crate::EBox::new($arg) }};
 }

phper-doc/Cargo.toml

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

phper-doc/doc/_03_integrate_with_pecl/index.md

@@ -10,8 +10,7 @@ This chapter will guide you on how to integrate the phper project with `pecl` an
 
 ### Adapt to `phpize`
 
-1. At first, imagine you have finished the hello project follow [write your first extension](_02_quick_start::_01_write_your_first_extension), can build the
-php extension `.so` file successfully.
+1. At first, imagine you have finished the hello project follow [write your first extension](_02_quick_start::_01_write_your_first_extension), can build the php extension `.so` file successfully.
 
 1. And then, create the `config.m4` file using by `phpize` (In theory,
    `config.w32` is also required for compatibility with Windows, but now phper

phper-doc/doc/_05_internal_types/_01_z_str/index.md

@@ -50,7 +50,7 @@ use phper::sys;
 use phper::strings::ZStr;
 use phper::alloc::ToRefOwned;
 
-extern "C" {
+unsafe extern "C" {
     fn something() -> *mut sys::zend_string;
 }
 

phper-doc/doc/_05_internal_types/_02_z_arr/index.md

@@ -66,7 +66,7 @@ use phper::sys;
 use phper::arrays::ZArr;
 use phper::alloc::ToRefOwned;
 
-extern "C" {
+unsafe extern "C" {
     fn something() -> *mut sys::zend_array;
 }
 

phper-doc/doc/_05_internal_types/_03_z_obj/index.md

@@ -26,7 +26,7 @@ use phper::sys;
 use phper::objects::ZObj;
 use phper::alloc::ToRefOwned;
 
-extern "C" {
+unsafe extern "C" {
     fn something() -> *mut sys::zend_object;
 }
 

phper-macros/Cargo.toml

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

phper-macros/src/inner.rs

@@ -10,7 +10,7 @@
 
 use proc_macro::TokenStream;
 use quote::quote;
-use syn::{parse_macro_input, ItemFn, Visibility};
+use syn::{ItemFn, Visibility, parse_macro_input};
 
 pub(crate) fn php_get_module(_attr: TokenStream, input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as ItemFn);
@@ -31,7 +31,7 @@ pub(crate) fn php_get_module(_attr: TokenStream, input: TokenStream) -> TokenStr
     }
 
     let result = quote! {
-        #[no_mangle]
+        #[unsafe(no_mangle)]
         #[doc(hidden)]
         #(#attrs)*
         #vis extern "C" fn #name() -> *const ::phper::sys::zend_module_entry {

phper-sys/Cargo.toml

@@ -20,7 +20,6 @@ repository = { workspace = true }
 license = { workspace = true }
 
 [build-dependencies]
-bindgen = "0.69.4"
-cc = "1.1.7"
-home = "=0.5.9"
-regex = "1.10.6"
+bindgen = "0.71.1"
+cc = "1.2.14"
+regex = "1.11.1"

phper-sys/src/lib.rs

@@ -16,6 +16,8 @@
 // TODO Because `bindgen` generates codes contains deref nullptr, temporary suppression.
 #![allow(deref_nullptr)]
 #![allow(clippy::all)]
+// TODO unsafe_op_in_unsafe_fn warning in edition 2024, temporary suppression.
+#![allow(unsafe_op_in_unsafe_fn)]
 #![doc = include_str!("../README.md")]
 
 include!(concat!(env!("OUT_DIR"), "/php_bindings.rs"));

phper-test/Cargo.toml

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

phper-test/src/cli.rs

@@ -12,7 +12,7 @@
 
 use crate::context::Context;
 use std::{
-    panic::{catch_unwind, resume_unwind, UnwindSafe},
+    panic::{UnwindSafe, catch_unwind, resume_unwind},
     path::Path,
     process::{Child, Output},
 };
@@ -41,8 +41,7 @@ pub type ScriptCondition<'a> = (&'a dyn AsRef<Path>, &'a dyn Fn(Output) -> bool)
 /// checkers are pass, than the test is pass.
 ///
 /// - `exec_path` is the path of the make executable, which will be used to
-///   detect the path of
-/// extension lib.
+///   detect the path of extension lib.
 ///
 /// - `scripts` is the slice of the tuple, format is `(path of your php test
 ///   script, checker function or closure)`.
@@ -93,6 +92,7 @@ pub fn test_php_scripts_with_condition(
 
 /// Check your extension by executing the long term php script such as http
 /// server, if the all your specified checkers are pass, than the test is pass.
+#[allow(clippy::zombie_processes)]
 pub fn test_long_term_php_script_with_condition(
     lib_path: impl AsRef<Path>, script: impl AsRef<Path>,
     condition: impl FnOnce(&Child) + UnwindSafe,

phper-test/src/context.rs

@@ -98,7 +98,7 @@ impl Context {
                 .and_then(|name| {
                     let mut p = p.to_path_buf();
                     p.push("sbin");
-                    p.push(&format!(
+                    p.push(format!(
                         "php-fpm{}",
                         if name.starts_with("php") {
                             name.chars().skip(3).collect::<String>()

phper-test/src/fpm.rs

@@ -11,11 +11,11 @@
 //! Test tools for php fpm program.
 use crate::{context::Context, utils::spawn_command};
 use fastcgi_client::{Client, Params, Request};
-use libc::{atexit, kill, pid_t, SIGTERM};
+use libc::{SIGTERM, atexit, kill, pid_t};
 use once_cell::sync::OnceCell;
 use std::{
     fs,
-    mem::{forget, ManuallyDrop},
+    mem::{ManuallyDrop, forget},
     path::{Path, PathBuf},
     process::Child,
     sync::Mutex,

phper/Cargo.toml

@@ -23,13 +23,13 @@ license = { workspace = true }
 
 [dependencies]
 cfg-if = "1.0.0"
-derive_more = "0.99.18"
-indexmap = "2.3.0"
-once_cell = "1.19.0"
+derive_more = { version = "2.0.1", features = ["from", "constructor"] }
+indexmap = "2.7.1"
+once_cell = "1.20.3"
 phper-alloc = { workspace = true }
 phper-macros = { workspace = true }
 phper-sys = { workspace = true }
-thiserror = "1.0.63"
+thiserror = "2.0.11"
 
 [build-dependencies]
 phper-build = { workspace = true }