Deprecate version 10

Author: nikic

README.md

@@ -413,11 +413,11 @@ ZEND_AST_USE
 Version changelog
 -----------------
 
-### 30 (current)
+### 30 (current; 2015-03-10)
 
 * Use string names for child nodes of kinds with fixed length.
 
-### 20 (supported)
+### 20 (supported; 2015-12-14)
 
 * `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`
@@ -429,13 +429,13 @@ Version changelog
   it was a simple string containing the name.
 * Nested `AST_STMT_LIST`s are now flattened out.
 
-### 15 (supported)
+### 15 (supported; 2015-10-21)
 
 * In line with an upstream change, the `docComment` property on `AST_PROP_DECL` has been moved to
   `AST_PROP_ELEM`. This means that each property in one property declaration can have its own
   doc comment.
 
-### 10 (supported)
+### 10 (deprecated)
 
 Initial.
 

ast.c

@@ -382,14 +382,25 @@ static zend_string *ast_version_info() {
 	return str.s;
 }
 
-static int ast_check_version(zend_long version) {
+static inline zend_bool ast_version_known(zend_long version) {
 	size_t i;
-	zend_string *version_info;
-
 	for (i = 0; i < versions_count; ++i) {
 		if (version == versions[i]) {
-			return SUCCESS;
+			return 1;
+		}
+	}
+	return 0;
+}
+
+static int ast_check_version(zend_long version) {
+	zend_string *version_info;
+
+	if (ast_version_known(version)) {
+		if (version == 10) {
+			php_error_docref(NULL, E_DEPRECATED,
+				"Version " ZEND_LONG_FMT " is deprecated", version);
 		}
+		return SUCCESS;
 	}
 
 	version_info = ast_version_info();

tests/assign_ops.phpt

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

tests/binary_ops.phpt

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

tests/nested_stat_lists.phpt

@@ -22,7 +22,7 @@ $a;
 $g;
 PHP;
 
-echo ast_dump(ast\parse_code($code, $version=10)), "\n";
+echo ast_dump(ast\parse_code($code, $version=15)), "\n";
 echo ast_dump(ast\parse_code($code, $version=20)), "\n";
 
 ?>

tests/prop_doc_comments.phpt

@@ -24,7 +24,8 @@ echo ast_dump(ast\parse_code($code, $version=10)), "\n";
 echo ast_dump(ast\parse_code($code, $version=15)), "\n";
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: ast\parse_code(): Version 10 is deprecated in %s on line %d
 AST_STMT_LIST
     0: AST_CLASS
         flags: 0

tests/try_catch_finally.phpt

@@ -18,7 +18,7 @@ try {
 }
 PHP;
 
-echo ast_dump(ast\parse_code($code, $version=10)), "\n";
+echo ast_dump(ast\parse_code($code, $version=15)), "\n";
 echo ast_dump(ast\parse_code($code, $version=20)), "\n";
 
 ?>

tests/unary_ops.phpt

@@ -12,7 +12,7 @@ $code = <<<'PHP'
 -1;
 PHP;
 
-echo ast_dump(ast\parse_code($code, $version=10)), "\n";
+echo ast_dump(ast\parse_code($code, $version=15)), "\n";
 echo ast_dump(ast\parse_code($code, $version=20)), "\n";
 
 ?>