clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #35509 (string constant as array key has different behavior inside object)

Browse Source
This commit is contained in:
Dmitry Stogov 2005-12-05 08:56:09 +00:00
parent 6abf54a489
commit 9ee0707cfa
4 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -24,6 +24,8 @@ PHP NEWS
- Fixed bug #35543 (php crash when calling non existing method of a class
that extends PDO). (Tony)
- Fixed bug #35539 (typo in error message for ErrorException). (Tony)
- Fixed bug #35509 (string constant as array key has different behavior inside
object). (Dmitry)
- Fixed bug #35508 (PDO fails when unknown fetch mode specified). (Tony)
- Fixed bug #35499 (strtotime() does not handle whitespace around the date
string). (Ilia)

31
Zend/tests/bug35509.phpt Executable file
View File

@ -0,0 +1,31 @@
--TEST--
Bug #35509 (string constant as array key has different behavior inside object)
--FILE--
<?php
class mytest
{
const classConstant = '01';
private $classArray = array( mytest::classConstant => 'value' );
public function __construct()
{
print_r($this->classArray);
}
}
$classtest = new mytest();
define( "normalConstant", '01' );
$normalArray = array( normalConstant => 'value' );
print_r($normalArray);
?>
--EXPECT--
Array
(
[01] => value
)
Array
(
[01] => value
)

12
Zend/zend_execute_API.c
View File

@ -501,17 +501,9 @@ ZEND_API int zval_update_constant(zval **pp, void *arg TSRMLS_DC)
*element = new_val;
switch (const_value.type) {
case IS_STRING: {
long lval;
double dval;
if (is_numeric_string(const_value.value.str.val, const_value.value.str.len, &lval, &dval, 0) == IS_LONG) {
zend_hash_update_current_key(p->value.ht, HASH_KEY_IS_LONG, NULL, 0, lval);
} else {
zend_hash_update_current_key(p->value.ht, HASH_KEY_IS_STRING, const_value.value.str.val, const_value.value.str.len+1, 0);
}
case IS_STRING:
zend_symtable_update_current_key(p->value.ht, const_value.value.str.val, const_value.value.str.len+1);
break;
}
case IS_BOOL:
case IS_LONG:
zend_hash_update_current_key(p->value.ht, HASH_KEY_IS_LONG, NULL, 0, const_value.value.lval);

6
Zend/zend_hash.h
View File

@ -353,6 +353,12 @@ static inline int zend_symtable_exists(HashTable *ht, char *arKey, uint nKeyLeng
return zend_hash_exists(ht, arKey, nKeyLength);
}
static inline int zend_symtable_update_current_key(HashTable *ht, char *arKey, uint nKeyLength)
{
HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_update_current_key(ht, HASH_KEY_IS_LONG, NULL, 0, idx));
return zend_hash_update_current_key(ht, HASH_KEY_IS_STRING, arKey, nKeyLength, 0);
}
#endif /* ZEND_HASH_H */
/*