@@ -57,5 +57,4 @@ |
||
57 | 57 | |
58 | 58 | // Test that stray boundaries, i.e. an opener without closer and such, are detected. |
59 | 59 | <<<<<<< HEAD |
60 | -$a = 1; |
|
61 | -======= |
|
60 | +$a |
|
62 | 61 | \ No newline at end of file |
@@ -28,115 +28,115 @@ |
||
28 | 28 | public function getErrorList($testFile='GitMergeConflictUnitTest.1.inc') |
29 | 29 | { |
30 | 30 | switch ($testFile) { |
31 | - case 'GitMergeConflictUnitTest.1.inc': |
|
32 | - return [ |
|
33 | - 26 => 1, |
|
34 | - 28 => 1, |
|
35 | - 30 => 1, |
|
36 | - 45 => 1, |
|
37 | - 53 => 1, |
|
38 | - 55 => 1, |
|
39 | - 59 => 1, |
|
40 | - 61 => 1, |
|
41 | - ]; |
|
42 | - |
|
43 | - case 'GitMergeConflictUnitTest.2.inc': |
|
44 | - return [ |
|
45 | - 4 => 1, |
|
46 | - 6 => 1, |
|
47 | - 8 => 1, |
|
48 | - 14 => 1, |
|
49 | - 20 => 1, |
|
50 | - 22 => 1, |
|
51 | - 26 => 1, |
|
52 | - 28 => 1, |
|
53 | - 30 => 1, |
|
54 | - ]; |
|
55 | - |
|
56 | - case 'GitMergeConflictUnitTest.3.inc': |
|
57 | - return [ |
|
58 | - 3 => 1, |
|
59 | - 5 => 1, |
|
60 | - 7 => 1, |
|
61 | - 12 => 1, |
|
62 | - 14 => 1, |
|
63 | - 16 => 1, |
|
64 | - 22 => 1, |
|
65 | - 24 => 1, |
|
66 | - 26 => 1, |
|
67 | - 38 => 1, |
|
68 | - 40 => 1, |
|
69 | - 42 => 1, |
|
70 | - ]; |
|
71 | - |
|
72 | - case 'GitMergeConflictUnitTest.4.inc': |
|
73 | - return [ |
|
74 | - 6 => 1, |
|
75 | - 8 => 1, |
|
76 | - 10 => 1, |
|
77 | - 18 => 1, |
|
78 | - 22 => 1, |
|
79 | - 25 => 1, |
|
80 | - 29 => 1, |
|
81 | - 34 => 1, |
|
82 | - 39 => 1, |
|
83 | - 53 => 1, |
|
84 | - 55 => 1, |
|
85 | - 57 => 1, |
|
86 | - 64 => 1, |
|
87 | - 68 => 1, |
|
88 | - 71 => 1, |
|
89 | - ]; |
|
90 | - case 'GitMergeConflictUnitTest.5.inc': |
|
91 | - case 'GitMergeConflictUnitTest.6.inc': |
|
92 | - return [ |
|
93 | - 6 => 1, |
|
94 | - 8 => 1, |
|
95 | - 10 => 1, |
|
96 | - 15 => 1, |
|
97 | - 28 => 1, |
|
98 | - 30 => 1, |
|
99 | - 32 => 1, |
|
100 | - ]; |
|
101 | - |
|
102 | - case 'GitMergeConflictUnitTest.1.css': |
|
103 | - return [ |
|
104 | - 3 => 1, |
|
105 | - 5 => 1, |
|
106 | - 7 => 1, |
|
107 | - 12 => 1, |
|
108 | - 14 => 1, |
|
109 | - 16 => 1, |
|
110 | - 30 => 1, |
|
111 | - 32 => 1, |
|
112 | - 34 => 1, |
|
113 | - ]; |
|
114 | - |
|
115 | - case 'GitMergeConflictUnitTest.2.css': |
|
116 | - return [ |
|
117 | - 3 => 1, |
|
118 | - 8 => 1, |
|
119 | - 13 => 1, |
|
120 | - 27 => 1, |
|
121 | - 29 => 1, |
|
122 | - 31 => 1, |
|
123 | - ]; |
|
124 | - |
|
125 | - case 'GitMergeConflictUnitTest.js': |
|
126 | - return [ |
|
127 | - 5 => 1, |
|
128 | - 7 => 1, |
|
129 | - 9 => 1, |
|
130 | - 12 => 1, |
|
131 | - 14 => 1, |
|
132 | - 16 => 1, |
|
133 | - 24 => 1, |
|
134 | - 30 => 1, |
|
135 | - 32 => 1, |
|
136 | - ]; |
|
137 | - |
|
138 | - default: |
|
139 | - return []; |
|
31 | + case 'GitMergeConflictUnitTest.1.inc': |
|
32 | + return [ |
|
33 | + 26 => 1, |
|
34 | + 28 => 1, |
|
35 | + 30 => 1, |
|
36 | + 45 => 1, |
|
37 | + 53 => 1, |
|
38 | + 55 => 1, |
|
39 | + 59 => 1, |
|
40 | + 61 => 1, |
|
41 | + ]; |
|
42 | + |
|
43 | + case 'GitMergeConflictUnitTest.2.inc': |
|
44 | + return [ |
|
45 | + 4 => 1, |
|
46 | + 6 => 1, |
|
47 | + 8 => 1, |
|
48 | + 14 => 1, |
|
49 | + 20 => 1, |
|
50 | + 22 => 1, |
|
51 | + 26 => 1, |
|
52 | + 28 => 1, |
|
53 | + 30 => 1, |
|
54 | + ]; |
|
55 | + |
|
56 | + case 'GitMergeConflictUnitTest.3.inc': |
|
57 | + return [ |
|
58 | + 3 => 1, |
|
59 | + 5 => 1, |
|
60 | + 7 => 1, |
|
61 | + 12 => 1, |
|
62 | + 14 => 1, |
|
63 | + 16 => 1, |
|
64 | + 22 => 1, |
|
65 | + 24 => 1, |
|
66 | + 26 => 1, |
|
67 | + 38 => 1, |
|
68 | + 40 => 1, |
|
69 | + 42 => 1, |
|
70 | + ]; |
|
71 | + |
|
72 | + case 'GitMergeConflictUnitTest.4.inc': |
|
73 | + return [ |
|
74 | + 6 => 1, |
|
75 | + 8 => 1, |
|
76 | + 10 => 1, |
|
77 | + 18 => 1, |
|
78 | + 22 => 1, |
|
79 | + 25 => 1, |
|
80 | + 29 => 1, |
|
81 | + 34 => 1, |
|
82 | + 39 => 1, |
|
83 | + 53 => 1, |
|
84 | + 55 => 1, |
|
85 | + 57 => 1, |
|
86 | + 64 => 1, |
|
87 | + 68 => 1, |
|
88 | + 71 => 1, |
|
89 | + ]; |
|
90 | + case 'GitMergeConflictUnitTest.5.inc': |
|
91 | + case 'GitMergeConflictUnitTest.6.inc': |
|
92 | + return [ |
|
93 | + 6 => 1, |
|
94 | + 8 => 1, |
|
95 | + 10 => 1, |
|
96 | + 15 => 1, |
|
97 | + 28 => 1, |
|
98 | + 30 => 1, |
|
99 | + 32 => 1, |
|
100 | + ]; |
|
101 | + |
|
102 | + case 'GitMergeConflictUnitTest.1.css': |
|
103 | + return [ |
|
104 | + 3 => 1, |
|
105 | + 5 => 1, |
|
106 | + 7 => 1, |
|
107 | + 12 => 1, |
|
108 | + 14 => 1, |
|
109 | + 16 => 1, |
|
110 | + 30 => 1, |
|
111 | + 32 => 1, |
|
112 | + 34 => 1, |
|
113 | + ]; |
|
114 | + |
|
115 | + case 'GitMergeConflictUnitTest.2.css': |
|
116 | + return [ |
|
117 | + 3 => 1, |
|
118 | + 8 => 1, |
|
119 | + 13 => 1, |
|
120 | + 27 => 1, |
|
121 | + 29 => 1, |
|
122 | + 31 => 1, |
|
123 | + ]; |
|
124 | + |
|
125 | + case 'GitMergeConflictUnitTest.js': |
|
126 | + return [ |
|
127 | + 5 => 1, |
|
128 | + 7 => 1, |
|
129 | + 9 => 1, |
|
130 | + 12 => 1, |
|
131 | + 14 => 1, |
|
132 | + 16 => 1, |
|
133 | + 24 => 1, |
|
134 | + 30 => 1, |
|
135 | + 32 => 1, |
|
136 | + ]; |
|
137 | + |
|
138 | + default: |
|
139 | + return []; |
|
140 | 140 | }//end switch |
141 | 141 | |
142 | 142 | }//end getErrorList() |
@@ -22,13 +22,4 @@ |
||
22 | 22 | * merge conflict boundaries will still be detected correctly. |
23 | 23 | */ |
24 | 24 | |
25 | -$string = |
|
26 | -<<<'EOD' |
|
27 | -can be problematic. |
|
28 | -<<<<<<< HEAD |
|
29 | -were previously not detected. |
|
30 | -======= |
|
31 | -should also be detected. |
|
32 | ->>>>>>> ref/heads/other-branchname |
|
33 | -And now they are. |
|
34 | -EOD; |
|
25 | +$string |
|
35 | 26 | \ No newline at end of file |
@@ -43,32 +43,32 @@ |
||
43 | 43 | public function getWarningList($testFile='') |
44 | 44 | { |
45 | 45 | switch ($testFile) { |
46 | - case 'DuplicateClassNameUnitTest.1.inc': |
|
47 | - return [ |
|
48 | - 8 => 1, |
|
49 | - 9 => 1, |
|
50 | - 10 => 1, |
|
51 | - ]; |
|
52 | - break; |
|
53 | - case 'DuplicateClassNameUnitTest.2.inc': |
|
54 | - return [ |
|
55 | - 2 => 1, |
|
56 | - 3 => 1, |
|
57 | - 4 => 1, |
|
58 | - ]; |
|
59 | - break; |
|
60 | - case 'DuplicateClassNameUnitTest.5.inc': |
|
61 | - return [ |
|
62 | - 3 => 1, |
|
63 | - 7 => 1, |
|
64 | - ]; |
|
65 | - break; |
|
66 | - case 'DuplicateClassNameUnitTest.6.inc': |
|
67 | - return [10 => 1]; |
|
68 | - break; |
|
69 | - default: |
|
70 | - return []; |
|
71 | - break; |
|
46 | + case 'DuplicateClassNameUnitTest.1.inc': |
|
47 | + return [ |
|
48 | + 8 => 1, |
|
49 | + 9 => 1, |
|
50 | + 10 => 1, |
|
51 | + ]; |
|
52 | + break; |
|
53 | + case 'DuplicateClassNameUnitTest.2.inc': |
|
54 | + return [ |
|
55 | + 2 => 1, |
|
56 | + 3 => 1, |
|
57 | + 4 => 1, |
|
58 | + ]; |
|
59 | + break; |
|
60 | + case 'DuplicateClassNameUnitTest.5.inc': |
|
61 | + return [ |
|
62 | + 3 => 1, |
|
63 | + 7 => 1, |
|
64 | + ]; |
|
65 | + break; |
|
66 | + case 'DuplicateClassNameUnitTest.6.inc': |
|
67 | + return [10 => 1]; |
|
68 | + break; |
|
69 | + default: |
|
70 | + return []; |
|
71 | + break; |
|
72 | 72 | }//end switch |
73 | 73 | |
74 | 74 | }//end getWarningList() |
@@ -28,65 +28,65 @@ |
||
28 | 28 | public function getErrorList($testFile='InlineControlStructureUnitTest.1.inc') |
29 | 29 | { |
30 | 30 | switch ($testFile) { |
31 | - case 'InlineControlStructureUnitTest.1.inc': |
|
32 | - return [ |
|
33 | - 3 => 1, |
|
34 | - 7 => 1, |
|
35 | - 11 => 1, |
|
36 | - 13 => 1, |
|
37 | - 15 => 1, |
|
38 | - 17 => 1, |
|
39 | - 23 => 1, |
|
40 | - 45 => 1, |
|
41 | - 46 => 1, |
|
42 | - 49 => 1, |
|
43 | - 62 => 1, |
|
44 | - 66 => 1, |
|
45 | - 78 => 1, |
|
46 | - 120 => 1, |
|
47 | - 128 => 1, |
|
48 | - 134 => 1, |
|
49 | - 142 => 1, |
|
50 | - 143 => 1, |
|
51 | - 144 => 1, |
|
52 | - 150 => 1, |
|
53 | - 158 => 1, |
|
54 | - 159 => 1, |
|
55 | - 162 => 1, |
|
56 | - 163 => 1, |
|
57 | - 164 => 1, |
|
58 | - 167 => 1, |
|
59 | - 168 => 1, |
|
60 | - 170 => 1, |
|
61 | - 178 => 1, |
|
62 | - 185 => 1, |
|
63 | - 188 => 2, |
|
64 | - 191 => 1, |
|
65 | - 195 => 1, |
|
66 | - 198 => 1, |
|
67 | - 206 => 1, |
|
68 | - 222 => 1, |
|
69 | - 232 => 1, |
|
70 | - 235 => 1, |
|
71 | - 236 => 1, |
|
72 | - 238 => 1, |
|
73 | - 242 => 1, |
|
74 | - ]; |
|
31 | + case 'InlineControlStructureUnitTest.1.inc': |
|
32 | + return [ |
|
33 | + 3 => 1, |
|
34 | + 7 => 1, |
|
35 | + 11 => 1, |
|
36 | + 13 => 1, |
|
37 | + 15 => 1, |
|
38 | + 17 => 1, |
|
39 | + 23 => 1, |
|
40 | + 45 => 1, |
|
41 | + 46 => 1, |
|
42 | + 49 => 1, |
|
43 | + 62 => 1, |
|
44 | + 66 => 1, |
|
45 | + 78 => 1, |
|
46 | + 120 => 1, |
|
47 | + 128 => 1, |
|
48 | + 134 => 1, |
|
49 | + 142 => 1, |
|
50 | + 143 => 1, |
|
51 | + 144 => 1, |
|
52 | + 150 => 1, |
|
53 | + 158 => 1, |
|
54 | + 159 => 1, |
|
55 | + 162 => 1, |
|
56 | + 163 => 1, |
|
57 | + 164 => 1, |
|
58 | + 167 => 1, |
|
59 | + 168 => 1, |
|
60 | + 170 => 1, |
|
61 | + 178 => 1, |
|
62 | + 185 => 1, |
|
63 | + 188 => 2, |
|
64 | + 191 => 1, |
|
65 | + 195 => 1, |
|
66 | + 198 => 1, |
|
67 | + 206 => 1, |
|
68 | + 222 => 1, |
|
69 | + 232 => 1, |
|
70 | + 235 => 1, |
|
71 | + 236 => 1, |
|
72 | + 238 => 1, |
|
73 | + 242 => 1, |
|
74 | + ]; |
|
75 | 75 | |
76 | - case 'InlineControlStructureUnitTest.js': |
|
77 | - return [ |
|
78 | - 3 => 1, |
|
79 | - 7 => 1, |
|
80 | - 11 => 1, |
|
81 | - 13 => 1, |
|
82 | - 15 => 1, |
|
83 | - 21 => 1, |
|
84 | - 27 => 1, |
|
85 | - 30 => 1, |
|
86 | - ]; |
|
76 | + case 'InlineControlStructureUnitTest.js': |
|
77 | + return [ |
|
78 | + 3 => 1, |
|
79 | + 7 => 1, |
|
80 | + 11 => 1, |
|
81 | + 13 => 1, |
|
82 | + 15 => 1, |
|
83 | + 21 => 1, |
|
84 | + 27 => 1, |
|
85 | + 30 => 1, |
|
86 | + ]; |
|
87 | 87 | |
88 | - default: |
|
89 | - return []; |
|
88 | + default: |
|
89 | + return []; |
|
90 | 90 | }//end switch |
91 | 91 | |
92 | 92 | }//end getErrorList() |
@@ -109,11 +109,11 @@ discard block |
||
109 | 109 | switch($response = \Bar::baz('bat', function ($foo) { |
110 | 110 | return 'bar'; |
111 | 111 | })) { |
112 | - case 1: |
|
113 | - return 'test'; |
|
112 | + case 1: |
|
113 | + return 'test'; |
|
114 | 114 | |
115 | - case 2: |
|
116 | - return 'other'; |
|
115 | + case 2: |
|
116 | + return 'other'; |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | $stuff = [1,2,3]; |
@@ -202,14 +202,14 @@ discard block |
||
202 | 202 | } |
203 | 203 | |
204 | 204 | switch ($num) { |
205 | - case 0: |
|
206 | - if (1 > $num) |
|
207 | - return bar( |
|
208 | - baz( |
|
209 | - "foobarbaz" |
|
210 | - ) |
|
211 | - ); |
|
212 | - break; |
|
205 | + case 0: |
|
206 | + if (1 > $num) |
|
207 | + return bar( |
|
208 | + baz( |
|
209 | + "foobarbaz" |
|
210 | + ) |
|
211 | + ); |
|
212 | + break; |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | do { |
@@ -28,18 +28,18 @@ |
||
28 | 28 | public function getErrorList($testFile='DisallowInlineIfUnitTest.inc') |
29 | 29 | { |
30 | 30 | switch ($testFile) { |
31 | - case 'DisallowInlineIfUnitTest.inc': |
|
32 | - return [ |
|
33 | - 8 => 1, |
|
34 | - 18 => 1, |
|
35 | - ]; |
|
36 | - break; |
|
37 | - case 'DisallowInlineIfUnitTest.js': |
|
38 | - return [1 => 1]; |
|
39 | - break; |
|
40 | - default: |
|
41 | - return []; |
|
42 | - break; |
|
31 | + case 'DisallowInlineIfUnitTest.inc': |
|
32 | + return [ |
|
33 | + 8 => 1, |
|
34 | + 18 => 1, |
|
35 | + ]; |
|
36 | + break; |
|
37 | + case 'DisallowInlineIfUnitTest.js': |
|
38 | + return [1 => 1]; |
|
39 | + break; |
|
40 | + default: |
|
41 | + return []; |
|
42 | + break; |
|
43 | 43 | }//end switch |
44 | 44 | |
45 | 45 | }//end getErrorList() |
@@ -19,9 +19,3 @@ |
||
19 | 19 | $arr = array( |
20 | 20 | 'a' => 'a' |
21 | 21 | <<<<<<< HEAD |
22 | - 'b' => 'b' |
|
23 | -======= |
|
24 | - 'c' => 'c' |
|
25 | ->>>>>>> master |
|
26 | - ); |
|
27 | - } |
@@ -28,28 +28,28 @@ |
||
28 | 28 | public function getErrorList($testFile='DisallowSizeFunctionsInLoopsUnitTest.inc') |
29 | 29 | { |
30 | 30 | switch ($testFile) { |
31 | - case 'DisallowSizeFunctionsInLoopsUnitTest.inc': |
|
32 | - return [ |
|
33 | - 2 => 1, |
|
34 | - 7 => 1, |
|
35 | - 11 => 1, |
|
36 | - 13 => 1, |
|
37 | - 18 => 1, |
|
38 | - 23 => 1, |
|
39 | - 27 => 1, |
|
40 | - 29 => 1, |
|
41 | - 35 => 1, |
|
42 | - 40 => 1, |
|
43 | - 44 => 1, |
|
44 | - 46 => 1, |
|
45 | - ]; |
|
46 | - break; |
|
47 | - case 'DisallowSizeFunctionsInLoopsUnitTest.js': |
|
48 | - return [1 => 1]; |
|
49 | - break; |
|
50 | - default: |
|
51 | - return []; |
|
52 | - break; |
|
31 | + case 'DisallowSizeFunctionsInLoopsUnitTest.inc': |
|
32 | + return [ |
|
33 | + 2 => 1, |
|
34 | + 7 => 1, |
|
35 | + 11 => 1, |
|
36 | + 13 => 1, |
|
37 | + 18 => 1, |
|
38 | + 23 => 1, |
|
39 | + 27 => 1, |
|
40 | + 29 => 1, |
|
41 | + 35 => 1, |
|
42 | + 40 => 1, |
|
43 | + 44 => 1, |
|
44 | + 46 => 1, |
|
45 | + ]; |
|
46 | + break; |
|
47 | + case 'DisallowSizeFunctionsInLoopsUnitTest.js': |
|
48 | + return [1 => 1]; |
|
49 | + break; |
|
50 | + default: |
|
51 | + return []; |
|
52 | + break; |
|
53 | 53 | }//end switch |
54 | 54 | |
55 | 55 | }//end getErrorList() |