Skip to content

Commit 282992c

Browse files
committed
chore: unfork ext-php-rs
With this, we are now using the mainline ext-php-rs. All features have been upstreamed at this point, so we can archive our fork.
1 parent e6d81ac commit 282992c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

crates/php/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ path = "src/main.rs"
1414
[dependencies]
1515
bytes = "1.10.1"
1616
hostname = "0.4.1"
17-
ext-php-rs = { git = "https://github.com/platformatic/ext-php-rs.git" }
18-
# ext-php-rs = { path = "../../../ext-php-rs" }
17+
ext-php-rs = { version = "0.14.0", features = ["embed"] }
1918
lang_handler = { path = "../lang_handler", features = ["napi"] }
2019
libc = "0.2.171"
2120
once_cell = "1.21.0"

crates/php/src/sapi.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ use bytes::Buf;
1010
use ext_php_rs::{
1111
alloc::{efree, estrdup},
1212
builders::SapiBuilder,
13-
embed::SapiModule,
13+
embed::{
14+
ext_php_rs_sapi_per_thread_init, ext_php_rs_sapi_shutdown, ext_php_rs_sapi_startup, SapiModule,
15+
},
1416
// exception::register_error_observer,
1517
ffi::{
16-
ext_php_rs_sapi_per_thread_init, ext_php_rs_sapi_shutdown, ext_php_rs_sapi_startup,
1718
php_module_shutdown, php_module_startup, php_register_variable, sapi_send_headers,
1819
sapi_shutdown, sapi_startup, ZEND_RESULT_CODE_SUCCESS,
1920
},

0 commit comments

Comments
 (0)