diff options
| author | Nikita Popov <nikic@php.net> | 2014-08-16 21:55:08 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-08-16 21:55:08 +0200 |
| commit | 71675a4bf830d7b9400663275fe48275480d34f4 (patch) | |
| tree | 8ce9b1fdda30d26121334fb5c228df7884f6f7c2 /tests/classes | |
| parent | f72d6f97ecf976f00abc0dc21b5d1ef4838de60a (diff) | |
| parent | 8b66d64b2343bc4fd8aeabb690024edb850a0155 (diff) | |
| download | php-git-71675a4bf830d7b9400663275fe48275480d34f4.tar.gz | |
Merge remote-tracking branch 'php-src/phpng' into ast
Conflicts:
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_language_parser.y
Incomplete merge!
Diffstat (limited to 'tests/classes')
| -rw-r--r-- | tests/classes/constants_error_002.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/classes/constants_error_002.phpt b/tests/classes/constants_error_002.phpt index be27971b87..63aa22109c 100644 --- a/tests/classes/constants_error_002.phpt +++ b/tests/classes/constants_error_002.phpt @@ -7,6 +7,6 @@ Error case: class constant as an array const myConst = array(); } ?> +===DONE=== --EXPECTF-- - -Fatal error: Arrays are not allowed in class constants in %s on line 4 +===DONE=== |