Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed bug #79115
This commit is contained in:
Nikita Popov 2020-01-17 11:38:00 +01:00
commit 384dfe331b
3 changed files with 22 additions and 0 deletions

4
NEWS
View File

@ -13,6 +13,10 @@ PHP NEWS
. Fixed bug #79084 (mysqlnd may fetch wrong column indexes with MYSQLI_BOTH).
(cmb)
- Reflection:
. Fixed bug #79115 (ReflectionClass::isCloneable call reflected class
__destruct). (Nikita)
23 Jan 2020, PHP 7.4.2
- Core:

View File

@ -4528,6 +4528,8 @@ ZEND_METHOD(reflection_class, isCloneable)
if (UNEXPECTED(object_init_ex(&obj, ce) != SUCCESS)) {
return;
}
/* We're not calling the constructor, so don't call the destructor either. */
zend_object_store_ctor_failed(Z_OBJ(obj));
RETVAL_BOOL(Z_OBJ_HANDLER(obj, clone_obj) != NULL);
zval_ptr_dtor(&obj);
}

View File

@ -0,0 +1,16 @@
--TEST--
Bug #79115: ReflectionClass::isCloneable call reflected class __destruct
--FILE--
<?php
class A {
function __construct() { echo __FUNCTION__ . "\n"; }
function __destruct() { echo __FUNCTION__ . "\n"; }
}
$c = new ReflectionClass('A');
var_dump($c->isCloneable());
?>
--EXPECT--
bool(true)