From fb27ff958cb6a8c0531dc23538d15bf58f20775b Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Sat, 23 Aug 2025 14:18:30 +0200 Subject: [PATCH 1/3] Clarify usage of @deprecated annotation in stubs To indicate that this was used prior to the \Deprecated attribute being usable on those symbols. --- docs/source/miscellaneous/stubs.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/source/miscellaneous/stubs.rst b/docs/source/miscellaneous/stubs.rst index 3899fe3084196..784d969e3de4e 100644 --- a/docs/source/miscellaneous/stubs.rst +++ b/docs/source/miscellaneous/stubs.rst @@ -223,7 +223,8 @@ The generated ``class_Atmosphere_methods`` must be used when registering the ``A Additional meta information can be attached to functions, with the following PHPDoc tags: -- ``@deprecated``: Triggers the usual deprecation notice when the function/method is called. +- ``@deprecated``: Triggers the usual deprecation notice when the function/method is called. As of + PHP 8.4.0 the `#[Deprecated]` attribute should be used instead. - ``@alias``: If a function/method is an alias of another function/method, then the aliased function/method name has to be provided as value. E.g. the function ``sizeof()`` has the ``@alias @@ -452,7 +453,8 @@ with ``@cvalue M_PI`` to the C-level constant ``M_PI`` (define by PHP's internal Constants can take the following extra meta information passed via PHPDoc tags: -- ``@deprecated``: Triggers a deprecation notice when the constant is used. +- ``@deprecated``: Triggers a deprecation notice when the constant is used. As of PHP 8.5.0 the + `#[Deprecated]` attribute should be used instead. - ``@genstubs-expose-comment-block``: By adding this tag at the beginning of a PHPDoc block, the content of the PHPDoc block will be exposed for `ReflectionClass::getDocComment()`. This feature From 9b27fdbe52540a997c0e4b79f115280c3157267e Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Sun, 24 Aug 2025 11:41:35 +0200 Subject: [PATCH 2/3] Normalize version number strings --- docs/source/miscellaneous/stubs.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/miscellaneous/stubs.rst b/docs/source/miscellaneous/stubs.rst index 784d969e3de4e..616d306895542 100644 --- a/docs/source/miscellaneous/stubs.rst +++ b/docs/source/miscellaneous/stubs.rst @@ -224,7 +224,7 @@ The generated ``class_Atmosphere_methods`` must be used when registering the ``A Additional meta information can be attached to functions, with the following PHPDoc tags: - ``@deprecated``: Triggers the usual deprecation notice when the function/method is called. As of - PHP 8.4.0 the `#[Deprecated]` attribute should be used instead. + PHP 8.4 the `#[Deprecated]` attribute should be used instead. - ``@alias``: If a function/method is an alias of another function/method, then the aliased function/method name has to be provided as value. E.g. the function ``sizeof()`` has the ``@alias @@ -245,7 +245,7 @@ Additional meta information can be attached to functions, with the following PHP - ``@genstubs-expose-comment-block``: By adding this annotation at the beginning of a PHPDoc block, the content of the PHPDoc block will be exposed for - `ReflectionFunctionAbstract::getDocComment()`. This feature was added in PHP 8.4.0. + `ReflectionFunctionAbstract::getDocComment()`. This feature was added in PHP 8.4. .. _tentative return type: https://wiki.php.net/rfc/internal_method_return_types @@ -338,7 +338,7 @@ Like functions and methods, classes also support meta information passed via PHP - ``@genstubs-expose-comment-block``: By adding this tag at the beginning of a PHPDoc block, the content of the PHPDoc block will be exposed for `ReflectionClass::getDocComment()`. This feature - is only available as of PHP 8.4.0. + is only available as of PHP 8.4. This is an example with all the flags: @@ -453,12 +453,12 @@ with ``@cvalue M_PI`` to the C-level constant ``M_PI`` (define by PHP's internal Constants can take the following extra meta information passed via PHPDoc tags: -- ``@deprecated``: Triggers a deprecation notice when the constant is used. As of PHP 8.5.0 the +- ``@deprecated``: Triggers a deprecation notice when the constant is used. As of PHP 8.5 the `#[Deprecated]` attribute should be used instead. - ``@genstubs-expose-comment-block``: By adding this tag at the beginning of a PHPDoc block, the content of the PHPDoc block will be exposed for `ReflectionClass::getDocComment()`. This feature - is only available as of PHP 8.4.0. + is only available as of PHP 8.4. ************************************ Maintaining Backward Compatibility From 30f73aab5e8fd98e61acd069826bf47854087881 Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Sun, 24 Aug 2025 13:53:26 +0100 Subject: [PATCH 3/3] zend: optimisation for zend_get_page_size for macos. (#19494) Using the getpagesize() call instead which saves one call. --- Zend/zend.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Zend/zend.c b/Zend/zend.c index 2f5a21ef24040..045d25134f8c9 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1275,9 +1275,10 @@ ZEND_API size_t zend_get_page_size(void) SYSTEM_INFO system_info; GetSystemInfo(&system_info); return system_info.dwPageSize; -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__APPLE__) /* This returns the value obtained from - * the auxv vector, avoiding a syscall. */ + * the auxv vector, avoiding a + * syscall (on FreeBSD)/function call (on macOS). */ return getpagesize(); #else return (size_t) sysconf(_SC_PAGESIZE);