diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-27 11:43:49 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-27 11:43:49 +0800 |
| commit | a8927cd64774bd3bad08ca79ea251d23ce172ede (patch) | |
| tree | 3b162fb6745afd0b9cc416691f6ba45ac1219852 | |
| parent | 5b8a504519ddf6fb2fb050070ff823f07fb7a406 (diff) | |
| parent | 4b83d02b4b5d09c5f5aecc739fdd76f835561fe3 (diff) | |
| download | php-git-a8927cd64774bd3bad08ca79ea251d23ce172ede.tar.gz | |
Merge branch 'PHP-5.6'
| -rw-r--r-- | ext/opcache/Optimizer/zend_optimizer.c | 1 | ||||
| -rw-r--r-- | ext/opcache/tests/bug69125.phpt | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c index 62409e6530..1941a56dfa 100644 --- a/ext/opcache/Optimizer/zend_optimizer.c +++ b/ext/opcache/Optimizer/zend_optimizer.c @@ -250,6 +250,7 @@ void zend_optimizer_update_op2_const(zend_op_array *op_array, case ZEND_ISSET_ISEMPTY_DIM_OBJ: case ZEND_ADD_ARRAY_ELEMENT: case ZEND_INIT_ARRAY: + case ZEND_ASSIGN_DIM: case ZEND_UNSET_DIM: case ZEND_FETCH_DIM_R: case ZEND_FETCH_DIM_W: diff --git a/ext/opcache/tests/bug69125.phpt b/ext/opcache/tests/bug69125.phpt new file mode 100644 index 0000000000..913be01b00 --- /dev/null +++ b/ext/opcache/tests/bug69125.phpt @@ -0,0 +1,22 @@ +--TEST-- +Bug #69125 (Array numeric string as key) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +--SKIPIF-- +<?php require_once('skipif.inc'); ?> +--FILE-- +<?php + +const SZERO = '0'; +const SONE = '1'; + +$array[SZERO] = "okey"; +$array[1] = "okey"; + +var_dump($array[SZERO]); +var_dump($array[SONE]); +?> +--EXPECT-- +string(4) "okey" +string(4) "okey" |