Skip to content

Commit 2b558dd

Browse files
greg0iregreg0ire
authored
Merge pull request #324 from greg0ire/fix-build
Update compat patch
2 parents 3e88327 + 952e5f5 commit 2b558dd

File tree

6 files changed

+72
-48
lines changed

6 files changed

+72
-48
lines changed

‎tests/expected_report.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FILE ERRORS WARNINGS
55
----------------------------------------------------------------------
66
tests/input/annotation-name.php 8 0
77
tests/input/array_indentation.php 10 0
8-
tests/input/arrow-functions-format.php 10 0
8+
tests/input/arrow-functions-format.php 12 0
99
tests/input/assignment-operators.php 4 0
1010
tests/input/attributes.php 15 0
1111
tests/input/binary_operators.php 9 0
@@ -54,9 +54,9 @@ tests/input/use-ordering.php 1 0
5454
tests/input/useless-semicolon.php 2 0
5555
tests/input/UselessConditions.php 21 0
5656
----------------------------------------------------------------------
57-
A TOTAL OF 462 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
57+
A TOTAL OF 464 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
5858
----------------------------------------------------------------------
59-
PHPCBF CAN FIX 378 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
59+
PHPCBF CAN FIX 380 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
6060
----------------------------------------------------------------------
6161

6262

‎tests/fixed/arrow-functions-format.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
];
3333

3434
$singleLineArrayReturn = Collection::map(
35-
static fn () => [1, 2]
35+
static fn () => [1, 2],
3636
);
3737

3838
$wrongMultiLineArrayReturn = Collection::map(
3939
static fn () => [
4040
1,
4141
2,
42-
]
42+
],
4343
);

‎tests/php72-compatibility.patch‎

Lines changed: 55 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
diff --git a/tests/expected_report.txt b/tests/expected_report.txt
2-
index d1e1fad..ea3b611 100644
2+
index a646ff6..84c9474 100644
33
--- a/tests/expected_report.txt
44
+++ b/tests/expected_report.txt
5-
@@ -17,26 +17,23 @@
5+
@@ -5,7 +5,7 @@ FILE ERRORS WARNINGS
6+
----------------------------------------------------------------------
7+
tests/input/annotation-name.php 8 0
8+
tests/input/array_indentation.php 10 0
9+
-tests/input/arrow-functions-format.php 12 0
10+
+tests/input/arrow-functions-format.php 10 0
11+
tests/input/assignment-operators.php 4 0
12+
tests/input/attributes.php 15 0
13+
tests/input/binary_operators.php 9 0
14+
@@ -17,26 +17,23 @@ tests/input/constants-var.php 6 0
615
tests/input/ControlStructures.php 28 0
716
tests/input/doc-comment-spacing.php 11 0
817
tests/input/duplicate-assignment-variable.php 1 0
@@ -37,7 +46,7 @@ index d1e1fad..ea3b611 100644
3746
tests/input/semicolon_spacing.php 3 0
3847
tests/input/single-line-array-spacing.php 5 0
3948
tests/input/spread-operator.php 6 0
40-
@@ -46,17 +43,16 @@
49+
@@ -46,17 +43,16 @@ tests/input/strings.php 3 0
4150
tests/input/superfluous-naming.php 11 0
4251
tests/input/test-case.php 8 0
4352
tests/input/trailing_comma_on_array.php 1 0
@@ -51,10 +60,10 @@ index d1e1fad..ea3b611 100644
5160
-tests/input/UselessConditions.php 21 0
5261
+tests/input/UselessConditions.php 20 0
5362
----------------------------------------------------------------------
54-
-A TOTAL OF 462 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
63+
-A TOTAL OF 464 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
5564
+A TOTAL OF 415 ERRORS AND 2 WARNINGS WERE FOUND IN 46 FILES
5665
----------------------------------------------------------------------
57-
-PHPCBF CAN FIX 378 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
66+
-PHPCBF CAN FIX 380 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5867
+PHPCBF CAN FIX 331 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5968
----------------------------------------------------------------------
6069

@@ -63,7 +72,7 @@ diff --git a/tests/fixed/ControlStructures.php b/tests/fixed/ControlStructures.p
6372
index f8f7f65..a653086 100644
6473
--- a/tests/fixed/ControlStructures.php
6574
+++ b/tests/fixed/ControlStructures.php
66-
@@ -104,7 +104,7 @@ class ControlStructures
75+
@@ -104,7 +104,7 @@ public function spaceBelowBlocks(): void
6776

6877
try {
6978
echo 4;
@@ -76,7 +85,7 @@ diff --git a/tests/fixed/EarlyReturn.php b/tests/fixed/EarlyReturn.php
7685
index fc734db..caf1dbb 100644
7786
--- a/tests/fixed/EarlyReturn.php
7887
+++ b/tests/fixed/EarlyReturn.php
79-
@@ -11,7 +11,7 @@ class EarlyReturn
88+
@@ -11,7 +11,7 @@ public function bar(): bool
8089
return $bar === 'bar';
8190
}
8291

@@ -117,7 +126,7 @@ diff --git a/tests/fixed/NamingCamelCase.php b/tests/fixed/NamingCamelCase.php
117126
index 5493471..57d9f2b 100644
118127
--- a/tests/fixed/NamingCamelCase.php
119128
+++ b/tests/fixed/NamingCamelCase.php
120-
@@ -6,11 +6,14 @@ namespace Example;
129+
@@ -6,11 +6,14 @@
121130

122131
class NamingCamelCase
123132
{
@@ -155,7 +164,7 @@ diff --git a/tests/fixed/TrailingCommaOnFunctions.php b/tests/fixed/TrailingComm
155164
index 4248238..f3ffa91 100644
156165
--- a/tests/fixed/TrailingCommaOnFunctions.php
157166
+++ b/tests/fixed/TrailingCommaOnFunctions.php
158-
@@ -15,7 +15,7 @@ class TrailingCommaOnFunctions
167+
@@ -15,7 +15,7 @@ public function a(int $arg): void
159168
}
160169

161170
public function b(
@@ -164,7 +173,7 @@ index 4248238..f3ffa91 100644
164173
): void {
165174
}
166175

167-
@@ -28,7 +28,7 @@ class TrailingCommaOnFunctions
176+
@@ -28,7 +28,7 @@ public function uses(): void
168177
};
169178

170179
$multiLine = static function (int $arg) use (
@@ -173,7 +182,7 @@ index 4248238..f3ffa91 100644
173182
): void {
174183
var_dump($var);
175184
};
176-
@@ -37,9 +37,8 @@ class TrailingCommaOnFunctions
185+
@@ -37,9 +37,8 @@ public function uses(): void
177186

178187
$class = new TrailingCommaOnFunctions();
179188

@@ -188,7 +197,7 @@ diff --git a/tests/fixed/UselessConditions.php b/tests/fixed/UselessConditions.p
188197
index 71e0cfb..2151b17 100644
189198
--- a/tests/fixed/UselessConditions.php
190199
+++ b/tests/fixed/UselessConditions.php
191-
@@ -95,7 +95,7 @@ class UselessConditions
200+
@@ -95,7 +95,7 @@ public function necessaryIfConditionWithMethodCall(): bool
192201
return false;
193202
}
194203

@@ -198,10 +207,10 @@ index 71e0cfb..2151b17 100644
198207
if (! $this->isAdmin) {
199208
return null;
200209
diff --git a/tests/fixed/arrow-functions-format.php b/tests/fixed/arrow-functions-format.php
201-
index 4da39b8..a45074f 100644
210+
index dcb5a3e..a45074f 100644
202211
--- a/tests/fixed/arrow-functions-format.php
203212
+++ b/tests/fixed/arrow-functions-format.php
204-
@@ -18,10 +18,10 @@ $returningObject = static fn () => new stdClass();
213+
@@ -18,10 +18,10 @@
205214

206215
$multiLineArrowFunctions = Collection::from([1, 2])
207216
->map(
@@ -214,6 +223,21 @@ index 4da39b8..a45074f 100644
214223
);
215224

216225
$thisIsNotAnArrowFunction = [$this->fn => 'value'];
226+
@@ -32,12 +32,12 @@
227+
];
228+
229+
$singleLineArrayReturn = Collection::map(
230+
- static fn () => [1, 2],
231+
+ static fn () => [1, 2]
232+
);
233+
234+
$wrongMultiLineArrayReturn = Collection::map(
235+
static fn () => [
236+
1,
237+
2,
238+
- ],
239+
+ ]
240+
);
217241
diff --git a/tests/fixed/example-class.php b/tests/fixed/example-class.php
218242
index 4988dab..2df56a0 100644
219243
--- a/tests/fixed/example-class.php
@@ -244,7 +268,7 @@ index 4988dab..2df56a0 100644
244268
$this->baxBax = $baxBax;
245269

246270
parent::__construct();
247-
@@ -41,7 +54,7 @@ class Example extends ParentClass implements IteratorAggregate
271+
@@ -41,7 +54,7 @@ public function __construct(private int|null $foo = null, private array $bar = [
248272
/**
249273
* Description
250274
*/
@@ -257,7 +281,7 @@ diff --git a/tests/fixed/namespaces-spacing.php b/tests/fixed/namespaces-spacing
257281
index 36cbae2..d42bbfe 100644
258282
--- a/tests/fixed/namespaces-spacing.php
259283
+++ b/tests/fixed/namespaces-spacing.php
260-
@@ -16,5 +16,5 @@ use const DATE_RFC3339;
284+
@@ -16,5 +16,5 @@
261285
strrev(
262286
(new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
263287
->sub(new DateInterval('P1D'))
@@ -268,7 +292,7 @@ diff --git a/tests/fixed/new_with_parentheses.php b/tests/fixed/new_with_parenth
268292
index 47a06ec..6e81bbe 100644
269293
--- a/tests/fixed/new_with_parentheses.php
270294
+++ b/tests/fixed/new_with_parentheses.php
271-
@@ -24,5 +24,5 @@ $y = [new stdClass()];
295+
@@ -24,5 +24,5 @@
272296

273297
$z = new stdClass() ? new stdClass() : new stdClass();
274298

@@ -302,7 +326,7 @@ diff --git a/tests/fixed/null_coalesce_operator.php b/tests/fixed/null_coalesce_
302326
index 51c361c..8846dd1 100644
303327
--- a/tests/fixed/null_coalesce_operator.php
304328
+++ b/tests/fixed/null_coalesce_operator.php
305-
@@ -4,7 +4,7 @@ declare(strict_types=1);
329+
@@ -4,7 +4,7 @@
306330

307331
$foo = $_GET['foo'] ?? 'foo';
308332

@@ -373,7 +397,7 @@ diff --git a/tests/fixed/return_type_on_methods.php b/tests/fixed/return_type_on
373397
index 0c897ae..8e2c6f7 100644
374398
--- a/tests/fixed/return_type_on_methods.php
375399
+++ b/tests/fixed/return_type_on_methods.php
376-
@@ -31,7 +31,7 @@ class Test
400+
@@ -31,7 +31,7 @@ public function f(
377401
int $c,
378402
int $d,
379403
int $e,
@@ -382,7 +406,7 @@ index 0c897ae..8e2c6f7 100644
382406
): void {
383407
}
384408

385-
@@ -40,7 +40,7 @@ class Test
409+
@@ -40,7 +40,7 @@ public function g(
386410
int $c,
387411
int $d,
388412
int $e,
@@ -391,7 +415,7 @@ index 0c897ae..8e2c6f7 100644
391415
): void {
392416
}
393417

394-
@@ -49,7 +49,7 @@ class Test
418+
@@ -49,7 +49,7 @@ public function h(
395419
int $c,
396420
int $d,
397421
int $e,
@@ -400,7 +424,7 @@ index 0c897ae..8e2c6f7 100644
400424
): void {
401425
}
402426

403-
@@ -58,7 +58,7 @@ class Test
427+
@@ -58,7 +58,7 @@ public function i(
404428
int $c,
405429
int $d,
406430
int $e,
@@ -409,7 +433,7 @@ index 0c897ae..8e2c6f7 100644
409433
): void {
410434
}
411435

412-
@@ -67,7 +67,7 @@ class Test
436+
@@ -67,7 +67,7 @@ public function j(
413437
int $c,
414438
int $d,
415439
int $e,
@@ -422,7 +446,7 @@ diff --git a/tests/fixed/type-hints.php b/tests/fixed/type-hints.php
422446
index 5e26ed8..10e6f34 100644
423447
--- a/tests/fixed/type-hints.php
424448
+++ b/tests/fixed/type-hints.php
425-
@@ -10,7 +10,7 @@ use Traversable;
449+
@@ -10,7 +10,7 @@
426450
class TraversableTypeHints
427451
{
428452
/** @var Traversable */
@@ -431,7 +455,7 @@ index 5e26ed8..10e6f34 100644
431455

432456
/**
433457
* @param Iterator $iterator
434-
@@ -25,5 +25,6 @@ class TraversableTypeHints
458+
@@ -25,5 +25,6 @@ public function get(Iterator $iterator): Traversable
435459

436460
class UnionTypeHints
437461
{
@@ -443,7 +467,7 @@ diff --git a/tests/input/ControlStructures.php b/tests/input/ControlStructures.p
443467
index 73944e3..a0e0b2e 100644
444468
--- a/tests/input/ControlStructures.php
445469
+++ b/tests/input/ControlStructures.php
446-
@@ -93,7 +93,7 @@ class ControlStructures
470+
@@ -93,7 +93,7 @@ public function spaceBelowBlocks(): void
447471
}
448472
try {
449473
echo 4;
@@ -498,7 +522,7 @@ diff --git a/tests/input/TrailingCommaOnFunctions.php b/tests/input/TrailingComm
498522
index fc5480e..f3ffa91 100644
499523
--- a/tests/input/TrailingCommaOnFunctions.php
500524
+++ b/tests/input/TrailingCommaOnFunctions.php
501-
@@ -10,7 +10,7 @@ use function var_dump;
525+
@@ -10,7 +10,7 @@
502526

503527
class TrailingCommaOnFunctions
504528
{
@@ -507,7 +531,7 @@ index fc5480e..f3ffa91 100644
507531
{
508532
}
509533

510-
@@ -23,7 +23,7 @@ class TrailingCommaOnFunctions
534+
@@ -23,7 +23,7 @@ public function uses(): void
511535
{
512536
$var = null;
513537

@@ -516,7 +540,7 @@ index fc5480e..f3ffa91 100644
516540
var_dump($var);
517541
};
518542

519-
@@ -37,8 +37,7 @@ class TrailingCommaOnFunctions
543+
@@ -37,8 +37,7 @@ public function uses(): void
520544

521545
$class = new TrailingCommaOnFunctions();
522546

@@ -530,7 +554,7 @@ diff --git a/tests/input/arrow-functions-format.php b/tests/input/arrow-function
530554
index d3903ff..8a358e8 100644
531555
--- a/tests/input/arrow-functions-format.php
532556
+++ b/tests/input/arrow-functions-format.php
533-
@@ -18,10 +18,10 @@ $returningObject = static fn () => new stdClass();
557+
@@ -18,10 +18,10 @@
534558

535559
$multiLineArrowFunctions = Collection::from([1, 2])
536560
->map(
@@ -547,7 +571,7 @@ diff --git a/tests/input/namespaces-spacing.php b/tests/input/namespaces-spacing
547571
index e7be018..e1ab639 100644
548572
--- a/tests/input/namespaces-spacing.php
549573
+++ b/tests/input/namespaces-spacing.php
550-
@@ -11,5 +11,5 @@ use const DATE_RFC3339;
574+
@@ -11,5 +11,5 @@
551575
strrev(
552576
(new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
553577
->sub(new DateInterval('P1D'))

‎tests/php73-compatibility.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ index d1e1fad..9a78bc1 100644
5252
-tests/input/UselessConditions.php 21 0
5353
+tests/input/UselessConditions.php 20 0
5454
----------------------------------------------------------------------
55-
-A TOTAL OF 462 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
56-
+A TOTAL OF 417 ERRORS AND 2 WARNINGS WERE FOUND IN 47 FILES
55+
-A TOTAL OF 464 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
56+
+A TOTAL OF 419 ERRORS AND 2 WARNINGS WERE FOUND IN 47 FILES
5757
----------------------------------------------------------------------
58-
-PHPCBF CAN FIX 378 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
59-
+PHPCBF CAN FIX 333 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
58+
-PHPCBF CAN FIX 380 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
59+
+PHPCBF CAN FIX 335 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
6060
----------------------------------------------------------------------
6161

6262

‎tests/php74-compatibility.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ index d1e1fad..ed67841 100644
5050
-tests/input/UselessConditions.php 21 0
5151
+tests/input/UselessConditions.php 20 0
5252
----------------------------------------------------------------------
53-
-A TOTAL OF 462 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
54-
+A TOTAL OF 426 ERRORS AND 2 WARNINGS WERE FOUND IN 47 FILES
53+
-A TOTAL OF 464 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
54+
+A TOTAL OF 428 ERRORS AND 2 WARNINGS WERE FOUND IN 47 FILES
5555
----------------------------------------------------------------------
56-
-PHPCBF CAN FIX 378 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
57-
+PHPCBF CAN FIX 342 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
56+
-PHPCBF CAN FIX 380 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
57+
+PHPCBF CAN FIX 344 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5858
----------------------------------------------------------------------
5959

6060

‎tests/php80-compatibility.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ index d1e1fad..71022c4 100644
2323
tests/input/useless-semicolon.php 2 0
2424
tests/input/UselessConditions.php 21 0
2525
----------------------------------------------------------------------
26-
-A TOTAL OF 462 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
27-
+A TOTAL OF 456 ERRORS AND 2 WARNINGS WERE FOUND IN 49 FILES
26+
-A TOTAL OF 464 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
27+
+A TOTAL OF 458 ERRORS AND 2 WARNINGS WERE FOUND IN 49 FILES
2828
----------------------------------------------------------------------
29-
-PHPCBF CAN FIX 378 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
30-
+PHPCBF CAN FIX 372 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
29+
-PHPCBF CAN FIX 380 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
30+
+PHPCBF CAN FIX 374 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
3131
----------------------------------------------------------------------
3232

3333

0 commit comments

Comments
 (0)