Deprecate AST version 40

Author: nikic

README.md

@@ -535,9 +535,9 @@ This version normalizes the AST to PHP 7.2 format.
 * An `object` type annotation now returns an `AST_TYPE` with `TYPE_OBJECT` flag, rather than
   treating `object` as a class name.
 
-### 40 (supported)
+### 40 (deprecated)
 
-Supported since 2017-01-18.
+Supported since 2017-01-18. Deprecated since 2018-10-06.
 
 * `AST_COALESCE` is now represented as an `AST_BINARY_OP` with flag `BINARY_COALESCE`.
 * For `AST_NAME` nodes with `NAME_FQ` the leading backslash is now dropped if syntax like

ast.c

@@ -782,7 +782,7 @@ static const zend_long versions[] = {30, 35, 40, 45, 50};
 static const size_t versions_count = sizeof(versions)/sizeof(versions[0]);
 
 static inline zend_bool ast_version_deprecated(zend_long version) {
-	return version == 30 || version == 35;
+	return version == 30 || version == 35 || version == 40;
 }
 
 static zend_string *ast_version_info() {

tests/001.phpt

@@ -20,13 +20,13 @@ function test(Type $arg = XYZ) : Ret {
 }
 PHP;
 
-echo ast_dump(ast\parse_code($code, $version=40));
+echo ast_dump(ast\parse_code($code, $version=50));
 --EXPECT--
 AST_STMT_LIST
     0: AST_FUNC_DECL
         flags: 0
-        name: test
-        docComment: /** Test function */
+        name: "test"
+        docComment: "/** Test function */"
         params: AST_PARAM_LIST
             0: AST_PARAM
                 flags: 0
@@ -70,3 +70,4 @@ AST_STMT_LIST
         returnType: AST_NAME
             flags: NAME_NOT_FQ (1)
             name: "Ret"
+        __declId: 0

tests/002.phpt

@@ -15,5 +15,7 @@ assert($fn->kind == ast\AST_FUNC_DECL);
 
 ?>
 ===DONE===
---EXPECT--
+--EXPECTF--
+
+Deprecated: ast\parse_code(): Version 40 is deprecated in %s on line %d
 ===DONE===

tests/array_destructuring.phpt

@@ -15,7 +15,7 @@ list('foo' => $a, 'bar' => $b) = $x;
 [, [$a]] = $x;
 PHP;
 
-echo ast_dump(ast\parse_code($code, $version=40));
+echo ast_dump(ast\parse_code($code, $version=50));
 
 ?>
 --EXPECT--

tests/assign_ops.phpt

@@ -21,7 +21,7 @@ $a <<= $b;
 $a >>= $b;
 PHP;
 
-echo ast_dump(ast\parse_code($code, $version=40)), "\n";
+echo ast_dump(ast\parse_code($code, $version=50)), "\n";
 
 ?>
 --EXPECTF--

tests/ast_dump_with_linenos.phpt

@@ -23,15 +23,16 @@ test
 }
 PHP;
 
-$ast = ast\parse_code($code, $version=40);
+$ast = ast\parse_code($code, $version=50);
 echo ast_dump($ast, AST_DUMP_LINENOS);
 
 ?>
 --EXPECT--
 AST_STMT_LIST @ 1
     0: AST_FUNC_DECL @ 2-9
         flags: 0
-        name: test
+        name: "test"
+        docComment: null
         params: AST_PARAM_LIST @ 4
         uses: null
         stmts: AST_STMT_LIST @ 5
@@ -43,3 +44,4 @@ AST_STMT_LIST @ 1
                     0: AST_VAR @ 7
                         name: "foo"
         returnType: null
+        __declId: 0

tests/binary_ops.phpt

@@ -13,7 +13,7 @@ $a and $b;
 $a or $b;
 PHP;
 
-echo ast_dump(ast\parse_code($code, $version=40)), "\n";
+echo ast_dump(ast\parse_code($code, $version=50)), "\n";
 
 ?>
 --EXPECT--

tests/class.phpt

@@ -15,14 +15,15 @@ class A extends B implements D, E {
 }
 PHP;
 
-echo ast_dump(ast\parse_code($code, $version=40));
+echo ast_dump(ast\parse_code($code, $version=50));
 
 ?>
 --EXPECTF--
 AST_STMT_LIST
     0: AST_CLASS
         flags: 0
-        name: A
+        name: "A"
+        docComment: null
         extends: AST_NAME
             flags: NAME_NOT_FQ (1)
             name: "B"
@@ -48,21 +49,28 @@ AST_STMT_LIST
                 0: AST_CONST_ELEM
                     name: "X"
                     value: "Y"
+                    docComment: null
                 1: AST_CONST_ELEM
                     name: "Y"
                     value: "X"
+                    docComment: null
             2: AST_PROP_DECL
                 flags: MODIFIER_PUBLIC (%d)
                 0: AST_PROP_ELEM
                     name: "foo"
                     default: null
+                    docComment: null
                 1: AST_PROP_ELEM
                     name: "bar"
                     default: null
+                    docComment: null
             3: AST_METHOD
                 flags: MODIFIER_PUBLIC | MODIFIER_ABSTRACT (%d)
-                name: test
+                name: "test"
+                docComment: null
                 params: AST_PARAM_LIST
                 uses: null
                 stmts: null
                 returnType: null
+                __declId: 0
+        __declId: 1

tests/class_consts.phpt

@@ -23,45 +23,50 @@ class Test {
 }
 PHP;
 
-echo ast_dump(ast\parse_code($code, $version=40));
+echo ast_dump(ast\parse_code($code, $version=50));
 
 ?>
 --EXPECTF--
 AST_STMT_LIST
     0: AST_CLASS
         flags: 0
-        name: Test
+        name: "Test"
+        docComment: null
         extends: null
         implements: null
         stmts: AST_STMT_LIST
             0: AST_CLASS_CONST_DECL
                 flags: MODIFIER_PUBLIC (%d)
                 0: AST_CONST_ELEM
-                    docComment: /** Doc A */
                     name: "A"
                     value: 1
+                    docComment: "/** Doc A */"
             1: AST_CLASS_CONST_DECL
                 flags: MODIFIER_PUBLIC (%d)
                 0: AST_CONST_ELEM
                     name: "B"
                     value: 2
+                    docComment: null
             2: AST_CLASS_CONST_DECL
                 flags: MODIFIER_PROTECTED (%d)
                 0: AST_CONST_ELEM
                     name: "C"
                     value: 3
+                    docComment: null
             3: AST_CLASS_CONST_DECL
                 flags: MODIFIER_PRIVATE (%d)
                 0: AST_CONST_ELEM
                     name: "D"
                     value: 4
+                    docComment: null
             4: AST_CLASS_CONST_DECL
                 flags: MODIFIER_PUBLIC (%d)
                 0: AST_CONST_ELEM
-                    docComment: /** Doc E */
                     name: "E"
                     value: 5
+                    docComment: "/** Doc E */"
                 1: AST_CONST_ELEM
-                    docComment: /** Doc F */
                     name: "F"
                     value: 6
+                    docComment: "/** Doc F */"
+        __declId: 0