diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-04-07 13:58:00 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-04-07 13:58:00 +0800 |
| commit | 079239a7cececfca9344b24f5bb1cca127d4bcc9 (patch) | |
| tree | c02a94788db9aac4f3834a7029ce6af28e905b29 /Zend/zend_language_parser.y | |
| parent | 7e042224a26282938b866a49ca3d4af1b368c0cc (diff) | |
| parent | 5ab950cb2ca362af3f718179f1da430922c1e0dd (diff) | |
| download | php-git-079239a7cececfca9344b24f5bb1cca127d4bcc9.tar.gz | |
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
Remove __halt_compiler from semi-reserved tokens
Fixed Bug #71974 Trans sid will always be send, even if cookies are available
Optimized array_fill(). This is a perfect function for fast creation of packed arrays.
Fixed build
fix merge mistake
fix tests
PostgreSQL's PDOStatement::getColumnMeta() fills in table's name.
fix indent
Fixed bug #71978 (Existence of return type hint affects other compatibility rules)
fix test
fix bug #71667 (emulate how mssql extension names "computed" columns)
update NEWS
add 32-bit specific variont for #62498
skip test on 32-bit
make opcache lockfile path configurable
return zvals instead of strings, cast or not based on stringify attribute
fix test
add skip slow test
Diffstat (limited to 'Zend/zend_language_parser.y')
| -rw-r--r-- | Zend/zend_language_parser.y | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 804ed37473..9f99453cd4 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -272,7 +272,7 @@ reserved_non_modifiers: | T_THROW | T_USE | T_INSTEADOF | T_GLOBAL | T_VAR | T_UNSET | T_ISSET | T_EMPTY | T_CONTINUE | T_GOTO | T_FUNCTION | T_CONST | T_RETURN | T_PRINT | T_YIELD | T_LIST | T_SWITCH | T_ENDSWITCH | T_CASE | T_DEFAULT | T_BREAK | T_ARRAY | T_CALLABLE | T_EXTENDS | T_IMPLEMENTS | T_NAMESPACE | T_TRAIT | T_INTERFACE | T_CLASS - | T_CLASS_C | T_TRAIT_C | T_FUNC_C | T_METHOD_C | T_LINE | T_FILE | T_DIR | T_NS_C | T_HALT_COMPILER + | T_CLASS_C | T_TRAIT_C | T_FUNC_C | T_METHOD_C | T_LINE | T_FILE | T_DIR | T_NS_C ; semi_reserved: |