From 9a31a3724a465ff31e7940bd1c266f27f0e0951b Mon Sep 17 00:00:00 2001 From: Joel Wurtz Date: Sun, 9 Mar 2025 22:42:37 +0100 Subject: [PATCH 1/2] chore(test): fix embed test on php 8.4 --- src/embed/mod.rs | 2 +- tests/module.rs | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/embed/mod.rs b/src/embed/mod.rs index 3d3258d0e3..0a9cf18c15 100644 --- a/src/embed/mod.rs +++ b/src/embed/mod.rs @@ -255,7 +255,7 @@ mod tests { #[test] #[should_panic] fn test_panic() { - Embed::run(|| { + Embed::run::<(), _>(|| { panic!("test panic"); }); } diff --git a/tests/module.rs b/tests/module.rs index 6407f998e6..8e14484375 100644 --- a/tests/module.rs +++ b/tests/module.rs @@ -10,7 +10,13 @@ use ext_php_rs::prelude::*; fn test_module() { Embed::run(|| { // Allow to load the module - unsafe { zend_register_module_ex(get_module()) }; + cfg_if::cfg_if! { + if #[cfg(php84)] { + unsafe { zend_register_module_ex(get_module(), 2) }; + } else { + unsafe { zend_register_module_ex(get_module()) }; + } + } let result = Embed::eval("$foo = hello_world('foo');"); From bb6d7270fcffc7484baf1d54afd4c14fde81121c Mon Sep 17 00:00:00 2001 From: Xenira <1288524+Xenira@users.noreply.github.com> Date: Wed, 12 Mar 2025 23:30:38 +0100 Subject: [PATCH 2/2] docs: add comment explaining int param --- tests/module.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/module.rs b/tests/module.rs index 8e14484375..8b2378b5cd 100644 --- a/tests/module.rs +++ b/tests/module.rs @@ -2,6 +2,8 @@ #![cfg(feature = "embed")] extern crate ext_php_rs; +use cfg_if::cfg_if; + use ext_php_rs::embed::Embed; use ext_php_rs::ffi::zend_register_module_ex; use ext_php_rs::prelude::*; @@ -10,8 +12,9 @@ use ext_php_rs::prelude::*; fn test_module() { Embed::run(|| { // Allow to load the module - cfg_if::cfg_if! { + cfg_if! { if #[cfg(php84)] { + // Register as temporary (2) module unsafe { zend_register_module_ex(get_module(), 2) }; } else { unsafe { zend_register_module_ex(get_module()) };