Support php-ast version 45 properly.

Author: TysonAndre

README.md

@@ -6,7 +6,7 @@ PHP-Parser to php-ast
 This converts ASTs(Abstract Syntax Trees) from [PHP-Parser](https://github.com/nikic/PHP-Parser) to [php-ast](https://github.com/nikic/php-ast/).
 It can be used as a PHP-only implementation of php-ast.
 
-Supported [php-ast AST versions](https://github.com/nikic/php-ast#version-changelog): 40, 50
+Supported [php-ast AST versions](https://github.com/nikic/php-ast#version-changelog): 40, 45, 50
 
 Current Status
 --------------
@@ -32,12 +32,13 @@ Using it as a slow substitute for php-ast
 
 - [tests/ASTConverter/ConversionTest.php](https://github.com/TysonAndre/php-parser-to-php-ast/blob/master/tests/ASTConverter/ConversionTest.php)
 
-Using it as an error-tolerant substitute for php-ast (e.g. for use in IDEs)
+Using it as an error-tolerant substitute for php-ast: (e.g. for use in IDEs)
 
 - There are currently two modes: omitting errors and adding placeholders (e.g. `__INCOMPLETE_VARIABLE__`).
 - Omitting errors only handles some common cases that come up while editing a file.
 - Placeholders may change in the future.
 - [tests/ASTConverter/ErrorTolerantConversionTest.php](https://github.com/TysonAndre/php-parser-to-php-ast/blob/master/tests/ASTConverter/ErrorTolerantConversionTest.php)
+- If performance is an issue, cache previous results for a file's contents (in combination with the version used to generate the file `ASTConversion::ASTCONVERTER_VERSION`)
 
 Running unit tests
 ------------------

src/ASTConverter/ASTConverter.php

@@ -49,12 +49,15 @@
  * SOFTWARE.
  */
 final class ASTConverter {
+    // The release version of this class.
+    const ASTCONVERTER_VERSION = '0.1.0';
+
     // The latest stable version of php-ast.
     // For something > 50, update the library's release.
     // For something < 40, there are no releases.
     const AST_VERSION = 50;
     // The versions that this supports
-    const SUPPORTED_AST_VERSIONS = [40, 50];
+    const SUPPORTED_AST_VERSIONS = [40, 45, 50];
 
     /**
      * @var int - A version in SUPPORTED_AST_VERSIONS
@@ -1893,13 +1896,13 @@ private static function phpParserDeclareListToAstDeclares(array $declares, int $
             ];
             $doc_comment = self::extractPhpdocComment($declare->getAttribute('comments')) ?? $first_doc_comment;
             $first_doc_comment = null;
-            if (self::$ast_version >= 50) {
+            if (self::$ast_version >= 45) {
                 if (PHP_VERSION_ID >= 70100) {
                     $children['docComment'] = $doc_comment;
                 }
             }
             $node = new ast\Node(ast\AST_CONST_ELEM, 0, $children, $declare->getAttribute('startLine'));
-            if (self::$ast_version < 50 && is_string($doc_comment)) {
+            if (self::$ast_version < 45 && is_string($doc_comment)) {
                 if (PHP_VERSION_ID >= 70100) {
                     $node->docComment = $doc_comment;
                 }
@@ -2070,7 +2073,7 @@ private static function phpParserNameToString(PhpParser\Node\Name $name) : strin
      * @return ast\Node
      */
     private static function newAstNode(int $kind, int $flags, array $children, int $lineno, string $doc_comment = null) : ast\Node {
-        if (self::$ast_version >= 45) {
+        if (self::$ast_version >= 50) {
             if (is_string($doc_comment) || array_key_exists($kind, self::_NODES_WITH_NULL_DOC_COMMENT)) {
                 if ($kind !== \ast\AST_CONST_ELEM || PHP_VERSION_ID >= 70100) {
                     $children['docComment'] = $doc_comment;
@@ -2096,15 +2099,15 @@ private static function newAstNode(int $kind, int $flags, array $children, int $
      * @suppress PhanUndeclaredProperty
      */
     private static function newAstDecl(int $kind, int $flags, array $children, int $lineno, string $doc_comment = null, string $name = null, int $end_lineno = 0, int $decl_id = -1) : ast\Node {
-        if (self::$ast_version >= 45) {
-            $children45 = [];
-            $children45['name'] = $name;
-            $children45['docComment'] = $doc_comment;
-            $children45 += $children;
+        if (self::$ast_version >= 50) {
+            $children50 = [];
+            $children50['name'] = $name;
+            $children50['docComment'] = $doc_comment;
+            $children50 += $children;
             if ($decl_id >= 0 && self::$ast_version >= 50) {
-                $children45['__declId'] = $decl_id;
+                $children50['__declId'] = $decl_id;
             }
-            $node = new ast\Node($kind, $flags, $children45, $lineno);
+            $node = new ast\Node($kind, $flags, $children50, $lineno);
             if (is_int($end_lineno)) {
                 $node->endLineno = $end_lineno;
             }

tests/ASTConverter/ConversionTest.php

@@ -47,14 +47,18 @@ public function astValidFileExampleProvider() {
         $paths = $this->_scanSourceDirForPHP($source_dir);
         sort($paths);
         $supports40 = self::hasNativeASTSupport(40);
+        $supports45 = self::hasNativeASTSupport(45);
         $supports50 = self::hasNativeASTSupport(50);
         if (!($supports40 || $supports50)) {
-            throw new RuntimeException("Neither AST version 40 nor 50 are natively supported");
+            throw new RuntimeException("None of version 40, 45 or 50 are natively supported");
         }
         foreach ($paths as $path) {
             if ($supports40) {
                 $tests[] = [$path, 40];
             }
+            if ($supports45) {
+                $tests[] = [$path, 45];
+            }
             if ($supports50) {
                 $tests[] = [$path, 50];
             }