Reduce memory allocated by var_export, json_encode, serialize, and other (#8902)

smart_str uses an over-allocated string to optimize for append operations. Functions that use smart_str tend

Reduce memory allocated by var_export, json_encode, serialize, and other (#8902)

smart_str uses an over-allocated string to optimize for append operations. Functions that use smart_str tend to return the over-allocated string directly. This results in unnecessary memory usage, especially for small strings.

The overhead can be up to 231 bytes for strings smaller than that, and 4095 for other strings. This can be avoided for strings smaller than `4096 - zend_string header size - 1` by reallocating the string.

This change introduces `smart_str_trim_to_size()`, and calls it in `smart_str_extract()`. Functions that use `smart_str` are updated to use `smart_str_extract()`.

Fixes GH-8896

show more ...

Convert return type of various object handlers from int to zend_result (#8755)

Merge branch 'PHP-8.1'

* PHP-8.1:
Fix GH-8366: ArrayIterator may leak when calling __construct()

Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
Fix GH-8366: ArrayIterator may leak when calling __construct()

Fix GH-8366: ArrayIterator may leak when calling __construct()

When we detach an iterator, we also have to delete it.

Closes GH-8374.

SPL: minor refactoring (#8341)

Use more appropriate types and return macros

Use zend_result/bool in spl_array.c

Use ZEND_THROWS() where applicable in spl_array.c

Convert check + exception to assertion

Move the inside the __unserialize() method as that's the only one which now needs this check

Closes GH-8207

Remove unnecessary zend_user_iterator use in spl_array

We no longer use any functionality of zend_user_iterator here.

Automatically determine whether to reuse get_iterator()

Same as with the IteratorAggregate case, allow reusing get_iterator
if none of the Iterator methods are overridden. Drop the
R

Automatically determine whether to reuse get_iterator()

Same as with the IteratorAggregate case, allow reusing get_iterator
if none of the Iterator methods are overridden. Drop the
REUSE_GET_ITERATOR flag that previously allowed ArrayIterator to
opt-in to unconditional get_iterator reuse, and drop the override
handling it did, in favor of the automated approach.

show more ...

Initialize iterator_funcs_ptr upfront

Same as we do for the IteratorAggregate case, initialize the
Iterator methods upfront. This is preparation for an upcoming
change to automatical

Initialize iterator_funcs_ptr upfront

Same as we do for the IteratorAggregate case, initialize the
Iterator methods upfront. This is preparation for an upcoming
change to automatically determine whether get_iterator can be
reused in a child class, in the same way we already do for
IteratorAggregate.

show more ...

Export zend_use_resource_as_offset()

Use a common implementation to generate this error message, as
we do so in quite a few places dealing with array keys.

Add RETURN/RETVAL_COPY_DEREF() macros

These were missing from the set...

I think quite a few of these usages don't actually need the DEREF,
but I've just kept things as is for n

Add RETURN/RETVAL_COPY_DEREF() macros

These were missing from the set...

I think quite a few of these usages don't actually need the DEREF,
but I've just kept things as is for now.

show more ...

Merge branch 'PHP-8.0'

* PHP-8.0:
Fix ArrayObject::exchangeArray() return type

Fix ArrayObject::exchangeArray() return type

This method cannot return null.

Fixed some spaces used instead of tabs

Refactor spl_array_has_dimension_ex()

Use early returns instead of else blocks
Add comments, especially to explain why we need a check_empty == 2 check

Fix bug #80945: Don't throw undefined array key warning in ArrayObject unset()

This makes the behavior of ArrayObject the same as far plain
arrays, which don't throw a warning when unset

Fix bug #80945: Don't throw undefined array key warning in ArrayObject unset()

This makes the behavior of ArrayObject the same as far plain
arrays, which don't throw a warning when unsetting a key that
already doesn't exit.

show more ...

Remove explicit assignments of zend_objects_destroy_object

This is the default handler, no need to set it explicitly. This
makes it easier to see which objects really have a custom dtor_

Remove explicit assignments of zend_objects_destroy_object

This is the default handler, no need to set it explicitly. This
makes it easier to see which objects really have a custom dtor_obj.

show more ...

Implement "Deprecate implicit non-integer-compatible float to int conversions" RFC. (#6661)

RFC: https://wiki.php.net/rfc/implicit-float-int-deprecate

Co-authored-by: Nikita Popov <

Implement "Deprecate implicit non-integer-compatible float to int conversions" RFC. (#6661)

RFC: https://wiki.php.net/rfc/implicit-float-int-deprecate

Co-authored-by: Nikita Popov <nikita.ppv@gmail.com>

show more ...

Update http->https in license (#6945)

1. Update: http://www.php.net/license/3_01.txt to https, as there is anyway server header "Location:" to https.
2. Update few license 3.0 to 3.01 as

Update http->https in license (#6945)

1. Update: http://www.php.net/license/3_01.txt to https, as there is anyway server header "Location:" to https.
2. Update few license 3.0 to 3.01 as 3.0 states "php 5.1.1, 4.1.1, and earlier".
3. In some license comments is "at through the world-wide-web" while most is without "at", so deleted.
4. fixed indentation in some files before |

show more ...

Introduce pseudo-keyword ZEND_FALLTHROUGH

And use it instead of comments

Merge branch 'PHP-8.0'

* PHP-8.0:
Fixed bug #80802: (zend_jit_fetch_indirect_var assert failure with tracing JIT)

Fixed bug #80802: (zend_jit_fetch_indirect_var assert failure with tracing JIT)