Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
810ff4d
feat(core): explain the preload-mode configuration and survive ffi.pr…
lisachenko Oct 10, 2026
7e26bdf
Merge pull request #297 from lisachenko/feat/preload-configuration-hint
lisachenko Oct 10, 2026
9c93abf
fix(core): repoint the class-name cache at the live class after a hot…
claude Nov 7, 2026
04230ef
chore(gen): regenerate 8.4 linux headers for PHP 8.4.27
claude Nov 7, 2026
2aaa279
Generate darwin FFI engine definitions for PHP 8.4 (#58)
github-actions[bot] Nov 7, 2026
b2f6531
Generate windows FFI engine definitions for PHP 8.4 (#59)
github-actions[bot] Nov 7, 2026
59bf5bc
Merge pull request #303 from lisachenko/chore/regenerate-8.4-headers
lisachenko Nov 7, 2026
3d2d444
Merge remote-tracking branch 'origin/8.4' into feature/sleepy-brahmag…
claude Nov 7, 2026
c25cdb2
Merge pull request #302 from lisachenko/feature/sleepy-brahmagupta-hy…
lisachenko Nov 7, 2026
f713dcb
merge: cascade 8.4 into 8.5
claude Nov 7, 2026
d52706c
chore(gen): regenerate 8.5 linux headers for PHP 8.5.12
claude Nov 7, 2026
4560965
Generate darwin FFI engine definitions for PHP 8.5 (#58)
github-actions[bot] Nov 7, 2026
b2a1dfa
Generate windows FFI engine definitions for PHP 8.5 (#59)
github-actions[bot] Nov 7, 2026
8b5dc69
docs: list darwin-x64-zts as supported on 8.5
claude Nov 7, 2026
ee1399e
docs(agents): drop the missing ZTS PHP 8.5 on Intel note
claude Nov 7, 2026
c1b6792
merge: cascade 8.5 into master
claude Nov 7, 2026
81e3530
Merge pull request #305 from lisachenko/merge/cascade-8.4-into-8.5-ho…
lisachenko Nov 7, 2026
82eda89
Generate linux FFI engine definitions for PHP 8.6
github-actions[bot] Nov 7, 2026
abe0e22
Generate darwin FFI engine definitions for PHP 8.6 (#58)
github-actions[bot] Nov 7, 2026
2c29a5b
ci: keep .phpstorm.meta.php in the linux generator's stubs artifact
claude Nov 7, 2026
587aad9
Merge remote-tracking branch 'origin/8.5' into merge/cascade-8.5-into…
claude Nov 7, 2026
a758d22
Generate linux FFI engine definitions for PHP 8.6
github-actions[bot] Nov 7, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/generate-linux-headers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ jobs:
path: |
stubs/zend-engine-structs.php
.phpstorm.meta.php
# upload-artifact drops dotfiles by default, which silently left
# .phpstorm.meta.php out of the commit
include-hidden-files: true
if-no-files-found: error

# A single commit job (instead of each runner pushing) serializes both
Expand Down
4 changes: 4 additions & 0 deletions .phpstorm.meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
'zend_object_iterator' => \ZEngine\Generated\zend_object_iterator::class,
'zend_object_iterator_funcs' => \ZEngine\Generated\zend_object_iterator_funcs::class,
'zend_objects_store' => \ZEngine\Generated\zend_objects_store::class,
'zend_oom_info' => \ZEngine\Generated\zend_oom_info::class,
'zend_op' => \ZEngine\Generated\zend_op::class,
'zend_op_array' => \ZEngine\Generated\zend_op_array::class,
'zend_oparray_context' => \ZEngine\Generated\zend_oparray_context::class,
Expand Down Expand Up @@ -156,6 +157,7 @@
'zend_object_iterator' => \ZEngine\Generated\zend_object_iterator::class,
'zend_object_iterator_funcs' => \ZEngine\Generated\zend_object_iterator_funcs::class,
'zend_objects_store' => \ZEngine\Generated\zend_objects_store::class,
'zend_oom_info' => \ZEngine\Generated\zend_oom_info::class,
'zend_op' => \ZEngine\Generated\zend_op::class,
'zend_op_array' => \ZEngine\Generated\zend_op_array::class,
'zend_oparray_context' => \ZEngine\Generated\zend_oparray_context::class,
Expand Down Expand Up @@ -297,6 +299,8 @@
'zend_object_iterator_funcs *' => \ZEngine\Generated\zend_object_iterator_funcs::class,
'zend_objects_store' => \ZEngine\Generated\zend_objects_store::class,
'zend_objects_store *' => \ZEngine\Generated\zend_objects_store::class,
'zend_oom_info' => \ZEngine\Generated\zend_oom_info::class,
'zend_oom_info *' => \ZEngine\Generated\zend_oom_info::class,
'zend_op' => \ZEngine\Generated\zend_op::class,
'zend_op *' => \ZEngine\Generated\zend_op::class,
'zend_op_array' => \ZEngine\Generated\zend_op_array::class,
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,12 @@ Engine memory layouts change between every PHP minor version, so each PHP minor
| PHP | OS / Arch / TS | Branch | Status |
|-----|----------------|--------|--------|
| 8.6 | linux-x64 (nts, zts) | `master` | 🚧 in progress¹ |
| 8.5 | linux-x64 (nts, zts), darwin-x64 (nts), darwin-arm64 (nts, zts), windows-x64 (nts, zts) | `8.5` | ✅ supported² |
| 8.5 | linux-x64 (nts, zts), darwin-x64 (nts, zts), darwin-arm64 (nts, zts), windows-x64 (nts, zts) | `8.5` | ✅ supported |
| 8.4 | linux-x64 (nts, zts), darwin-x64 (nts, zts), darwin-arm64 (nts, zts), windows-x64 (nts, zts) | `8.4` | ✅ supported |
| 8.0 | linux-x64-nts | `8.0` | 🧊 frozen (legacy) |

¹ PHP 8.6 is pre-release; definitions track the latest beta. darwin-* and windows-* artifacts land through the generation workflows as 8.6 builds become available on those runners.

² `darwin-x64-zts` on 8.5 lands as soon as a ZTS PHP 8.5 build exists for Intel macOS runners — the generation workflow picks it up automatically.

> **Version matching is not optional.** Running Z-Engine against a PHP minor it was not built for corrupts memory. `Core::init()` enforces the match and aborts with a clear message rather than letting you crash.

## Memory safety & long-running PHP
Expand Down
14 changes: 14 additions & 0 deletions include/8.4/darwin-arm64-nts/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,18 @@ struct _zend_reference {
struct _zend_ast_ref {
zend_refcounted_h gc;
};
typedef enum _zend_oom_state {
ZEND_OOM_STATE_NONE = 0,
ZEND_OOM_STATE_PENDING,
ZEND_OOM_STATE_HANDLING,
ZEND_OOM_STATE_HANDLED
} zend_oom_state;
typedef struct _zend_oom_info {
zend_oom_state state;
uint32_t lineno;
zend_string *message;
zend_string *filename;
} zend_oom_info;
typedef struct _zend_llist_element {
struct _zend_llist_element *next;
struct _zend_llist_element *prev;
Expand Down Expand Up @@ -728,6 +740,7 @@ struct _zend_compiler_globals {
_Bool multibyte;
_Bool detect_unicode;
_Bool encoding_declared;
_Bool interned_strings_fallible;
zend_ast *ast;
zend_arena *ast_arena;
zend_stack delayed_oplines_stack;
Expand Down Expand Up @@ -830,6 +843,7 @@ struct _zend_executor_globals {
zend_ulong reserved_stack_size;
zend_strtod_state strtod_state;
void *reserved[6];
zend_oom_info delayed_oom;
};
typedef enum {
ON_TOKEN,
Expand Down
6 changes: 4 additions & 2 deletions include/8.4/darwin-arm64-nts/layouts.json
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
}
},
"zend_executor_globals": {
"size": 1960,
"size": 1984,
"fields": {
"uninitialized_zval": 0,
"error_zval": 16,
Expand Down Expand Up @@ -391,7 +391,8 @@
"max_allowed_stack_size": 1816,
"reserved_stack_size": 1824,
"strtod_state": 1832,
"reserved": 1912
"reserved": 1912,
"delayed_oom": 1960
}
},
"zend_compiler_globals": {
Expand Down Expand Up @@ -428,6 +429,7 @@
"multibyte": 440,
"detect_unicode": 441,
"encoding_declared": 442,
"interned_strings_fallible": 443,
"ast": 448,
"ast_arena": 456,
"delayed_oplines_stack": 464,
Expand Down
2 changes: 2 additions & 0 deletions include/8.4/darwin-arm64-nts/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,7 @@ int main(void) {
fprintf(layouts, ", \"reserved_stack_size\": %zu", offsetof(zend_executor_globals, reserved_stack_size));
fprintf(layouts, ", \"strtod_state\": %zu", offsetof(zend_executor_globals, strtod_state));
fprintf(layouts, ", \"reserved\": %zu", offsetof(zend_executor_globals, reserved));
fprintf(layouts, ", \"delayed_oom\": %zu", offsetof(zend_executor_globals, delayed_oom));
fputs("}},\n", layouts);
fputs(" \"zend_compiler_globals\": {", layouts);
fprintf(layouts, "\"size\": %zu, \"fields\": {", sizeof(zend_compiler_globals));
Expand Down Expand Up @@ -1302,6 +1303,7 @@ int main(void) {
fprintf(layouts, ", \"multibyte\": %zu", offsetof(zend_compiler_globals, multibyte));
fprintf(layouts, ", \"detect_unicode\": %zu", offsetof(zend_compiler_globals, detect_unicode));
fprintf(layouts, ", \"encoding_declared\": %zu", offsetof(zend_compiler_globals, encoding_declared));
fprintf(layouts, ", \"interned_strings_fallible\": %zu", offsetof(zend_compiler_globals, interned_strings_fallible));
fprintf(layouts, ", \"ast\": %zu", offsetof(zend_compiler_globals, ast));
fprintf(layouts, ", \"ast_arena\": %zu", offsetof(zend_compiler_globals, ast_arena));
fprintf(layouts, ", \"delayed_oplines_stack\": %zu", offsetof(zend_compiler_globals, delayed_oplines_stack));
Expand Down
14 changes: 14 additions & 0 deletions include/8.4/darwin-arm64-zts/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,18 @@ struct _zend_reference {
struct _zend_ast_ref {
zend_refcounted_h gc;
};
typedef enum _zend_oom_state {
ZEND_OOM_STATE_NONE = 0,
ZEND_OOM_STATE_PENDING,
ZEND_OOM_STATE_HANDLING,
ZEND_OOM_STATE_HANDLED
} zend_oom_state;
typedef struct _zend_oom_info {
zend_oom_state state;
uint32_t lineno;
zend_string *message;
zend_string *filename;
} zend_oom_info;
typedef struct _zend_llist_element {
struct _zend_llist_element *next;
struct _zend_llist_element *prev;
Expand Down Expand Up @@ -729,6 +741,7 @@ struct _zend_compiler_globals {
_Bool multibyte;
_Bool detect_unicode;
_Bool encoding_declared;
_Bool interned_strings_fallible;
zend_ast *ast;
zend_arena *ast_arena;
zend_stack delayed_oplines_stack;
Expand Down Expand Up @@ -832,6 +845,7 @@ struct _zend_executor_globals {
zend_ulong reserved_stack_size;
zend_strtod_state strtod_state;
void *reserved[6];
zend_oom_info delayed_oom;
};
typedef enum {
ON_TOKEN,
Expand Down
6 changes: 4 additions & 2 deletions include/8.4/darwin-arm64-zts/layouts.json
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
}
},
"zend_executor_globals": {
"size": 1960,
"size": 1984,
"fields": {
"uninitialized_zval": 0,
"error_zval": 16,
Expand Down Expand Up @@ -391,7 +391,8 @@
"max_allowed_stack_size": 1816,
"reserved_stack_size": 1824,
"strtod_state": 1832,
"reserved": 1912
"reserved": 1912,
"delayed_oom": 1960
}
},
"zend_compiler_globals": {
Expand Down Expand Up @@ -428,6 +429,7 @@
"multibyte": 440,
"detect_unicode": 441,
"encoding_declared": 442,
"interned_strings_fallible": 443,
"ast": 448,
"ast_arena": 456,
"delayed_oplines_stack": 464,
Expand Down
2 changes: 2 additions & 0 deletions include/8.4/darwin-arm64-zts/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,7 @@ int main(void) {
fprintf(layouts, ", \"reserved_stack_size\": %zu", offsetof(zend_executor_globals, reserved_stack_size));
fprintf(layouts, ", \"strtod_state\": %zu", offsetof(zend_executor_globals, strtod_state));
fprintf(layouts, ", \"reserved\": %zu", offsetof(zend_executor_globals, reserved));
fprintf(layouts, ", \"delayed_oom\": %zu", offsetof(zend_executor_globals, delayed_oom));
fputs("}},\n", layouts);
fputs(" \"zend_compiler_globals\": {", layouts);
fprintf(layouts, "\"size\": %zu, \"fields\": {", sizeof(zend_compiler_globals));
Expand Down Expand Up @@ -1302,6 +1303,7 @@ int main(void) {
fprintf(layouts, ", \"multibyte\": %zu", offsetof(zend_compiler_globals, multibyte));
fprintf(layouts, ", \"detect_unicode\": %zu", offsetof(zend_compiler_globals, detect_unicode));
fprintf(layouts, ", \"encoding_declared\": %zu", offsetof(zend_compiler_globals, encoding_declared));
fprintf(layouts, ", \"interned_strings_fallible\": %zu", offsetof(zend_compiler_globals, interned_strings_fallible));
fprintf(layouts, ", \"ast\": %zu", offsetof(zend_compiler_globals, ast));
fprintf(layouts, ", \"ast_arena\": %zu", offsetof(zend_compiler_globals, ast_arena));
fprintf(layouts, ", \"delayed_oplines_stack\": %zu", offsetof(zend_compiler_globals, delayed_oplines_stack));
Expand Down
14 changes: 14 additions & 0 deletions include/8.4/darwin-x64-nts/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,18 @@ struct _zend_reference {
struct _zend_ast_ref {
zend_refcounted_h gc;
};
typedef enum _zend_oom_state {
ZEND_OOM_STATE_NONE = 0,
ZEND_OOM_STATE_PENDING,
ZEND_OOM_STATE_HANDLING,
ZEND_OOM_STATE_HANDLED
} zend_oom_state;
typedef struct _zend_oom_info {
zend_oom_state state;
uint32_t lineno;
zend_string *message;
zend_string *filename;
} zend_oom_info;
typedef struct _zend_llist_element {
struct _zend_llist_element *next;
struct _zend_llist_element *prev;
Expand Down Expand Up @@ -728,6 +740,7 @@ struct _zend_compiler_globals {
_Bool multibyte;
_Bool detect_unicode;
_Bool encoding_declared;
_Bool interned_strings_fallible;
zend_ast *ast;
zend_arena *ast_arena;
zend_stack delayed_oplines_stack;
Expand Down Expand Up @@ -830,6 +843,7 @@ struct _zend_executor_globals {
zend_ulong reserved_stack_size;
zend_strtod_state strtod_state;
void *reserved[6];
zend_oom_info delayed_oom;
};
typedef enum {
ON_TOKEN,
Expand Down
6 changes: 4 additions & 2 deletions include/8.4/darwin-x64-nts/layouts.json
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
}
},
"zend_executor_globals": {
"size": 1960,
"size": 1984,
"fields": {
"uninitialized_zval": 0,
"error_zval": 16,
Expand Down Expand Up @@ -391,7 +391,8 @@
"max_allowed_stack_size": 1816,
"reserved_stack_size": 1824,
"strtod_state": 1832,
"reserved": 1912
"reserved": 1912,
"delayed_oom": 1960
}
},
"zend_compiler_globals": {
Expand Down Expand Up @@ -428,6 +429,7 @@
"multibyte": 440,
"detect_unicode": 441,
"encoding_declared": 442,
"interned_strings_fallible": 443,
"ast": 448,
"ast_arena": 456,
"delayed_oplines_stack": 464,
Expand Down
2 changes: 2 additions & 0 deletions include/8.4/darwin-x64-nts/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,7 @@ int main(void) {
fprintf(layouts, ", \"reserved_stack_size\": %zu", offsetof(zend_executor_globals, reserved_stack_size));
fprintf(layouts, ", \"strtod_state\": %zu", offsetof(zend_executor_globals, strtod_state));
fprintf(layouts, ", \"reserved\": %zu", offsetof(zend_executor_globals, reserved));
fprintf(layouts, ", \"delayed_oom\": %zu", offsetof(zend_executor_globals, delayed_oom));
fputs("}},\n", layouts);
fputs(" \"zend_compiler_globals\": {", layouts);
fprintf(layouts, "\"size\": %zu, \"fields\": {", sizeof(zend_compiler_globals));
Expand Down Expand Up @@ -1302,6 +1303,7 @@ int main(void) {
fprintf(layouts, ", \"multibyte\": %zu", offsetof(zend_compiler_globals, multibyte));
fprintf(layouts, ", \"detect_unicode\": %zu", offsetof(zend_compiler_globals, detect_unicode));
fprintf(layouts, ", \"encoding_declared\": %zu", offsetof(zend_compiler_globals, encoding_declared));
fprintf(layouts, ", \"interned_strings_fallible\": %zu", offsetof(zend_compiler_globals, interned_strings_fallible));
fprintf(layouts, ", \"ast\": %zu", offsetof(zend_compiler_globals, ast));
fprintf(layouts, ", \"ast_arena\": %zu", offsetof(zend_compiler_globals, ast_arena));
fprintf(layouts, ", \"delayed_oplines_stack\": %zu", offsetof(zend_compiler_globals, delayed_oplines_stack));
Expand Down
14 changes: 14 additions & 0 deletions include/8.4/darwin-x64-zts/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,18 @@ struct _zend_reference {
struct _zend_ast_ref {
zend_refcounted_h gc;
};
typedef enum _zend_oom_state {
ZEND_OOM_STATE_NONE = 0,
ZEND_OOM_STATE_PENDING,
ZEND_OOM_STATE_HANDLING,
ZEND_OOM_STATE_HANDLED
} zend_oom_state;
typedef struct _zend_oom_info {
zend_oom_state state;
uint32_t lineno;
zend_string *message;
zend_string *filename;
} zend_oom_info;
typedef struct _zend_llist_element {
struct _zend_llist_element *next;
struct _zend_llist_element *prev;
Expand Down Expand Up @@ -729,6 +741,7 @@ struct _zend_compiler_globals {
_Bool multibyte;
_Bool detect_unicode;
_Bool encoding_declared;
_Bool interned_strings_fallible;
zend_ast *ast;
zend_arena *ast_arena;
zend_stack delayed_oplines_stack;
Expand Down Expand Up @@ -832,6 +845,7 @@ struct _zend_executor_globals {
zend_ulong reserved_stack_size;
zend_strtod_state strtod_state;
void *reserved[6];
zend_oom_info delayed_oom;
};
typedef enum {
ON_TOKEN,
Expand Down
6 changes: 4 additions & 2 deletions include/8.4/darwin-x64-zts/layouts.json
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
}
},
"zend_executor_globals": {
"size": 1960,
"size": 1984,
"fields": {
"uninitialized_zval": 0,
"error_zval": 16,
Expand Down Expand Up @@ -391,7 +391,8 @@
"max_allowed_stack_size": 1816,
"reserved_stack_size": 1824,
"strtod_state": 1832,
"reserved": 1912
"reserved": 1912,
"delayed_oom": 1960
}
},
"zend_compiler_globals": {
Expand Down Expand Up @@ -428,6 +429,7 @@
"multibyte": 440,
"detect_unicode": 441,
"encoding_declared": 442,
"interned_strings_fallible": 443,
"ast": 448,
"ast_arena": 456,
"delayed_oplines_stack": 464,
Expand Down
2 changes: 2 additions & 0 deletions include/8.4/darwin-x64-zts/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,7 @@ int main(void) {
fprintf(layouts, ", \"reserved_stack_size\": %zu", offsetof(zend_executor_globals, reserved_stack_size));
fprintf(layouts, ", \"strtod_state\": %zu", offsetof(zend_executor_globals, strtod_state));
fprintf(layouts, ", \"reserved\": %zu", offsetof(zend_executor_globals, reserved));
fprintf(layouts, ", \"delayed_oom\": %zu", offsetof(zend_executor_globals, delayed_oom));
fputs("}},\n", layouts);
fputs(" \"zend_compiler_globals\": {", layouts);
fprintf(layouts, "\"size\": %zu, \"fields\": {", sizeof(zend_compiler_globals));
Expand Down Expand Up @@ -1302,6 +1303,7 @@ int main(void) {
fprintf(layouts, ", \"multibyte\": %zu", offsetof(zend_compiler_globals, multibyte));
fprintf(layouts, ", \"detect_unicode\": %zu", offsetof(zend_compiler_globals, detect_unicode));
fprintf(layouts, ", \"encoding_declared\": %zu", offsetof(zend_compiler_globals, encoding_declared));
fprintf(layouts, ", \"interned_strings_fallible\": %zu", offsetof(zend_compiler_globals, interned_strings_fallible));
fprintf(layouts, ", \"ast\": %zu", offsetof(zend_compiler_globals, ast));
fprintf(layouts, ", \"ast_arena\": %zu", offsetof(zend_compiler_globals, ast_arena));
fprintf(layouts, ", \"delayed_oplines_stack\": %zu", offsetof(zend_compiler_globals, delayed_oplines_stack));
Expand Down
14 changes: 14 additions & 0 deletions include/8.4/linux-x64-nts/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,18 @@ struct _zend_reference {
struct _zend_ast_ref {
zend_refcounted_h gc;
};
typedef enum _zend_oom_state {
ZEND_OOM_STATE_NONE = 0,
ZEND_OOM_STATE_PENDING,
ZEND_OOM_STATE_HANDLING,
ZEND_OOM_STATE_HANDLED
} zend_oom_state;
typedef struct _zend_oom_info {
zend_oom_state state;
uint32_t lineno;
zend_string *message;
zend_string *filename;
} zend_oom_info;
typedef struct _zend_llist_element {
struct _zend_llist_element *next;
struct _zend_llist_element *prev;
Expand Down Expand Up @@ -732,6 +744,7 @@ struct _zend_compiler_globals {
_Bool multibyte;
_Bool detect_unicode;
_Bool encoding_declared;
_Bool interned_strings_fallible;
zend_ast *ast;
zend_arena *ast_arena;
zend_stack delayed_oplines_stack;
Expand Down Expand Up @@ -834,6 +847,7 @@ struct _zend_executor_globals {
zend_ulong reserved_stack_size;
zend_strtod_state strtod_state;
void *reserved[6];
zend_oom_info delayed_oom;
};
typedef enum {
ON_TOKEN,
Expand Down
Loading
Loading