com php-src: Refactor declare placement detection, allow encoding declares before type declares: Zend/tests/typehints/scalar_strict_de
claration_placement_006.phpt Zend/tests/typehints /scalar_strict_declaration_placement_008.phpt Zend/zend_compile.c

From: Date: Fri, 20 Feb 2015 20:56:58 +0000
Subject: com php-src: Refactor declare placement detection, allow encoding declares before type declares: Zend/tests/typehints/scalar_strict_de
claration_placement_006.phpt Zend/tests/typehints /scalar_strict_declaration_placement_008.phpt Zend/zend_compile.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85693@lists.php.net to get a copy of this message
Commit: 7c8d1e0bd728dcbda16b1bc8a5bcac25c193e699 Author: Anthony Ferrara <ircmaxell@gmail.com> Fri, 20 Feb 2015 15:56:58 -0500 Parents: dc35868a7746b9ccca96a80c96706333f2b3951d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7c8d1e0bd728dcbda16b1bc8a5bcac25c193e699 Log: Refactor declare placement detection, allow encoding declares before type declares Changed paths: M Zend/tests/typehints/scalar_strict_declaration_placement_006.phpt A Zend/tests/typehints/scalar_strict_declaration_placement_008.phpt M Zend/zend_compile.c Diff: diff --git a/Zend/tests/typehints/scalar_strict_declaration_placement_006.phpt b/Zend/tests/typehints/scalar_strict_declaration_placement_006.phpt index cac5848..2af05b6 100644 --- a/Zend/tests/typehints/scalar_strict_declaration_placement_006.phpt +++ b/Zend/tests/typehints/scalar_strict_declaration_placement_006.phpt @@ -22,4 +22,4 @@ var_dump(strlen("abc")); ?> --EXPECTF-- -Fatal error: strict_types declaration must be the very first statement in the script in %s on line %d \ No newline at end of file +int(3) \ No newline at end of file diff --git a/Zend/tests/typehints/scalar_strict_declaration_placement_008.phpt b/Zend/tests/typehints/scalar_strict_declaration_placement_008.phpt new file mode 100644 index 0000000..87a09af --- /dev/null +++ b/Zend/tests/typehints/scalar_strict_declaration_placement_008.phpt @@ -0,0 +1,11 @@ +--TEST-- +Test strict declaration block declaration 008 +--FILE-- +<?php +declare(strict_types=1) { + var_dump(strlen("abc")); +} + +?> +--EXPECTF-- +Fatal error: strict_types declaration must not use block mode in %s on line %d \ No newline at end of file diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 2a22014..4e5914d 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3864,6 +3864,28 @@ void zend_handle_encoding_declaration(zend_ast *ast) /* {{{ */ } /* }}} */ +static int zend_declare_is_first_statement(zend_ast *ast) /* {{{ */ +{ + uint32_t i = 0; + zend_ast_list *file_ast = zend_ast_get_list(CG(ast)); + + /* Check to see if this declare is preceeded only by declare statements */ + while (i < file_ast->children) { + if (file_ast->child[i] == ast) { + return SUCCESS; + } else if (file_ast->child[i] == NULL) { + /* Empty statements are not allowed prior to a declare */ + return FAILURE; + } else if (file_ast->child[i]->kind != ZEND_AST_DECLARE) { + /* declares can only be preceeded by other declares */ + return FAILURE; + } + i++; + } + return FAILURE; +} +/* }}} */ + void zend_compile_declare(zend_ast *ast) /* {{{ */ { zend_ast_list *declares = zend_ast_get_list(ast->child[0]); @@ -3884,46 +3906,25 @@ void zend_compile_declare(zend_ast *ast) /* {{{ */ ZVAL_COPY_VALUE(&CG(declarables).ticks, &value_zv); zval_dtor(&value_zv); } else if (zend_string_equals_literal_ci(name, "encoding")) { - uint32_t i = 0; - zend_bool valid = 0; - /* Encoding declaration was already handled during parsing. Here we - * only check that it is the first statement in the file. */ - zend_ast_list *file_ast = zend_ast_get_list(CG(ast)); - - /* Check to see if this declare is preceeded only by declare statements */ - while (valid == 0 && i < file_ast->children) { - if (file_ast->child[i] == ast) { - valid = 1; - } else if (file_ast->child[i] == NULL) { - /* Empty statements are not allowed prior to a declare */ - break; - } else if (file_ast->child[i]->kind != ZEND_AST_DECLARE) { - /* declares can only be preceeded by other declares */ - break; - } - i++; - } - if (valid != 1) { + + if (FAILURE == zend_declare_is_first_statement(ast)) { zend_error_noreturn(E_COMPILE_ERROR, "Encoding declaration pragma must be " "the very first statement in the script"); } } else if (zend_string_equals_literal_ci(name, "strict_types")) { zval value_zv; - /* Check that it is the node in the AST from the file. */ - zend_ast_list *file_ast = zend_ast_get_list(CG(ast)); - - if (file_ast->child[0] != ast) { - zend_error_noreturn(E_COMPILE_ERROR, "strict_types declaration must be " - "the very first statement in the script"); - } + if (FAILURE == zend_declare_is_first_statement(ast)) { + zend_error_noreturn(E_COMPILE_ERROR, "strict_types declaration must be " + "the very first statement in the script"); + } - if (ast->child[1] != NULL) { - zend_error_noreturn(E_COMPILE_ERROR, "strict_types declaration must not " - "use block mode"); - } + if (ast->child[1] != NULL) { + zend_error_noreturn(E_COMPILE_ERROR, "strict_types declaration must not " + "use block mode"); + } - zend_const_expr_to_zval(&value_zv, value_ast); + zend_const_expr_to_zval(&value_zv, value_ast); if (Z_TYPE(value_zv) != IS_LONG || (Z_LVAL(value_zv) != 0 && Z_LVAL(value_zv) != 1)) { zend_error_noreturn(E_COMPILE_ERROR, "strict_types declaration must have 0 or 1 as its value");

« previous php.cvs (#85693) next »