feat(embed): disable embed for php 80 + phpzts

Author: joelwurtz

build.rs

@@ -22,6 +22,11 @@ use impl_::Provider;
 const MIN_PHP_API_VER: u32 = 20200930;
 const MAX_PHP_API_VER: u32 = 20240924;
 
+const PHP_81_API_VER: u32 = 20210902;
+const PHP_82_API_VER: u32 = 20220829;
+const PHP_83_API_VER: u32 = 20230831;
+const PHP_84_API_VER: u32 = 20240924;
+
 /// Provides information about the PHP installation.
 pub trait PHPProvider<'a>: Sized {
     /// Create a new PHP provider.
@@ -178,11 +183,15 @@ fn build_embed(defines: &[(&str, &str)], includes: &[PathBuf]) -> Result<()> {
 }
 
 /// Generates bindings to the Zend API.
-fn generate_bindings(defines: &[(&str, &str)], includes: &[PathBuf]) -> Result<String> {
+fn generate_bindings(
+    defines: &[(&str, &str)],
+    includes: &[PathBuf],
+    #[allow(unused)] info: &PHPInfo,
+) -> Result<String> {
     let mut bindgen = bindgen::Builder::default();
 
     #[cfg(feature = "embed")]
-    {
+    if !info.thread_safety()? || info.zend_version()? >= PHP_81_API_VER {
         bindgen = bindgen.header("src/embed/embed.h");
     }
 
@@ -245,13 +254,6 @@ fn check_php_version(info: &PHPInfo) -> Result<()> {
     //
     // The PHP version cfg flags should also stack - if you compile on PHP 8.2 you
     // should get both the `php81` and `php82` flags.
-    const PHP_81_API_VER: u32 = 20210902;
-
-    const PHP_82_API_VER: u32 = 20220829;
-
-    const PHP_83_API_VER: u32 = 20230831;
-
-    const PHP_84_API_VER: u32 = 20240924;
 
     println!(
         "cargo::rustc-check-cfg=cfg(php80, php81, php82, php83, php84, php_zts, php_debug, docs)"
@@ -324,9 +326,11 @@ fn main() -> Result<()> {
     build_wrapper(&defines, &includes)?;
 
     #[cfg(feature = "embed")]
-    build_embed(&defines, &includes)?;
+    if !info.thread_safety()? || info.zend_version()? >= PHP_81_API_VER {
+        build_embed(&defines, &includes)?;
+    }
 
-    let bindings = generate_bindings(&defines, &includes)?;
+    let bindings = generate_bindings(&defines, &includes, &info)?;
 
     let out_file =
         File::create(&out_path).context("Failed to open output bindings file for writing")?;

src/builders/mod.rs

@@ -4,11 +4,11 @@
 mod class;
 mod function;
 mod module;
-#[cfg(feature = "embed")]
+#[cfg(all(feature = "embed", any(php81, not(php_zts))))]
 mod sapi;
 
 pub use class::ClassBuilder;
 pub use function::FunctionBuilder;
 pub use module::{ModuleBuilder, ModuleStartup};
-#[cfg(feature = "embed")]
+#[cfg(all(feature = "embed", any(php81, not(php_zts))))]
 pub use sapi::SapiBuilder;

src/lib.rs

@@ -25,7 +25,7 @@ pub mod class;
 pub mod closure;
 pub mod constant;
 pub mod describe;
-#[cfg(feature = "embed")]
+#[cfg(all(feature = "embed", any(php81, not(php_zts))))]
 pub mod embed;
 #[doc(hidden)]
 pub mod internal;

src/types/iterator.rs

@@ -183,7 +183,7 @@ impl<'a> FromZvalMut<'a> for &'a mut ZendIterator {
 }
 
 #[cfg(test)]
-#[cfg(feature = "embed")]
+#[cfg(all(feature = "embed", any(php81, not(php_zts))))]
 mod tests {
     use crate::embed::Embed;
 

src/types/string.rs

@@ -456,7 +456,7 @@ impl<'a> FromZval<'a> for &'a str {
 }
 
 #[cfg(test)]
-#[cfg(feature = "embed")]
+#[cfg(all(feature = "embed", any(php81, not(php_zts))))]
 mod tests {
     use crate::embed::Embed;
 

src/zend/mod.rs

@@ -34,7 +34,7 @@ pub use ini_entry_def::IniEntryDef;
 pub use linked_list::ZendLinkedList;
 pub use module::ModuleEntry;
 pub use streams::*;
-#[cfg(feature = "embed")]
+#[cfg(all(feature = "embed", any(php81, not(php_zts))))]
 pub(crate) use try_catch::panic_wrapper;
 pub use try_catch::{bailout, try_catch, try_catch_first};
 

src/zend/try_catch.rs

@@ -102,7 +102,7 @@ pub unsafe fn bailout() -> ! {
     ext_php_rs_zend_bailout();
 }
 
-#[cfg(feature = "embed")]
+#[cfg(all(feature = "embed", any(php81, not(php_zts))))]
 #[cfg(test)]
 mod tests {
     use crate::embed::Embed;

tests/module.rs

@@ -1,5 +1,6 @@
 #![cfg_attr(windows, feature(abi_vectorcall))]
-#![cfg(feature = "embed")]
+#![cfg(all(feature = "embed", any(php81, not(php_zts))))]
+
 extern crate ext_php_rs;
 
 use cfg_if::cfg_if;

tests/sapi.rs

@@ -1,5 +1,6 @@
 #![cfg_attr(windows, feature(abi_vectorcall))]
-#![cfg(feature = "embed")]
+#![cfg(all(feature = "embed", any(php81, not(php_zts))))]
+
 extern crate ext_php_rs;
 
 use ext_php_rs::builders::SapiBuilder;