php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #74922 - Try to resolve constants when importing trait properties

Browse Source
This commit is contained in:
Pedro Magalhães
2017-09-27 01:31:03 +01:00
committed by Nikita Popov
parent b27a6b16dd
commit 897bdb42f0
7 changed files with 99 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -14,6 +14,8 @@ PHP NEWS
(andrewnester)
. Fixed bug #69954 (broken links and unused config items in distributed ini
files). (petk)
. Fixed bug #74922 (Composed class has fatal error with duplicate, equal const
properties). (pmmaga)
- BCMath:
. Fixed bug #66364 (BCMath bcmul ignores scale parameter). (cmb)

16
Zend/tests/traits/bug74922.phpt Normal file
View File

@@ -0,0 +1,16 @@
--TEST--
Bug #74922 (Composed class has fatal error with duplicate, equal const properties)
--FILE--
<?php
const VALUE = true;
trait Foo {public $var = VALUE;}
trait Bar {public $var = VALUE;}
class Baz {use Foo, Bar;}
echo "DONE";
?>
--EXPECT--
DONE

16
Zend/tests/traits/bug74922a.phpt Normal file
View File

@@ -0,0 +1,16 @@
--TEST--
Bug #74922 (Composed class has fatal error with duplicate, equal const properties)
--FILE--
<?php
const VALUE = true;
trait Foo {public $var = VALUE;}
trait Bar {public $var = true;}
class Baz {use Foo, Bar;}
echo "DONE";
?>
--EXPECT--
DONE

9
Zend/tests/traits/bug74922b.inc Normal file
View File

@@ -0,0 +1,9 @@
<?php
namespace Bug74922;
const FOO = 'foo';
trait T1 {
public $var = FOO;
}

15
Zend/tests/traits/bug74922b.phpt Normal file
View File

@@ -0,0 +1,15 @@
--TEST--
Bug #74922 (Composed class has fatal error with duplicate, equal const properties)
--FILE--
<?php
require('bug74922b.inc');
trait T2 {public $var = Bug74922\FOO;}
class Baz {use Bug74922\T1, T2;}
echo "DONE";
?>
--EXPECT--
DONE

20
Zend/tests/traits/bug74922c.phpt Normal file
View File

@@ -0,0 +1,20 @@
--TEST--
Bug #74922 (Composed class has fatal error with duplicate, equal const properties)
--FILE--
<?php
trait T {
public $x = self::X;
}
trait T2 {
public $x = self::X;
}
class C {
use T, T2;
const X = 42;
}
var_dump((new C)->x);
?>
--EXPECT--
int(42)

29
Zend/zend_inheritance.c
View File

@@ -1584,19 +1584,32 @@ static void zend_do_traits_property_binding(zend_class_entry *ce) /* {{{ */
zend_hash_del(&ce->properties_info, prop_name);
flags |= ZEND_ACC_CHANGED;
} else {
not_compatible = 1;
if ((coliding_prop->flags & (ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC))
== (flags & (ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC))) {
/* flags are identical, now the value needs to be checked */
/* the flags are identical, thus, the properties may be compatible */
zval op1, op2;
if (flags & ZEND_ACC_STATIC) {
not_compatible = fast_is_not_identical_function(&ce->default_static_members_table[coliding_prop->offset],
&ce->traits[i]->default_static_members_table[property_info->offset]);
ZVAL_COPY_OR_DUP(&op1, &ce->default_static_members_table[coliding_prop->offset]);
ZVAL_COPY_OR_DUP(&op2, &ce->traits[i]->default_static_members_table[property_info->offset]);
} else {
not_compatible = fast_is_not_identical_function(&ce->default_properties_table[OBJ_PROP_TO_NUM(coliding_prop->offset)],
&ce->traits[i]->default_properties_table[OBJ_PROP_TO_NUM(property_info->offset)]);
ZVAL_COPY_OR_DUP(&op1, &ce->default_properties_table[OBJ_PROP_TO_NUM(coliding_prop->offset)]);
ZVAL_COPY_OR_DUP(&op2, &ce->traits[i]->default_properties_table[OBJ_PROP_TO_NUM(property_info->offset)]);
}
} else {
/* the flags are not identical, thus, we assume properties are not compatible */
not_compatible = 1;
/* if any of the values is a constant, we try to resolve it */
if (UNEXPECTED(Z_TYPE(op1) == IS_CONSTANT_AST)) {
zval_update_constant_ex(&op1, ce);
}
if (UNEXPECTED(Z_TYPE(op2) == IS_CONSTANT_AST)) {
zval_update_constant_ex(&op2, ce);
}
not_compatible = fast_is_not_identical_function(&op1, &op2);
zval_ptr_dtor_nogc(&op1);
zval_ptr_dtor_nogc(&op2);
}
if (not_compatible) {