phabel/php-parser
1
0
Fork 0
mirror of https://github.com/phabelio/PHP-Parser.git synced 2024-11-27 04:24:43 +01:00
Code Issues Projects Releases Wiki Activity

Fix __halt_compiler() usage in namespace

Browse Source 
This fixes the only left bug that was reported by parsing the PHP testsuite :)
This commit is contained in:
nikic 2011-12-07 18:36:38 +01:00
parent 8bdb478785
commit df691065a6
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/PHPParser/Lexer.php
View File

@ -132,7 +132,7 @@ class PHPParser_Lexer
$this->pos = count($this->tokens);
// return with (); removed
return substr($textAfter, strlen($matches[0]));
return (string) substr($textAfter, strlen($matches[0])); // (string) converts false to ''
}
/**

9
lib/PHPParser/Node/Stmt/Namespace.php
View File

@ -101,17 +101,20 @@ class PHPParser_Node_Stmt_Namespace extends PHPParser_Node_Stmt
// iterate over all following namespaces
for ($i = 0, $c = count($nsOffsets); $i < $c; ++$i) {
$nsStmt = $stmts[$nsOffsets[$i]];
$newStmts[] = $nsStmt = $stmts[$nsOffsets[$i]];
// the last namespace takes all statements after it
if ($c === $i + 1) {
$nsStmt->stmts = array_slice($stmts, $nsOffsets[$i] + 1);
// if the last statement is __halt_compiler() put it outside the namespace
if (end($nsStmt->stmts) instanceof PHPParser_Node_Stmt_HaltCompiler) {
$newStmts[] = array_pop($nsStmt->stmts);
}
// and all the others take all statements between the current and the following one
} else {
$nsStmt->stmts = array_slice($stmts, $nsOffsets[$i] + 1, $nsOffsets[$i + 1] - $nsOffsets[$i] - 1);
}
$newStmts[] = $nsStmt;
}
return $newStmts;

24
test/code/stmt/haltCompiler.test
View File

@ -29,3 +29,27 @@ array(
remaining: Hallo World!
)
)
-----
<?php
namespace A;
$a;
__halt_compiler();
-----
array(
0: Stmt_Namespace(
name: Name(
parts: array(
0: A
)
)
stmts: array(
0: Expr_Variable(
name: a
)
)
)
1: Stmt_HaltCompiler(
remaining:
)
)