Merge pull request #566 from extphprs/chore/bump-edition-2024

Author: ptondereau

Cargo.toml

@@ -11,7 +11,7 @@ authors = [
     "Xenira <[email protected]>",
     "David Cole <[email protected]>",
 ]
-edition = "2021"
+edition = "2024"
 categories = ["api-bindings"]
 exclude = ["/.github", "/.crates"]
 autotests = false

build.rs

@@ -16,7 +16,7 @@ use std::{
     str::FromStr,
 };
 
-use anyhow::{anyhow, bail, Context, Error, Result};
+use anyhow::{Context, Error, Result, anyhow, bail};
 use bindgen::RustTarget;
 use impl_::Provider;
 
@@ -332,17 +332,25 @@ impl TryFrom<u32> for ApiVersion {
 
     fn try_from(version: u32) -> Result<Self, Self::Error> {
         match version {
-            x if ((ApiVersion::Php80 as u32)..(ApiVersion::Php81 as u32)).contains(&x) => Ok(ApiVersion::Php80),
-            x if ((ApiVersion::Php81 as u32)..(ApiVersion::Php82 as u32)).contains(&x) => Ok(ApiVersion::Php81),
-            x if ((ApiVersion::Php82 as u32)..(ApiVersion::Php83 as u32)).contains(&x) => Ok(ApiVersion::Php82),
-            x if ((ApiVersion::Php83 as u32)..(ApiVersion::Php84 as u32)).contains(&x) => Ok(ApiVersion::Php83),
+            x if ((ApiVersion::Php80 as u32)..(ApiVersion::Php81 as u32)).contains(&x) => {
+                Ok(ApiVersion::Php80)
+            }
+            x if ((ApiVersion::Php81 as u32)..(ApiVersion::Php82 as u32)).contains(&x) => {
+                Ok(ApiVersion::Php81)
+            }
+            x if ((ApiVersion::Php82 as u32)..(ApiVersion::Php83 as u32)).contains(&x) => {
+                Ok(ApiVersion::Php82)
+            }
+            x if ((ApiVersion::Php83 as u32)..(ApiVersion::Php84 as u32)).contains(&x) => {
+                Ok(ApiVersion::Php83)
+            }
             x if (ApiVersion::Php84 as u32) == x => Ok(ApiVersion::Php84),
             version => Err(anyhow!(
-              "The current version of PHP is not supported. Current PHP API version: {}, requires a version between {} and {}",
-              version,
-              ApiVersion::min() as u32,
-              ApiVersion::max() as u32
-            ))
+                "The current version of PHP is not supported. Current PHP API version: {}, requires a version between {} and {}",
+                version,
+                ApiVersion::min() as u32,
+                ApiVersion::max() as u32
+            )),
         }
     }
 }
@@ -367,7 +375,9 @@ fn check_php_version(info: &PHPInfo) -> Result<()> {
     );
 
     if version == ApiVersion::Php80 {
-        println!("cargo:warning=PHP 8.0 is EOL and is no longer supported. Please upgrade to a supported version of PHP. See https://www.php.net/supported-versions.php for information on version support timelines.");
+        println!(
+            "cargo:warning=PHP 8.0 is EOL and is no longer supported. Please upgrade to a supported version of PHP. See https://www.php.net/supported-versions.php for information on version support timelines."
+        );
     }
 
     for supported_version in version.supported_apis() {

crates/cli/Cargo.toml

@@ -8,9 +8,10 @@ keywords = ["php", "ffi", "zend"]
 version = "0.1.13"
 authors = [
     "Xenira <[email protected]>",
-    "David Cole <[email protected]>"
+    "David Cole <[email protected]>",
+    "Pierre Tondereau <[email protected]>",
 ]
-edition = "2018"
+edition = "2024"
 categories = ["api-bindings", "command-line-interface"]
 
 [dependencies]

crates/cli/src/lib.rs

@@ -3,8 +3,8 @@
 #[cfg(not(windows))]
 mod ext;
 
-use anyhow::{bail, Context, Result as AResult};
-use cargo_metadata::{camino::Utf8PathBuf, CrateType, Target};
+use anyhow::{Context, Result as AResult, bail};
+use cargo_metadata::{CrateType, Target, camino::Utf8PathBuf};
 use clap::Parser;
 use dialoguer::{Confirm, Select};
 
@@ -27,7 +27,7 @@ macro_rules! stub_symbols {
     (@INTERNAL; $s: ident) => {
         #[allow(non_upper_case_globals)]
         #[allow(missing_docs)]
-        #[no_mangle]
+        #[unsafe(no_mangle)]
         pub static mut $s: *mut () = ::std::ptr::null_mut();
     };
 }
@@ -221,9 +221,9 @@ impl Install {
             ext_dir.push(ext_name);
         }
 
-        std::fs::copy(&ext_path, &ext_dir).with_context(|| {
-            "Failed to copy extension from target directory to extension directory"
-        })?;
+        std::fs::copy(&ext_path, &ext_dir).with_context(
+            || "Failed to copy extension from target directory to extension directory",
+        )?;
 
         if let Some(php_ini) = php_ini {
             let mut file = OpenOptions::new()
@@ -408,15 +408,17 @@ impl Stubs {
         let result = ext.describe();
 
         // Ensure extension and CLI `ext-php-rs` versions are compatible.
-        let cli_version = semver::VersionReq::from_str(ext_php_rs::VERSION).with_context(|| {
-            "Failed to parse `ext-php-rs` version that `cargo php` was compiled with"
-        })?;
-        let ext_version = semver::Version::from_str(result.version).with_context(|| {
-            "Failed to parse `ext-php-rs` version that your extension was compiled with"
-        })?;
+        let cli_version = semver::VersionReq::from_str(ext_php_rs::VERSION).with_context(
+            || "Failed to parse `ext-php-rs` version that `cargo php` was compiled with",
+        )?;
+        let ext_version = semver::Version::from_str(result.version).with_context(
+            || "Failed to parse `ext-php-rs` version that your extension was compiled with",
+        )?;
 
         if !cli_version.matches(&ext_version) {
-            bail!("Extension was compiled with an incompatible version of `ext-php-rs` - Extension: {ext_version}, CLI: {cli_version}");
+            bail!(
+                "Extension was compiled with an incompatible version of `ext-php-rs` - Extension: {ext_version}, CLI: {cli_version}"
+            );
         }
 
         let stubs = result

crates/macros/Cargo.toml

@@ -7,9 +7,10 @@ license = "MIT OR Apache-2.0"
 version = "0.11.4"
 authors = [
     "Xenira <[email protected]>",
-    "David Cole <[email protected]>"
+    "David Cole <[email protected]>",
+    "Pierre Tondereau <[email protected]>",
 ]
-edition = "2021"
+edition = "2024"
 
 [lib]
 proc-macro = true

crates/macros/src/enum_.rs

@@ -1,9 +1,9 @@
 use std::convert::TryFrom;
 
-use darling::{util::Flag, FromAttributes};
+use darling::{FromAttributes, util::Flag};
 use itertools::Itertools;
 use proc_macro2::TokenStream;
-use quote::{quote, ToTokens};
+use quote::{ToTokens, quote};
 use syn::{Fields, Ident, ItemEnum, Lit};
 
 use crate::{

crates/macros/src/extern_.rs

@@ -1,8 +1,8 @@
 use proc_macro2::TokenStream;
 use quote::quote;
 use syn::{
-    punctuated::Punctuated, spanned::Spanned as _, token::Unsafe, ForeignItemFn, ItemForeignMod,
-    ReturnType, Signature, Token,
+    ForeignItemFn, ItemForeignMod, ReturnType, Signature, Token, punctuated::Punctuated,
+    spanned::Spanned as _, token::Unsafe,
 };
 
 use crate::prelude::*;

crates/macros/src/function.rs

@@ -218,6 +218,19 @@ impl<'a> Function<'a> {
         let required_arg_names: Vec<_> = required.iter().map(|arg| arg.name).collect();
         let not_required_arg_names: Vec<_> = not_required.iter().map(|arg| arg.name).collect();
 
+        let variadic_bindings = self.args.typed.iter().filter_map(|arg| {
+            if arg.variadic {
+                let name = arg.name;
+                let variadic_name = format_ident!("__variadic_{}", name);
+                let clean_ty = arg.clean_ty();
+                Some(quote! {
+                    let #variadic_name = #name.variadic_vals::<#clean_ty>();
+                })
+            } else {
+                None
+            }
+        });
+
         let arg_accessors = self.args.typed.iter().map(|arg| {
             arg.accessor(|e| {
                 quote! {
@@ -237,6 +250,7 @@ impl<'a> Function<'a> {
                 if parse.is_err() {
                     return;
                 }
+                #(#variadic_bindings)*
 
                 #ident(#({#arg_accessors}),*)
             },
@@ -277,6 +291,7 @@ impl<'a> Function<'a> {
                     if parse_result.is_err() {
                         return;
                     }
+                    #(#variadic_bindings)*
 
                     #call
                 }
@@ -332,6 +347,18 @@ impl<'a> Function<'a> {
             .iter()
             .map(TypedArg::arg_declaration)
             .collect::<Vec<_>>();
+        let variadic_bindings = self.args.typed.iter().filter_map(|arg| {
+            if arg.variadic {
+                let name = arg.name;
+                let variadic_name = format_ident!("__variadic_{}", name);
+                let clean_ty = arg.clean_ty();
+                Some(quote! {
+                    let #variadic_name = #name.variadic_vals::<#clean_ty>();
+                })
+            } else {
+                None
+            }
+        });
         let arg_accessors = self.args.typed.iter().map(|arg| {
             arg.accessor(
                 |e| quote! { return ::ext_php_rs::class::ConstructorResult::Exception(#e); },
@@ -359,6 +386,7 @@ impl<'a> Function<'a> {
                         if parse.is_err() {
                             return ::ext_php_rs::class::ConstructorResult::ArgError;
                         }
+                        #(#variadic_bindings)*
                         #class::#ident(#({#arg_accessors}),*).into()
                     }
                     inner
@@ -535,7 +563,7 @@ impl TypedArg<'_> {
         let mut ty = self.ty.clone();
         ty.drop_lifetimes();
 
-        // Variadic arguments are passed as slices, so we need to extract the
+        // Variadic arguments are passed as &[&Zval], so we need to extract the
         // inner type.
         if self.variadic {
             let Type::Reference(reference) = &ty else {
@@ -599,8 +627,9 @@ impl TypedArg<'_> {
                 #name.val().unwrap_or(#default.into())
             }
         } else if self.variadic {
+            let variadic_name = format_ident!("__variadic_{}", name);
             quote! {
-                &#name.variadic_vals()
+                #variadic_name.as_slice()
             }
         } else if self.nullable {
             // Originally I thought we could just use the below case for `null` options, as

crates/macros/src/impl_.rs

@@ -1,5 +1,5 @@
-use darling::util::Flag;
 use darling::FromAttributes;
+use darling::util::Flag;
 use proc_macro2::TokenStream;
 use quote::quote;
 use std::collections::{HashMap, HashSet};

crates/macros/src/module.rs

@@ -25,13 +25,13 @@ pub fn parser(input: ItemFn) -> Result<TokenStream> {
 
     Ok(quote! {
         #[doc(hidden)]
-        #[no_mangle]
+        #[unsafe(no_mangle)]
         extern "C" fn get_module() -> *mut ::ext_php_rs::zend::ModuleEntry {
             static __EXT_PHP_RS_MODULE_STARTUP: ::ext_php_rs::internal::ModuleStartupMutex =
                 ::ext_php_rs::internal::MODULE_STARTUP_INIT;
 
             extern "C" fn ext_php_rs_startup(ty: i32, mod_num: i32) -> i32 {
-                let a = #startup;
+                let a = unsafe { #startup };
                 let b = __EXT_PHP_RS_MODULE_STARTUP
                     .lock()
                     .take()
@@ -64,7 +64,7 @@ pub fn parser(input: ItemFn) -> Result<TokenStream> {
         }
 
         #[cfg(debug_assertions)]
-        #[no_mangle]
+        #[unsafe(no_mangle)]
         pub extern "C" fn ext_php_rs_describe_module() -> ::ext_php_rs::describe::Description {
             use ::ext_php_rs::describe::*;