Merge branch 'master' into 453_ZendHashTable_numeric_keys

Author: kakserpom

.envrc

@@ -0,0 +1 @@
+use flake

.github/workflows/build.yml

@@ -94,11 +94,6 @@ jobs:
           # ext-php-rs requires nightly Rust when on Windows.
           - os: windows-latest
             rust: stable
-          # setup-php doesn't support thread safe PHP on Linux and macOS.
-          - os: macos-latest
-            phpts: ts
-          - os: ubuntu-latest
-            phpts: ts
           - os: macos-latest
             clang: "17"
           - os: ubuntu-latest

.gitignore

@@ -3,4 +3,5 @@ Cargo.lock
 /.vscode
 /.idea
 /tmp
-expand.rs
+/.direnv
+expand.rs

README.md

@@ -193,7 +193,7 @@ Contributions welcome include:
 When contributing, please keep in mind the following:
 - Create tests if possible.
 - Update the documentation if necessary.
-  - If your change is a [braking change](https://semver.org) a migration guide MUST be included. This
+  - If your change is a [breaking change](https://semver.org) a migration guide MUST be included. This
     should be placed in the `guide/src/migration-guides` directory.
 - Use [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/). We use these to automatically generate changelogs.
 

crates/cli/src/lib.rs

@@ -111,6 +111,12 @@ struct Install {
     /// the directory the command is called.
     #[arg(long)]
     manifest: Option<PathBuf>,
+    #[arg(short = 'F', long, num_args = 1..)]
+    features: Option<Vec<String>>,
+    #[arg(long)]
+    all_features: bool,
+    #[arg(long)]
+    no_default_features: bool,
     /// Whether to bypass the install prompt.
     #[clap(long)]
     yes: bool,
@@ -156,6 +162,12 @@ struct Stubs {
     /// provides a direct path to the extension shared library.
     #[arg(long, conflicts_with = "ext")]
     manifest: Option<PathBuf>,
+    #[arg(short = 'F', long, num_args = 1..)]
+    features: Option<Vec<String>>,
+    #[arg(long)]
+    all_features: bool,
+    #[arg(long)]
+    no_default_features: bool,
 }
 
 impl Args {
@@ -172,7 +184,13 @@ impl Args {
 impl Install {
     pub fn handle(self) -> CrateResult {
         let artifact = find_ext(self.manifest.as_ref())?;
-        let ext_path = build_ext(&artifact, self.release)?;
+        let ext_path = build_ext(
+            &artifact,
+            self.release,
+            self.features,
+            self.all_features,
+            self.no_default_features,
+        )?;
 
         let (mut ext_dir, mut php_ini) = if let Some(install_dir) = self.install_dir {
             (install_dir, None)
@@ -371,7 +389,14 @@ impl Stubs {
             ext_path
         } else {
             let target = find_ext(self.manifest.as_ref())?;
-            build_ext(&target, false)?.into()
+            build_ext(
+                &target,
+                false,
+                self.features,
+                self.all_features,
+                self.no_default_features,
+            )?
+            .into()
         };
 
         if !ext_path.is_file() {
@@ -469,17 +494,38 @@ fn find_ext(manifest: Option<&PathBuf>) -> AResult<cargo_metadata::Target> {
 ///
 /// * `target` - The target to compile.
 /// * `release` - Whether to compile the target in release mode.
+/// * `features` - Optional list of features.
 ///
 /// # Returns
 ///
 /// The path to the target artifact.
-fn build_ext(target: &Target, release: bool) -> AResult<Utf8PathBuf> {
+fn build_ext(
+    target: &Target,
+    release: bool,
+    features: Option<Vec<String>>,
+    all_features: bool,
+    no_default_features: bool,
+) -> AResult<Utf8PathBuf> {
     let mut cmd = Command::new("cargo");
     cmd.arg("build")
         .arg("--message-format=json-render-diagnostics");
     if release {
         cmd.arg("--release");
     }
+    if let Some(features) = features {
+        cmd.arg("--features");
+        for feature in features {
+            cmd.arg(feature);
+        }
+    }
+
+    if all_features {
+        cmd.arg("--all-features");
+    }
+
+    if no_default_features {
+        cmd.arg("--no-default-features");
+    }
 
     let mut spawn = cmd
         .stdout(Stdio::piped())

crates/macros/src/class.rs

@@ -153,7 +153,7 @@ fn generate_registered_class_impl(
     };
 
     let docs = quote! {
-        #(#docs)*
+        #(#docs,)*
     };
 
     let extends = if let Some(extends) = extends {

crates/macros/src/lib.rs

@@ -200,8 +200,11 @@ extern crate proc_macro;
 /// # fn main() {}
 /// ````
 #[proc_macro_attribute]
-pub fn php_class(_args: TokenStream, input: TokenStream) -> TokenStream {
+pub fn php_class(args: TokenStream, input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as ItemStruct);
+    if !args.is_empty() {
+        return err!(input => "`#[php_class(<args>)]` args are no longer supported. Please use `#[php(<args>)]` instead.").to_compile_error().into();
+    }
 
     class::parser(input)
         .unwrap_or_else(|e| e.to_compile_error())
@@ -363,8 +366,11 @@ pub fn php_class(_args: TokenStream, input: TokenStream) -> TokenStream {
 /// translated into an exception and thrown. See the section on
 /// [exceptions](../exceptions.md) for more details.
 #[proc_macro_attribute]
-pub fn php_function(_args: TokenStream, input: TokenStream) -> TokenStream {
+pub fn php_function(args: TokenStream, input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as ItemFn);
+    if !args.is_empty() {
+        return err!(input => "`#[php_function(<args>)]` args are no longer supported. Please use `#[php(<args>)]` instead.").to_compile_error().into();
+    }
 
     function::parser(input)
         .unwrap_or_else(|e| e.to_compile_error())
@@ -423,8 +429,11 @@ pub fn php_function(_args: TokenStream, input: TokenStream) -> TokenStream {
 /// var_dump(MANUAL_CONSTANT); // string(12) "Hello world!"
 /// ```
 #[proc_macro_attribute]
-pub fn php_const(_args: TokenStream, input: TokenStream) -> TokenStream {
+pub fn php_const(args: TokenStream, input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as ItemConst);
+    if !args.is_empty() {
+        return err!(input => "`#[php_const(<args>)]` args are no longer supported. Please use `#[php(<args>)]` instead.").to_compile_error().into();
+    }
 
     constant::parser(input)
         .unwrap_or_else(|e| e.to_compile_error())
@@ -498,8 +507,11 @@ pub fn php_const(_args: TokenStream, input: TokenStream) -> TokenStream {
 /// # fn main() {}
 /// ```
 #[proc_macro_attribute]
-pub fn php_module(_args: TokenStream, input: TokenStream) -> TokenStream {
+pub fn php_module(args: TokenStream, input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as ItemFn);
+    if !args.is_empty() {
+        return err!(input => "`#[php_module(<args>)]` args are no longer supported. Please use `#[php(<args>)]` instead.").to_compile_error().into();
+    }
 
     module::parser(input)
         .unwrap_or_else(|e| e.to_compile_error())
@@ -685,8 +697,11 @@ pub fn php_module(_args: TokenStream, input: TokenStream) -> TokenStream {
 ///
 /// [`php_async_impl`]: ./async_impl.md
 #[proc_macro_attribute]
-pub fn php_impl(_args: TokenStream, input: TokenStream) -> TokenStream {
+pub fn php_impl(args: TokenStream, input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as ItemImpl);
+    if !args.is_empty() {
+        return err!(input => "`#[php_impl(<args>)]` args are no longer supported. Please use `#[php(<args>)]` instead.").to_compile_error().into();
+    }
 
     impl_::parser(input)
         .unwrap_or_else(|e| e.to_compile_error())

flake.lock

@@ -0,0 +1,40 @@
+{
+  description = "ext-php-rs dev environment";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
+  };
+
+  outputs =
+    { nixpkgs, rust-overlay, ... }:
+    let
+      system = "x86_64-linux";
+      overlays = [ (import rust-overlay) ];
+      pkgs = import nixpkgs { inherit system overlays; };
+      php-dev = pkgs.php.unwrapped.dev;
+    in
+    {
+      devShells.${system} = {
+        default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            php
+            php-dev
+            libclang.lib
+            clang
+          ];
+
+          nativeBuildInputs = [ pkgs.rust-bin.stable.latest.default ];
+
+          shellHook = ''
+            export LIBCLANG_PATH="''$LIBCLANG_PATH ${pkgs.libclang.lib}/lib"
+          '';
+        };
+      };
+    };
+}

flake.nix

@@ -303,7 +303,7 @@ impl ClassBuilder {
 
         let class = unsafe {
             zend_register_internal_class_ex(
-                &mut self.ce,
+                &raw mut self.ce,
                 match self.extends {
                     Some((ptr, _)) => ptr::from_ref(ptr()).cast_mut(),
                     None => std::ptr::null_mut(),