Deprecate version 20, mark 35 as default

Author: nikic

README.md

@@ -440,7 +440,11 @@ Version changelog
   These will now be normalized to always use an `AST_STMT_LIST`. A `null` is only allowed if it is
   semantically meaningful, e.g. in the case of `declare(ticks=1);` vs `declare(ticks=1) {}`.
 
-### 35 (in development)
+### 35 (current)
+
+Supported since 2016-08-04.
+
+This version normalizes the AST to PHP 7.1 format.
 
 * The `class` node of `AST_CATCH` is now always represented as an `AST_NAME_LIST`. In lower
   versions: On PHP 7.0 it will always be an `AST_NAME`. In PHP 7.1 it will be an `AST_NAME` if
@@ -450,15 +454,15 @@ Version changelog
   `AST_ARRAY` if `list()` is used with keys. In PHP 7.1 destructuring using `[]` will always be
   represented using `AST_ARRAY`, independently of the version.
 
-### 30 (current)
+### 30 (supported)
 
 Supported since 2015-03-10.
 
 * Use string names for child nodes of kinds with fixed length.
 
-### 20 (supported)
+### 20 (deprecated)
 
-Supported since 2015-12-14.
+Supported since 2015-12-14. Deprecated since 2016-08-04.
 
 * `AST_GREATER`, `AST_GREATER_EQUAL`, `AST_OR`, `AST_AND` nodes are now represented using
   `AST_BINARY_OP` with flags `BINARY_IS_GREATER`, `BINARY_IS_GREATER_OR_EQUAL`, `BINARY_BOOL_OR`

ast.c

@@ -28,7 +28,7 @@
 #define AST_CACHE_SLOT_LINENO   &AST_G(cache_slots)[2 * 2]
 #define AST_CACHE_SLOT_CHILDREN &AST_G(cache_slots)[2 * 3]
 
-#define AST_CURRENT_VERSION 30
+#define AST_CURRENT_VERSION 35
 
 /* Additional flags for BINARY_OP */
 #define AST_BINARY_IS_GREATER 256
@@ -602,7 +602,7 @@ static int ast_check_version(zend_long version) {
 	zend_string *version_info;
 
 	if (ast_version_known(version)) {
-		if (version == 10 || version == 15) {
+		if (version == 10 || version == 15 || version == 20) {
 			php_error_docref(NULL, E_DEPRECATED,
 				"Version " ZEND_LONG_FMT " is deprecated", version);
 		}

tests/assign_ops.phpt

@@ -100,6 +100,8 @@ AST_STMT_LIST
             0: "a"
         1: AST_VAR
             0: "b"
+
+Deprecated: ast\parse_code(): Version 20 is deprecated in %s on line %d
 AST_STMT_LIST
     0: AST_ASSIGN_OP
         flags: BINARY_BITWISE_OR (9)

tests/binary_ops.phpt

@@ -40,6 +40,8 @@ AST_STMT_LIST
             0: "a"
         1: AST_VAR
             0: "b"
+
+Deprecated: ast\parse_code(): Version 20 is deprecated in %s on line %d
 AST_STMT_LIST
     0: AST_BINARY_OP
         flags: BINARY_IS_GREATER (256)

tests/class_types.phpt

@@ -15,45 +15,45 @@ interface E {}
 new class {};
 PHP;
 
-echo ast_dump(ast\parse_code($code, $version=20));
+echo ast_dump(ast\parse_code($code, $version=30));
 
 ?>
 --EXPECT--
 AST_STMT_LIST
     0: AST_CLASS
         flags: 0
         name: A
-        0: null
-        1: null
-        2: AST_STMT_LIST
+        extends: null
+        implements: null
+        stmts: AST_STMT_LIST
     1: AST_CLASS
         flags: CLASS_ABSTRACT (32)
         name: B
-        0: null
-        1: null
-        2: AST_STMT_LIST
+        extends: null
+        implements: null
+        stmts: AST_STMT_LIST
     2: AST_CLASS
         flags: CLASS_FINAL (4)
         name: C
-        0: null
-        1: null
-        2: AST_STMT_LIST
+        extends: null
+        implements: null
+        stmts: AST_STMT_LIST
     3: AST_CLASS
         flags: CLASS_TRAIT (128)
         name: D
-        0: null
-        1: null
-        2: AST_STMT_LIST
+        extends: null
+        implements: null
+        stmts: AST_STMT_LIST
     4: AST_CLASS
         flags: CLASS_INTERFACE (64)
         name: E
-        0: null
-        1: null
-        2: AST_STMT_LIST
+        extends: null
+        implements: null
+        stmts: AST_STMT_LIST
     5: AST_NEW
-        0: AST_CLASS
+        class: AST_CLASS
             flags: CLASS_ANONYMOUS (256)
-            0: null
-            1: null
-            2: AST_STMT_LIST
-        1: AST_ARG_LIST
+            extends: null
+            implements: null
+            stmts: AST_STMT_LIST
+        args: AST_ARG_LIST

tests/nested_stat_lists.phpt

@@ -46,6 +46,8 @@ AST_STMT_LIST
             0: "f"
     2: AST_VAR
         0: "g"
+
+Deprecated: ast\parse_code(): Version 20 is deprecated in %s on line %d
 AST_STMT_LIST
     0: AST_VAR
         0: "a"

tests/try_catch_finally.phpt

@@ -54,6 +54,8 @@ AST_STMT_LIST
             0: AST_STMT_LIST
                 0: AST_ECHO
                     0: "finally"
+
+Deprecated: ast\parse_code(): Version 20 is deprecated in %s on line %d
 AST_STMT_LIST
     0: AST_TRY
         0: AST_STMT_LIST

tests/unary_ops.phpt

@@ -26,6 +26,8 @@ AST_STMT_LIST
         0: 1
     2: AST_UNARY_MINUS
         0: 1
+
+Deprecated: ast\parse_code(): Version 20 is deprecated in %s on line %d
 AST_STMT_LIST
     0: AST_UNARY_OP
         flags: UNARY_SILENCE (260)