Merge branch 'master' into function-helper

Author: danog

.github/actions/embed/Dockerfile

@@ -0,0 +1,15 @@
+FROM php:8.2-bullseye
+
+WORKDIR /tmp
+
+RUN apt update -y && apt upgrade -y
+RUN apt install lsb-release wget gnupg software-properties-common -y
+RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
+
+ENV RUSTUP_HOME=/rust
+ENV CARGO_HOME=/cargo
+ENV PATH=/cargo/bin:/rust/bin:$PATH
+
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path
+
+ENTRYPOINT [ "/cargo/bin/cargo", "test", "--lib", "--release", "--all-features" ]

.github/actions/embed/action.yml

@@ -0,0 +1,5 @@
+name: 'PHP Embed and Rust'
+description: 'Builds the crate after installing the latest PHP with php embed and stable Rust.'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'

.github/workflows/build.yml

@@ -15,9 +15,9 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        php: ["8.0", "8.1", "8.2"]
+        php: ["8.0", "8.1", "8.2", "8.3"]
         rust: [stable, nightly]
-        clang: ["14"]
+        clang: ["15", "17"]
         phpts: [ts, nts]
         exclude:
           # ext-php-rs requires nightly Rust when on Windows.
@@ -28,6 +28,12 @@ jobs:
             phpts: ts
           - os: ubuntu-latest
             phpts: ts
+          - os: macos-latest
+            clang: "17"
+          - os: ubuntu-latest
+            clang: "15"
+          - os: windows-latest
+            clang: "15"
     env:
       CARGO_TERM_COLOR: always
     steps:
@@ -83,10 +89,10 @@ jobs:
       - name: Build
         env:
           EXT_PHP_RS_TEST: ""
-        run: cargo build --release --all-features --all
+        run: cargo build --release --features closure,anyhow --all
       # Test & lint
       - name: Test inline examples
-        run: cargo test --release --all --all-features
+        run: cargo test --release --all --features closure,anyhow
       - name: Run rustfmt
         if: matrix.rust == 'stable' && matrix.os == 'ubuntu-latest' && matrix.php == '8.2'
         run: cargo fmt --all -- --check
@@ -110,3 +116,11 @@ jobs:
         uses: actions/checkout@v3
       - name: Build
         uses: ./.github/actions/zts
+  test-embed:
+    name: Test with embed
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Test
+        uses: ./.github/actions/embed

.github/workflows/docs.yml

@@ -16,7 +16,7 @@ jobs:
       matrix:
         os: ["ubuntu-latest"]
         php: ["8.2"]
-        clang: ["14"]
+        clang: ["17"]
         mdbook: ["latest"]
     steps:
       - name: Checkout code

Cargo.toml

@@ -5,7 +5,7 @@ repository = "https://github.com/davidcole1340/ext-php-rs"
 homepage = "https://github.com/davidcole1340/ext-php-rs"
 license = "MIT OR Apache-2.0"
 keywords = ["php", "ffi", "zend"]
-version = "0.10.1"
+version = "0.10.5"
 authors = ["David Cole <[email protected]>"]
 edition = "2018"
 categories = ["api-bindings"]
@@ -17,30 +17,31 @@ parking_lot = "0.12"
 cfg-if = "1.0"
 once_cell = "1.17"
 anyhow = { version = "1", optional = true }
-ext-php-rs-derive = { version = "=0.10.0", path = "./crates/macros" }
+ext-php-rs-derive = { version = "=0.10.1", path = "./crates/macros" }
 
 [dev-dependencies]
 skeptic = "0.13"
 
 [build-dependencies]
 anyhow = "1"
-bindgen = "0.65.1"
+bindgen = "0.68.1"
 cc = "1.0"
 skeptic = "0.13"
 
 [target.'cfg(windows)'.build-dependencies]
-ureq = { version = "2.4", features = ["native-tls", "gzip"], default-features = false }
+ureq = { version = "2.4", features = [
+    "native-tls",
+    "gzip",
+], default-features = false }
 native-tls = "0.2"
 zip = "0.6"
 
 [features]
 closure = []
+embed = []
 
 [workspace]
-members = [
-    "crates/macros",
-    "crates/cli"
-]
+members = ["crates/macros", "crates/cli"]
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docs"]

allowed_bindings.rs

@@ -26,6 +26,8 @@ bind! {
     _efree,
     _emalloc,
     _zend_executor_globals,
+    _sapi_globals_struct,
+    _sapi_module_struct,
     _zend_expected_type,
     _zend_expected_type_Z_EXPECTED_ARRAY,
     _zend_expected_type_Z_EXPECTED_BOOL,
@@ -55,6 +57,8 @@ bind! {
     zend_array_destroy,
     zend_array_dup,
     zend_call_known_function,
+    zend_fetch_function_str,
+    zend_hash_str_find_ptr_lc,
     zend_ce_argument_count_error,
     zend_ce_arithmetic_error,
     zend_ce_compile_error,
@@ -99,6 +103,8 @@ bind! {
     zend_objects_clone_members,
     zend_register_bool_constant,
     zend_register_double_constant,
+    zend_register_ini_entries,
+    zend_ini_entry_def,
     zend_register_internal_class_ex,
     zend_register_long_constant,
     zend_register_string_constant,
@@ -157,6 +163,10 @@ bind! {
     IS_PTR,
     MAY_BE_ANY,
     MAY_BE_BOOL,
+    PHP_INI_USER,
+    PHP_INI_PERDIR,
+    PHP_INI_SYSTEM,
+    PHP_INI_ALL,
     USING_ZTS,
     ZEND_ACC_ABSTRACT,
     ZEND_ACC_ANON_CLASS,
@@ -233,6 +243,8 @@ bind! {
     zend_class_serialize_deny,
     zend_class_unserialize_deny,
     zend_executor_globals,
+    sapi_globals_struct,
+    sapi_module_struct,
     zend_objects_store_del,
     zend_hash_move_forward_ex,
     zend_hash_get_current_key_type_ex,
@@ -243,10 +255,19 @@ bind! {
     gc_possible_root,
     ZEND_ACC_NOT_SERIALIZABLE,
     executor_globals,
+    sapi_globals,
+    sapi_module,
     php_printf,
     __zend_malloc,
     tsrm_get_ls_cache,
     executor_globals_offset,
+    sapi_globals_offset,
     zend_atomic_bool_store,
-    zend_interrupt_function
+    zend_interrupt_function,
+    zend_eval_string,
+    zend_file_handle,
+    zend_stream_init_filename,
+    php_execute_script,
+    zend_register_module_ex,
+    _zend_bailout
 }

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 = 20220829;
+const MAX_PHP_API_VER: u32 = 20230831;
 
 pub trait PHPProvider<'a>: Sized {
     /// Create a new PHP provider.
@@ -151,9 +151,31 @@ fn build_wrapper(defines: &[(&str, &str)], includes: &[PathBuf]) -> Result<()> {
     Ok(())
 }
 
+#[cfg(feature = "embed")]
+/// Builds the embed library.
+fn build_embed(defines: &[(&str, &str)], includes: &[PathBuf]) -> Result<()> {
+    let mut build = cc::Build::new();
+    for (var, val) in defines {
+        build.define(var, *val);
+    }
+    build
+        .file("src/embed/embed.c")
+        .includes(includes)
+        .try_compile("embed")
+        .context("Failed to compile ext-php-rs C embed interface")?;
+    Ok(())
+}
+
 /// Generates bindings to the Zend API.
 fn generate_bindings(defines: &[(&str, &str)], includes: &[PathBuf]) -> Result<String> {
-    let mut bindgen = bindgen::Builder::default()
+    let mut bindgen = bindgen::Builder::default();
+
+    #[cfg(feature = "embed")]
+    {
+        bindgen = bindgen.header("src/embed/embed.h");
+    }
+
+    bindgen = bindgen
         .header("src/wrapper.h")
         .clang_args(
             includes
@@ -206,6 +228,8 @@ fn check_php_version(info: &PHPInfo) -> Result<()> {
 
     const PHP_82_API_VER: u32 = 20220829;
 
+    const PHP_83_API_VER: u32 = 20230831;
+
     println!("cargo:rustc-cfg=php80");
 
     if (PHP_81_API_VER..PHP_82_API_VER).contains(&version) {
@@ -216,6 +240,10 @@ fn check_php_version(info: &PHPInfo) -> Result<()> {
         println!("cargo:rustc-cfg=php82");
     }
 
+    if version >= PHP_83_API_VER {
+        println!("cargo:rustc-cfg=php83");
+    }
+
     Ok(())
 }
 
@@ -226,6 +254,8 @@ fn main() -> Result<()> {
     for path in [
         manifest.join("src").join("wrapper.h"),
         manifest.join("src").join("wrapper.c"),
+        manifest.join("src").join("embed").join("embed.h"),
+        manifest.join("src").join("embed").join("embed.c"),
         manifest.join("allowed_bindings.rs"),
         manifest.join("windows_build.rs"),
         manifest.join("unix_build.rs"),
@@ -257,6 +287,10 @@ fn main() -> Result<()> {
 
     check_php_version(&info)?;
     build_wrapper(&defines, &includes)?;
+
+    #[cfg(feature = "embed")]
+    build_embed(&defines, &includes)?;
+
     let bindings = generate_bindings(&defines, &includes)?;
 
     let out_file =

crates/cli/Cargo.toml

@@ -5,7 +5,7 @@ repository = "https://github.com/davidcole1340/ext-php-rs"
 homepage = "https://github.com/davidcole1340/ext-php-rs"
 license = "MIT OR Apache-2.0"
 keywords = ["php", "ffi", "zend"]
-version = "0.1.8"
+version = "0.1.9"
 authors = ["David Cole <[email protected]>"]
 edition = "2018"
 categories = ["api-bindings", "command-line-interface"]

crates/cli/src/ext.rs

@@ -4,6 +4,7 @@ use anyhow::{Context, Result};
 use ext_php_rs::describe::Description;
 use libloading::os::unix::{Library, Symbol};
 
+#[allow(improper_ctypes_definitions)]
 pub struct Ext {
     // These need to be here to keep the libraries alive. The extension library needs to be alive
     // to access the describe function. Missing here is the lifetime on `Symbol<'a, fn() ->

crates/macros/Cargo.toml

@@ -4,7 +4,7 @@ description = "Derive macros for ext-php-rs."
 repository = "https://github.com/davidcole1340/ext-php-rs"
 homepage = "https://github.com/davidcole1340/ext-php-rs"
 license = "MIT OR Apache-2.0"
-version = "0.10.0"
+version = "0.10.1"
 authors = ["David Cole <[email protected]>"]
 edition = "2018"