From: Dmitry Stogov Date: Mon, 23 May 2016 07:14:26 +0000 (+0300) Subject: Merge branch 'nullable_types' of github.com:morrisonlevi/php-src X-Git-Tag: php-7.1.0alpha1~99 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0cdbabe558dbdbe3bab6ba9102dba8311a5ea7f7;p=php Merge branch 'nullable_types' of github.com:morrisonlevi/php-src * 'nullable_types' of github.com:morrisonlevi/php-src: Fix bug #71428 Add nullable parameter types Implement nullable return types. --- 0cdbabe558dbdbe3bab6ba9102dba8311a5ea7f7 diff --cc NEWS index 5bb69bd52a,9b26cdbda9..150586fe47 --- a/NEWS +++ b/NEWS @@@ -3,9 -3,6 +3,10 @@@ PH ?? ??? 2016, PHP 7.1.0 - Core: ++ . Added nullable types. (Levi, Dmitry) + . Added DFA optimization framework based on e-SSA form. (Dmitry, Nikita) + . Added specialized opcode handlers (e.g. ZEND_ADD_LONG_NO_OVERFLOW). + (Dmitry) . Change statement and fcall extension handlers to accept frame. (Joe) . Implemented safe execution timeout handling, that prevents rundom crashes after "Maximum execution time exceeded" error. (Dmitry) diff --cc Zend/zend_language_parser.y index 5f233d6a3b,7682d69b68..44c5cfb12b --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@@ -249,9 -250,9 +249,9 @@@ static YYSIZE_T zend_yytnamerr(char*, c %type non_empty_parameter_list argument_list non_empty_argument_list property_list %type class_const_list class_const_decl name_list trait_adaptations method_body non_empty_for_exprs %type ctor_arguments alt_if_stmt_without_else trait_adaptation_list lexical_vars -%type lexical_var_list encaps_list array_pair_list non_empty_array_pair_list -%type assignment_list unkeyed_assignment_list keyed_assignment_list +%type lexical_var_list encaps_list +%type array_pair non_empty_array_pair_list array_pair_list - %type isset_variable type return_type + %type isset_variable type return_type type_expr %type identifier %type returns_ref function is_reference is_variadic variable_modifiers