1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
From e45e31c218dc224f20155b932e309438fe2eeeb2 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@googlemail.com>
Date: Wed, 20 Apr 2016 15:03:18 +0200
Subject: [PATCH] Fix new.test and code test runner
Using only the basename leads to collisions...
---
test/PhpParser/CodeTestAbstract.php | 5 +++--
test/code/parser/expr/new.test | 6 ++++++
2 files changed, 9 insertions(+), 2 deletions(-)
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 @@
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 @@ function($matches) {
// 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(
|
