Skip to content

Commit d7f716f

Browse files
1 parent d4939f7 commit d7f716f

File tree

2 files changed

+43
-23
lines changed

2 files changed

+43
-23
lines changed

tests/Output/UnifiedDiffOutputBuilderDataProvider.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ public static function provideDiffWithLineNumbers(): array
5555
-
5656
A
5757
1
58-
'
59-
,
58+
',
6059
"\n\nA\n1",
6160
"A\n1",
6261
],

tests/Utils/UnifiedDiffAssertTraitTest.php

Lines changed: 42 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ public function testInvalidStartHeader3(): void
101101
-A
102102
+B
103103
" . '
104-
');
104+
'
105+
);
105106
}
106107

107108
public function testInvalidStartHeader4(): void
@@ -116,7 +117,8 @@ public function testInvalidStartHeader4(): void
116117
-A
117118
+B
118119
' . '
119-
');
120+
'
121+
);
120122
}
121123

122124
public function testInvalidLine1(): void
@@ -131,7 +133,8 @@ public function testInvalidLine1(): void
131133
-Z
132134
1
133135
+U
134-
');
136+
'
137+
);
135138
}
136139

137140
public function testInvalidLine2(): void
@@ -145,7 +148,8 @@ public function testInvalidLine2(): void
145148
@@ -8 +8 @@
146149
147150
148-
');
151+
'
152+
);
149153
}
150154

151155
public function testHunkInvalidFormat(): void
@@ -159,7 +163,8 @@ public function testHunkInvalidFormat(): void
159163
@@ INVALID -1,1 +1,1 @@
160164
-Z
161165
+U
162-
');
166+
'
167+
);
163168
}
164169

165170
public function testHunkOverlapFrom(): void
@@ -176,7 +181,8 @@ public function testHunkOverlapFrom(): void
176181
@@ -7,1 +9,1 @@
177182
-Z
178183
+U
179-
');
184+
'
185+
);
180186
}
181187

182188
public function testHunkOverlapTo(): void
@@ -193,7 +199,8 @@ public function testHunkOverlapTo(): void
193199
@@ -17,1 +7,1 @@
194200
-Z
195201
+U
196-
');
202+
'
203+
);
197204
}
198205

199206
public function testExpectHunk1(): void
@@ -208,7 +215,8 @@ public function testExpectHunk1(): void
208215
-Z
209216
+U
210217
+O
211-
');
218+
'
219+
);
212220
}
213221

214222
public function testExpectHunk2(): void
@@ -223,7 +231,8 @@ public function testExpectHunk2(): void
223231
' . '
224232
' . '
225233
@@ -38,12 +48,12 @@
226-
');
234+
'
235+
);
227236
}
228237

229238
public function testMisplacedLineAfterComments1(): void
@@ -240,7 +249,8 @@ public function testMisplacedLineAfterComments1(): void
240249
+U
241250
\ No newline at end of file
242251
+A
243-
');
252+
'
253+
);
244254
}
245255

246256
public function testMisplacedLineAfterComments2(): void
@@ -256,7 +266,8 @@ public function testMisplacedLineAfterComments2(): void
256266
\ No newline at end of file
257267
\ No newline at end of file
258268
\ No newline at end of file
259-
');
269+
'
270+
);
260271
}
261272

262273
public function testMisplacedLineAfterComments3(): void
@@ -272,7 +283,8 @@ public function testMisplacedLineAfterComments3(): void
272283
\ No newline at end of file
273284
\ No newline at end of file
274285
+A
275-
');
286+
'
287+
);
276288
}
277289

278290
public function testMisplacedComment(): void
@@ -282,7 +294,8 @@ public function testMisplacedComment(): void
282294

283295
$this->assertValidUnifiedDiffFormat(
284296
'\ No newline at end of file
285-
');
297+
'
298+
);
286299
}
287300

288301
public function testUnexpectedDuplicateNoNewLineEOF(): void
@@ -299,7 +312,8 @@ public function testUnexpectedDuplicateNoNewLineEOF(): void
299312
\ No newline at end of file
300313
' . '
301314
\ No newline at end of file
302-
');
315+
'
316+
);
303317
}
304318

305319
public function testFromAfterClose(): void
@@ -315,7 +329,8 @@ public function testFromAfterClose(): void
315329
\ No newline at end of file
316330
-A
317331
\ No newline at end of file
318-
');
332+
'
333+
);
319334
}
320335

321336
public function testSameAfterFromClose(): void
@@ -331,7 +346,8 @@ public function testSameAfterFromClose(): void
331346
\ No newline at end of file
332347
A
333348
\ No newline at end of file
334-
');
349+
'
350+
);
335351
}
336352

337353
public function testToAfterClose(): void
@@ -347,7 +363,8 @@ public function testToAfterClose(): void
347363
\ No newline at end of file
348364
+A
349365
\ No newline at end of file
350-
');
366+
'
367+
);
351368
}
352369

353370
public function testSameAfterToClose(): void
@@ -363,7 +380,8 @@ public function testSameAfterToClose(): void
363380
\ No newline at end of file
364381
A
365382
\ No newline at end of file
366-
');
383+
'
384+
);
367385
}
368386

369387
public function testUnexpectedEOFFromMissingLines(): void
@@ -378,7 +396,8 @@ public function testUnexpectedEOFFromMissingLines(): void
378396
-A
379397
+B
380398
' . '
381-
');
399+
'
400+
);
382401
}
383402

384403
public function testUnexpectedEOFToMissingLines(): void
@@ -393,7 +412,8 @@ public function testUnexpectedEOFToMissingLines(): void
393412
-A
394413
+B
395414
' . '
396-
');
415+
'
416+
);
397417
}
398418

399419
public function testUnexpectedEOFBothFromAndToMissingLines(): void
@@ -408,6 +428,7 @@ public function testUnexpectedEOFBothFromAndToMissingLines(): void
408428
-A
409429
+B
410430
' . '
411-
');
431+
'
432+
);
412433
}
413434
}

0 commit comments

Comments
 (0)