Fix bug #69579

Merge branch 'PHP-7.0' into PHP-7.1

Fix bug #69579

Merge branch 'PHP-7.0' into PHP-7.1

Remove zpp fallback code (always use Fast ZPP)

Squashed commit of the following:

commit 3e27fbb3d22b42d181e15c345f1c59a007b6b58c
Author: Andrea Faulds <ajf@ajf.me>
Date: S

Remove zpp fallback code (always use Fast ZPP)

Squashed commit of the following:

commit 3e27fbb3d22b42d181e15c345f1c59a007b6b58c
Author: Andrea Faulds <ajf@ajf.me>
Date: Sun Sep 11 19:14:37 2016 +0100

Keep dummy FAST_ZPP macro for compatibility

commit 8a7cfd00deaa4a3c5026c97580c49c886c72a5b4
Author: Andrea Faulds <ajf@ajf.me>
Date: Mon Sep 5 22:36:03 2016 +0100

Remove FAST_ZPP macro and plain zpp fallback code

show more ...

Fixed use after free

Require parameter to be an object if passed.

Fixed compilation warnings

Merge branch 'PHP-7.0'

* PHP-7.0:
Allow "proxy" ovjects to substitute their class names through get_class_name() handler (similar to var_dump() and others).

Allow "proxy" ovjects to substitute their class names through get_class_name() handler (similar to var_dump() and others).

Forbid dynamic calls to scope introspection functions

Per RFC:
https://wiki.php.net/rfc/forbid_dynamic_scope_introspection

Intern some known (and offten used) strings.

Merge branch 'PHP-7.0'

* PHP-7.0:
Fixed test
Revert "Fix bug #72162 (again)"

Revert "Fix bug #72162 (again)"

The problem is because we release p->value too early

and later you try to convert an object to string, which is a fatal error

then leave p->

Revert "Fix bug #72162 (again)"

The problem is because we release p->value too early

and later you try to convert an object to string, which is a fatal error

then leave p->value double free, change to expect long is a BC break

This reverts commit 8e5b38100411d3b8fa4486c7c41dec7dedb4b474.

show more ...

Merge branch 'PHP-7.0'

Conflicts:
Zend/zend_builtin_functions.c

Fix bug #72162 (again)

Not sure what the previous fix was supposed to do. The issue was
that error_reporting() simply assumes that the value must either
be an integer or a string.

Fix bug #72162 (again)

Not sure what the previous fix was supposed to do. The issue was
that error_reporting() simply assumes that the value must either
be an integer or a string.

Fixed by using zpp properly.

show more ...

Merge branch 'PHP-7.0'

* PHP-7.0:
Fixed bug #72162 (use-after-free - error_reporting)

Fixed bug #72162 (use-after-free - error_reporting)

Fixed compilation warnings

- get rid of EG(scope). zend_get_executed_scope() should be used instead.
- ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change"

- get rid of EG(scope). zend_get_executed_scope() should be used instead.
- ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change" parameter.

show more ...

Merge zend_execute_data->called_scope into zend_execute_data->This.
"called_scope" made sense only for static method calls, for dynamic calls it was always equal to the class of $this.
Now EG

Merge zend_execute_data->called_scope into zend_execute_data->This.
"called_scope" made sense only for static method calls, for dynamic calls it was always equal to the class of $this.
Now EG(This) may store IS_OBJECT + $this or IS_UNUSED + "called_scope" (of course, "called_scope" may be NULL).
Some code might need to be adopted to support this change.
Checks (Z_OBJ(EX(This))) might need to be converted into (Z_TYPE(EX(This)) == IS_OBJECT).

show more ...

Merge branch 'PHP-7.0'

* PHP-7.0:
Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)

Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)

Return meaningful value

Empty line