Mark version 35 as deprecated

nikic · nikic · commit 220bab819fb4 · 2017-07-19T13:27:15.000+02:00
diff --git a/README.md b/README.md
@@ -476,7 +476,7 @@ Supported since 2017-01-18.
 
 ### 35 (supported)
 
-Supported since 2016-08-04.
+Supported since 2016-08-04. Deprecated since 2017-07-19.
 
 This version normalizes the AST to PHP 7.1 format.
 
diff --git a/ast.c b/ast.c
@@ -620,7 +620,7 @@ static int ast_check_version(zend_long version) {
 	zend_string *version_info;
 
 	if (ast_version_known(version)) {
-		if (version == 30) {
+		if (version == 30 || version == 35) {
 			php_error_docref(NULL, E_DEPRECATED,
 				"Version " ZEND_LONG_FMT " is deprecated", version);
 		}
diff --git a/tests/array_destructuring_old.phpt b/tests/array_destructuring_old.phpt
@@ -12,7 +12,7 @@ list(, $b) = $x;
 PHP;
 
 echo ast_dump(ast\parse_code($code, $version=30)), "\n";
-echo ast_dump(ast\parse_code($code, $version=35));
+echo ast_dump(ast\parse_code($code, $version=50));
 
 ?>
 --EXPECTF--
diff --git a/tests/coalesce.phpt b/tests/coalesce.phpt
@@ -14,7 +14,8 @@ echo ast_dump(ast\parse_code($code, $version=35)), "\n";
 echo ast_dump(ast\parse_code($code, $version=40)), "\n";
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: ast\parse_code(): Version 35 is deprecated in %s on line %d
 AST_STMT_LIST
     0: AST_COALESCE
         left: AST_VAR
diff --git a/tests/multi_catch.phpt b/tests/multi_catch.phpt
@@ -15,7 +15,7 @@ try {
 PHP;
 
 echo ast_dump(ast\parse_code($code, $version=30));
-echo ast_dump(ast\parse_code($code, $version=35));
+echo ast_dump(ast\parse_code($code, $version=50));
 
 ?>
 --EXPECTF--
diff --git a/tests/name_node.phpt b/tests/name_node.phpt
@@ -17,7 +17,8 @@ echo ast_dump(ast\parse_code($code, $version=35)), "\n";
 echo ast_dump(ast\parse_code($code, $version=40)), "\n";
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: ast\parse_code(): Version 35 is deprecated in %s on line %d
 AST_STMT_LIST
     0: AST_CALL
         expr: AST_NAME
diff --git a/tests/nop_statements.phpt b/tests/nop_statements.phpt
@@ -16,7 +16,8 @@ echo ast_dump(ast\parse_code($code, $version=35)), "\n";
 echo ast_dump(ast\parse_code($code, $version=40)), "\n";
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: ast\parse_code(): Version 35 is deprecated in %s on line %d
 AST_STMT_LIST
     0: AST_VAR
         name: "a"
diff --git a/tests/stmt_list.phpt b/tests/stmt_list.phpt
@@ -19,7 +19,8 @@ echo ast_dump(ast\parse_code($code, $version=35)), "\n";
 echo ast_dump(ast\parse_code($code, $version=40)), "\n";
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: ast\parse_code(): Version 35 is deprecated in %s on line %d
 AST_STMT_LIST
     0: AST_WHILE
         cond: AST_VAR
diff --git a/tests/try_catch_finally.phpt b/tests/try_catch_finally.phpt
@@ -19,7 +19,7 @@ try {
 PHP;
 
 echo ast_dump(ast\parse_code($code, $version=30)), "\n";
-echo ast_dump(ast\parse_code($code, $version=35)), "\n";
+echo ast_dump(ast\parse_code($code, $version=50)), "\n";
 
 ?>
 --EXPECTF--
diff --git a/tests/type_hints.phpt b/tests/type_hints.phpt
@@ -17,7 +17,8 @@ echo ast_dump(ast\parse_code($code, $version=35)), "\n";
 echo ast_dump(ast\parse_code($code, $version=40)), "\n";
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: ast\parse_code(): Version 35 is deprecated in %s on line %d
 AST_STMT_LIST
     0: AST_FUNC_DECL
         flags: 0

Original file line number	Diff line number	Diff line change
`@@ -620,7 +620,7 @@ static int ast_check_version(zend_long version) {`
`620`	`620`	`zend_string *version_info;`
`621`	`621`
`622`	`622`	`if (ast_version_known(version)) {`
`623`		`- if (version == 30) {`
	`623`	`+ if (version == 30 \|\| version == 35) {`
`624`	`624`	`php_error_docref(NULL, E_DEPRECATED,`
`625`	`625`	`"Version " ZEND_LONG_FMT " is deprecated", version);`
`626`	`626`	`}`