diff --git a/test/PhpParser/CodeTestAbstract.php b/test/PhpParser/CodeTestAbstract.php index 4395ad3..369ee41 100644 --- a/test/PhpParser/CodeTestAbstract.php +++ b/test/PhpParser/CodeTestAbstract.php @@ -5,13 +5,14 @@ namespace PhpParser; abstract class CodeTestAbstract extends \PHPUnit_Framework_TestCase { protected function getTests($directory, $fileExtension) { + $directory = realpath($directory); $it = new \RecursiveDirectoryIterator($directory); $it = new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::LEAVES_ONLY); $it = new \RegexIterator($it, '(\.' . preg_quote($fileExtension) . '$)'); $tests = array(); foreach ($it as $file) { - $fileName = realpath($file->getPathname()); + $fileName = $file->getPathname(); $fileContents = file_get_contents($fileName); $fileContents = canonicalize($fileContents); @@ -29,7 +30,7 @@ abstract class CodeTestAbstract extends \PHPUnit_Framework_TestCase // first part is the name $name = array_shift($parts) . ' (' . $fileName . ')'; - $shortName = basename($fileName, '.test'); + $shortName = ltrim(str_replace($directory, '', $fileName), '/\\'); // multiple sections possible with always two forming a pair $chunks = array_chunk($parts, 2); diff --git a/test/code/parser/expr/new.test b/test/code/parser/expr/new.test index b7ce7a9..a132bbb 100644 --- a/test/code/parser/expr/new.test +++ b/test/code/parser/expr/new.test @@ -50,6 +50,9 @@ array( ) args: array( ) + comments: array( + 0: // class name variations + ) ) 3: Expr_New( class: Expr_ArrayDimFetch( @@ -84,6 +87,9 @@ array( ) args: array( ) + comments: array( + 0: // DNCR object access + ) ) 6: Expr_New( class: Expr_PropertyFetch(