diff --git a/CHANGELOG.md b/CHANGELOG.md index 784c91d..29869c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,8 @@ Version 0.9.3 (22.11.2012) * [BC] As `list()` in `foreach` is now supported the structure of list assignments changed: - 1. There is no longer a dedicated `AssignList` node; instead a normal `Assign` node is used with a `List` as `var`. - 2. Nested lists are now `List` nodes too, instead of just arrays. + 1. There is no longer a dedicated `AssignList` node; instead a normal `Assign` node is used with a `List` as `var`. + 2. Nested lists are now `List` nodes too, instead of just arrays. * [BC] As arbitrary expressions are allowed in `empty()` now its subnode was renamed from `var` to `expr`. diff --git a/doc/2_Usage_of_basic_components.markdown b/doc/2_Usage_of_basic_components.markdown index b68d9a6..f1f3d42 100644 --- a/doc/2_Usage_of_basic_components.markdown +++ b/doc/2_Usage_of_basic_components.markdown @@ -288,16 +288,11 @@ $prettyPrinter = new PHPParser_PrettyPrinter_Zend; $traverser->addVisitor(new PHPParser_NodeVisitor_NameResolver); // we will need resolved names $traverser->addVisitor(new NodeVisitor_NamespaceConverter); // our own node visitor -// iterate over all files in the directory -foreach (new RecursiveIteratorIterator( - new RecursiveDirectoryIterator(IN_DIR), - RecursiveIteratorIterator::LEAVES_ONLY) - as $file) { - // only convert .php files - if (!preg_match('~\.php$~', $file)) { - continue; - } +// iterate over all .php files in the directory +$files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(IN_DIR)); +$files = new RegexIterator($files, '/\.php$/'); +foreach ($files as $file) { try { // read the file that should be converted $code = file_get_contents($file); diff --git a/grammar/kmyacc.php.parser b/grammar/kmyacc.php.parser index 2dd1362..3668de1 100644 --- a/grammar/kmyacc.php.parser +++ b/grammar/kmyacc.php.parser @@ -157,7 +157,7 @@ class #(-p) * * @param string $code The source code to parse * - * @return array Array of statements + * @return PHPParser_Node[] Array of statements */ public function parse($code) { $this->lexer->startLexing($code); diff --git a/lib/PHPParser/Parser.php b/lib/PHPParser/Parser.php index 0ea2b48..dfabd13 100644 --- a/lib/PHPParser/Parser.php +++ b/lib/PHPParser/Parser.php @@ -939,7 +939,7 @@ class PHPParser_Parser * * @param string $code The source code to parse * - * @return array Array of statements + * @return PHPParser_Node[] Array of statements */ public function parse($code) { $this->lexer->startLexing($code);