Parse __halt_compiler() (but don't compute offset yet)

Author: TysonAndre

src/ASTConverter/ASTConverter.php

@@ -416,7 +416,7 @@ private static function _init_handle_map() : array {
                 return null;
             },
             'PhpParser\Node\Expr\Exit_' => function(PhpParser\Node\Expr\Exit_ $n, int $startLine) {
-                return new ast\Node(ast\AST_EXIT, 0, ['expr' => self::_phpparser_node_to_ast_node($n->expr)], $startLine);
+                return new ast\Node(ast\AST_EXIT, 0, ['expr' => $n->expr ? self::_phpparser_node_to_ast_node($n->expr) : null], $startLine);
             },
             'PhpParser\Node\Expr\FuncCall' => function(PhpParser\Node\Expr\FuncCall $n, int $startLine) : ast\Node {
                 return self::_ast_node_call(
@@ -782,6 +782,14 @@ private static function _init_handle_map() : array {
                 }
                 return \count($globalNodes) === 1 ? $globalNodes[0] : $globalNodes;
             },
+            'PhpParser\Node\Stmt\HaltCompiler' => function(PhpParser\Node\Stmt\HaltCompiler $n, int $startLine) : ast\Node {
+                return new ast\Node(
+                    \ast\AST_HALT_COMPILER,
+                    0,
+                    ['offset' => 'TODO compute halt compiler offset'],  // FIXME implement
+                    $startLine
+                );
+            },
             'PhpParser\Node\Stmt\If_' => function(PhpParser\Node\Stmt\If_ $n, int $startLine) : ast\Node {
                 return self::_phpparser_if_stmt_to_ast_if_stmt($n);
             },
@@ -1809,7 +1817,8 @@ private static function _phpparser_list_to_ast_list(PhpParser\Node\Expr\List_ $n
             if ($item === null) {
                 $astItems[] = null;
             } else {
-                $astItems[] = new ast\Node(ast\AST_ARRAY_ELEM, 0, [
+                $flags = $item->byRef ? \ast\flags\PARAM_REF : 0;
+                $astItems[] = new ast\Node(ast\AST_ARRAY_ELEM, $flags, [
                     'value' => self::_phpparser_node_to_ast_node($item->value),
                     'key' => $item->key !== null ? self::_phpparser_node_to_ast_node($item->key) : null,
                 ], $item->getAttribute('startLine'));
@@ -1824,7 +1833,8 @@ private static function _phpparser_array_to_ast_array(PhpParser\Node\Expr\Array_
             if ($item === null) {
                 $astItems[] = null;
             } else {
-                $astItems[] = new ast\Node(ast\AST_ARRAY_ELEM, 0, [
+                $flags = $item->byRef ? \ast\flags\PARAM_REF : 0;
+                $astItems[] = new ast\Node(ast\AST_ARRAY_ELEM, $flags, [
                     'value' => self::_phpparser_node_to_ast_node($item->value),
                     'key' => $item->key !== null ? self::_phpparser_node_to_ast_node($item->key) : null,
                 ], $item->getAttribute('startLine'));

test_files/src/arrayelementref.php

@@ -0,0 +1,5 @@
+<?php
+
+$y = 2;
+$z = 3;
+$x = [&$y, $z];

test_files/src/php-src_tests/bug60634_error_3.php

@@ -0,0 +1,34 @@
+<?php
+
+ob_start();
+
+function open($save_path, $session_name) {
+    return true;
+}
+
+function close() {
+	echo "close: goodbye cruel world\n";
+	exit;
+}
+
+function read($id) {
+	return '';
+}
+
+function write($id, $session_data) {
+	echo "write: goodbye cruel world\n";
+	undefined_function();
+}
+
+function destroy($id) {
+    return true;
+}
+
+function gc($maxlifetime) {
+    return true;
+}
+
+session_set_save_handler('open', 'close', 'read', 'write', 'destroy', 'gc');
+session_start();
+
+?>

tests/ASTConverter/ConversionTest.php

@@ -102,9 +102,13 @@ public function testFallbackFromParser(string $fileName, int $astVersion) {
         $ast = ast\parse_code($contents, $astVersion, $fileName);
         self::normalizeOriginalAST($ast);
         $this->assertInstanceOf('\ast\Node', $ast, 'Examples must be syntactically valid PHP parseable by php-ast');
-        $fallback_ast = \ASTConverter\ASTConverter::ast_parse_code_fallback($contents, $astVersion);
+        try {
+            $fallback_ast = \ASTConverter\ASTConverter::ast_parse_code_fallback($contents, $astVersion);
+        } catch (\Throwable $e) {
+            throw new \RuntimeException("Error parsing $fileName with ast version $astVersion", $e->getCode(), $e);
+        }
         $this->assertInstanceOf('\ast\Node', $fallback_ast, 'The fallback must also return a tree of php-ast nodes');
-        if (stripos($fileName, 'phan_test_files') !== false) {
+        if (stripos($fileName, 'phan_test_files') !== false || stripos($fileName, 'php-src_tests') !== false) {
             $fallback_ast = self::normalizeLineNumbers($fallback_ast);
             $ast          = self::normalizeLineNumbers($ast);
         }