Merge branch 'PHP-5.6'

This commit is contained in:
Xinchen Hui 2015-02-27 11:43:49 +08:00
commit a8927cd647
2 changed files with 23 additions and 0 deletions

View file

@ -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:

View file

@ -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"