Merge branch 'master' into request-global

Author: Xenira

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        php: ["8.0", "8.1", "8.2", "8.3"]
+        php: ["8.0", "8.1", "8.2", "8.3", "8.4"]
         rust: [stable, nightly]
         clang: ["15", "17"]
         phpts: [ts, nts]

build.rs

@@ -16,7 +16,7 @@ use bindgen::RustTarget;
 use impl_::Provider;
 
 const MIN_PHP_API_VER: u32 = 20200930;
-const MAX_PHP_API_VER: u32 = 20230831;
+const MAX_PHP_API_VER: u32 = 20240924;
 
 pub trait PHPProvider<'a>: Sized {
     /// Create a new PHP provider.
@@ -229,9 +229,13 @@ fn check_php_version(info: &PHPInfo) -> Result<()> {
     const PHP_82_API_VER: u32 = 20220829;
 
     const PHP_83_API_VER: u32 = 20230831;
-
-    println!("cargo::rustc-check-cfg=cfg(php80, php81, php82, php83, php_zts, php_debug, docs)");
-
+  
+    const PHP_84_API_VER: u32 = 20240924;
+  
+    println!(
+        "cargo::rustc-check-cfg=cfg(php80, php81, php82, php83, php84, php_zts, php_debug, docs)"
+    );
+  
     if version < PHP_81_API_VER {
         println!("cargo:rustc-cfg=php80");
     }
@@ -244,10 +248,14 @@ fn check_php_version(info: &PHPInfo) -> Result<()> {
         println!("cargo:rustc-cfg=php82");
     }
 
-    if version >= PHP_83_API_VER {
+    if (PHP_83_API_VER..PHP_84_API_VER).contains(&version) {
         println!("cargo:rustc-cfg=php83");
     }
 
+    if version >= PHP_84_API_VER {
+        println!("cargo:rustc-cfg=php84");
+    }
+
     Ok(())
 }
 

crates/cli/.gitignore

@@ -0,0 +1,6 @@
+/target
+Cargo.lock
+/.vscode
+/.idea
+/tmp
+expand.rs

crates/cli/.gitignore

@@ -0,0 +1,6 @@
+/target
+Cargo.lock
+/.vscode
+/.idea
+/tmp
+expand.rs

crates/macros/.gitignore

@@ -187,7 +187,7 @@ pub fn parse_attribute(attr: &Attribute) -> Result<Option<ParsedAttribute>> {
     Ok(Some(match name.as_ref() {
         "defaults" => {
             let defaults = HashMap::from_meta(&meta)
-                .map_err(|_| anyhow!("Unable to parse `#[default]` macro."))?;
+                .map_err(|_| anyhow!("Unable to parse `#[defaults]` macro."))?;
             ParsedAttribute::Default(defaults)
         }
         "optional" => {

crates/macros/.gitignore

@@ -55,6 +55,10 @@ impl<'a> FunctionBuilder<'a> {
                 arg_info: ptr::null(),
                 num_args: 0,
                 flags: 0, // TBD?
+                #[cfg(php84)]
+                doc_comment: ptr::null(),
+                #[cfg(php84)]
+                frameless_function_infos: ptr::null(),
             },
             args: vec![],
             n_req: None,
@@ -79,6 +83,10 @@ impl<'a> FunctionBuilder<'a> {
                 arg_info: ptr::null(),
                 num_args: 0,
                 flags: MethodFlags::Abstract.bits(),
+                #[cfg(php84)]
+                doc_comment: ptr::null(),
+                #[cfg(php84)]
+                frameless_function_infos: ptr::null(),
             },
             args: vec![],
             n_req: None,

crates/macros/src/impl_.rs

@@ -38,6 +38,10 @@ impl FunctionEntry {
             arg_info: ptr::null(),
             num_args: 0,
             flags: 0,
+            #[cfg(php84)]
+            doc_comment: ptr::null(),
+            #[cfg(php84)]
+            frameless_function_infos: ptr::null(),
         }
     }
 

src/builders/function.rs

@@ -238,9 +238,18 @@ impl ZendObjectHandlers {
                         let mut zv = Zval::new();
                         val.get(self_, &mut zv)?;
 
-                        #[allow(clippy::unnecessary_mut_passed)]
-                        if zend_is_true(&mut zv) == 1 {
-                            return Ok(1);
+                        cfg_if::cfg_if! {
+                            if #[cfg(php84)] {
+                                #[allow(clippy::unnecessary_mut_passed)]
+                                if zend_is_true(&mut zv) == true {
+                                    return Ok(1);
+                                }
+                            } else {
+                                #[allow(clippy::unnecessary_mut_passed)]
+                                if zend_is_true(&mut zv) == 1 {
+                                    return Ok(1);
+                                }
+                            }
                         }
                     }
                 }