Skip to content

Commit a5e26bb

Browse files
committed
Migrate to edition 2024
1 parent 901d6a7 commit a5e26bb

File tree

29 files changed

+762
-694
lines changed

29 files changed

+762
-694
lines changed

Cargo.lock

Lines changed: 177 additions & 193 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ members = [
2727
[workspace.package]
2828
version = "0.14.1"
2929
authors = ["PHPER Framework Team", "jmjoy <[email protected]>"]
30-
edition = "2021"
30+
edition = "2024"
3131
license = "MulanPSL-2.0"
3232
repository = "https://github.com/phper-framework/phper"
33-
rust-version = "1.79"
33+
rust-version = "1.85"
3434

3535
[workspace.dependencies]
3636
phper = { version = "0.14.1", path = "./phper" }

examples/http-client/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ crate-type = ["lib", "cdylib"]
2323

2424
[dependencies]
2525
phper = { workspace = true }
26-
reqwest = { version = "0.12.5", features = ["blocking", "cookies"] }
27-
thiserror = "1.0.63"
26+
reqwest = { version = "0.12.12", features = ["blocking", "cookies"] }
27+
thiserror = "2.0.11"
2828

2929
[dev-dependencies]
3030
phper-test = { workspace = true }

examples/http-server/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ name = "http_server"
2222
crate-type = ["lib", "cdylib"]
2323

2424
[dependencies]
25-
hyper = { version = "1.4.1", features = ["http1", "server"] }
26-
axum = "0.7.5"
25+
hyper = { version = "1.6.0", features = ["http1", "server"] }
26+
axum = "0.8.1"
2727
phper = { workspace = true }
28-
thiserror = "1.0.63"
29-
tokio = { version = "1.39.2", features = ["full"] }
30-
reqwest = { version = "0.12.5", features = ["blocking"] }
28+
thiserror = "2.0.11"
29+
tokio = { version = "1.43.0", features = ["full"] }
30+
reqwest = { version = "0.12.12", features = ["blocking"] }
3131

3232
[dev-dependencies]
3333
phper-test = { workspace = true }
34-
reqwest = "0.12.5"
34+
reqwest = "0.12.12"

phper-doc/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ license = { workspace = true }
2323
phper = { workspace = true }
2424

2525
[dev-dependencies]
26-
thiserror = "1.0.63"
27-
reqwest = { version = "0.12.5", features = ["blocking", "cookies"] }
26+
thiserror = "2.0.11"
27+
reqwest = { version = "0.12.12", features = ["blocking", "cookies"] }

phper-doc/doc/_03_integrate_with_pecl/index.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ This chapter will guide you on how to integrate the phper project with `pecl` an
1010

1111
### Adapt to `phpize`
1212

13-
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
14-
php extension `.so` file successfully.
13+
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.
1514

1615
1. And then, create the `config.m4` file using by `phpize` (In theory,
1716
`config.w32` is also required for compatibility with Windows, but now phper

phper-macros/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ license = { workspace = true }
2323
proc-macro = true
2424

2525
[dependencies]
26-
quote = "1.0.36"
27-
syn = { version = "2.0.72", features = ["full"] }
28-
proc-macro2 = "1.0.86"
26+
quote = "1.0.38"
27+
syn = { version = "2.0.98", features = ["full"] }
28+
proc-macro2 = "1.0.93"
2929

3030
[dev-dependencies]
31-
syn = { version = "2.0.72", features = ["full", "extra-traits"] }
31+
syn = { version = "2.0.98", features = ["full", "extra-traits"] }

phper-macros/src/inner.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub(crate) fn php_get_module(_attr: TokenStream, input: TokenStream) -> TokenStr
3131
}
3232

3333
let result = quote! {
34-
#[no_mangle]
34+
#[unsafe(no_mangle)]
3535
#[doc(hidden)]
3636
#(#attrs)*
3737
#vis extern "C" fn #name() -> *const ::phper::sys::zend_module_entry {

phper-sys/Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ repository = { workspace = true }
2020
license = { workspace = true }
2121

2222
[build-dependencies]
23-
bindgen = "0.69.4"
24-
cc = "1.1.7"
25-
home = "=0.5.9"
26-
regex = "1.10.6"
23+
bindgen = "0.71.1"
24+
cc = "1.2.14"
25+
regex = "1.11.1"

phper-test/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ license = { workspace = true }
2121

2222
[dependencies]
2323
fastcgi-client = "0.9.0"
24-
libc = "0.2.155"
25-
once_cell = "1.19.0"
24+
libc = "0.2.169"
25+
once_cell = "1.20.3"
2626
phper-macros = { workspace = true }
27-
tempfile = "3.11.0"
28-
tokio = { version = "1.39.2", features = ["full"] }
27+
tempfile = "3.17.1"
28+
tokio = { version = "1.43.0", features = ["full"] }
2929

3030
[package.metadata.docs.rs]
3131
rustdoc-args = ["--cfg", "docsrs"]

0 commit comments

Comments
 (0)