Skip to content

Commit e64b67f

Browse files
greg0iregreg0ire
authored
Merge pull request #281 from simPod/non-capture
feat: require non-capturing catch
2 parents b63cd55 + b963e53 commit e64b67f

File tree

5 files changed

+140
-10
lines changed

5 files changed

+140
-10
lines changed

‎lib/Doctrine/ruleset.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,8 @@
287287
<rule ref="SlevomatCodingStandard.Exceptions.DeadCatch"/>
288288
<!-- Require using Throwable instead of Exception -->
289289
<rule ref="SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly"/>
290+
<!-- Require non-capturing catch when the variable with exception is not used. -->
291+
<rule ref="SlevomatCodingStandard.Exceptions.RequireNonCapturingCatch" />
290292
<!-- Ensure Arrow Functions declaration format -->
291293
<rule ref="SlevomatCodingStandard.Functions.ArrowFunctionDeclaration">
292294
<properties>

‎tests/fixed/Exceptions.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Exceptions;

‎tests/input/Exceptions.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Exceptions;

‎tests/php80-compatibility.patch‎

Lines changed: 64 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
diff --git a/tests/expected_report.txt b/tests/expected_report.txt
2-
index 1d5a7d3..03460f2 100644
2+
index 53dada5..741d972 100644
33
--- a/tests/expected_report.txt
44
+++ b/tests/expected_report.txt
5-
@@ -14,23 +14,24 @@ tests/input/constants-var.php 7 0
5+
@@ -14,23 +14,25 @@ tests/input/constants-var.php 7 0
66
tests/input/ControlStructures.php 28 0
77
tests/input/doc-comment-spacing.php 11 0
88
tests/input/duplicate-assignment-variable.php 1 0
99
-tests/input/EarlyReturn.php 6 0
1010
-tests/input/example-class.php 38 0
1111
+tests/input/EarlyReturn.php 7 0
1212
+tests/input/example-class.php 43 0
13+
+tests/input/Exceptions.php 1 0
1314
tests/input/forbidden-comments.php 14 0
1415
tests/input/forbidden-functions.php 6 0
1516
tests/input/inline_type_hint_assertions.php 7 0
@@ -35,7 +36,7 @@ index 1d5a7d3..03460f2 100644
3536
tests/input/semicolon_spacing.php 3 0
3637
tests/input/single-line-array-spacing.php 5 0
3738
tests/input/spread-operator.php 6 0
38-
@@ -39,16 +40,17 @@ tests/input/strings.php 1 0
39+
@@ -39,16 +41,17 @@ tests/input/strings.php 1 0
3940
tests/input/superfluous-naming.php 11 0
4041
tests/input/test-case.php 8 0
4142
tests/input/trailing_comma_on_array.php 1 0
@@ -50,13 +51,26 @@ index 1d5a7d3..03460f2 100644
5051
+tests/input/UselessConditions.php 21 0
5152
----------------------------------------------------------------------
5253
-A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
53-
+A TOTAL OF 421 ERRORS AND 0 WARNINGS WERE FOUND IN 44 FILES
54+
+A TOTAL OF 422 ERRORS AND 0 WARNINGS WERE FOUND IN 45 FILES
5455
----------------------------------------------------------------------
5556
-PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
56-
+PHPCBF CAN FIX 356 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
57+
+PHPCBF CAN FIX 357 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5758
----------------------------------------------------------------------
5859

5960

61+
diff --git a/tests/fixed/ControlStructures.php b/tests/fixed/ControlStructures.php
62+
index a653086..f8f7f65 100644
63+
--- a/tests/fixed/ControlStructures.php
64+
+++ b/tests/fixed/ControlStructures.php
65+
@@ -104,7 +104,7 @@ class ControlStructures
66+
67+
try {
68+
echo 4;
69+
- } catch (Throwable $throwable) {
70+
+ } catch (Throwable) {
71+
}
72+
73+
echo 5;
6074
diff --git a/tests/fixed/EarlyReturn.php b/tests/fixed/EarlyReturn.php
6175
index caf1dbb..fc734db 100644
6276
--- a/tests/fixed/EarlyReturn.php
@@ -70,6 +84,22 @@ index caf1dbb..fc734db 100644
7084
{
7185
foreach ($items as $item) {
7286
if (! $item->isItem()) {
87+
diff --git a/tests/fixed/Exceptions.php b/tests/fixed/Exceptions.php
88+
index 9b146c6..db7408b 100644
89+
--- a/tests/fixed/Exceptions.php
90+
+++ b/tests/fixed/Exceptions.php
91+
@@ -3,3 +3,11 @@
92+
declare(strict_types=1);
93+
94+
namespace Exceptions;
95+
+
96+
+use Exception;
97+
+use Throwable;
98+
+
99+
+try {
100+
+ throw new Exception();
101+
+} catch (Throwable) {
102+
+}
73103
diff --git a/tests/fixed/NamingCamelCase.php b/tests/fixed/NamingCamelCase.php
74104
index 57d9f2b..5493471 100644
75105
--- a/tests/fixed/NamingCamelCase.php
@@ -395,6 +425,35 @@ index 10e6f34..5e26ed8 100644
395425
- private $x = 1;
396426
+ private int|string|null $x = 1;
397427
}
428+
diff --git a/tests/input/ControlStructures.php b/tests/input/ControlStructures.php
429+
index a0e0b2e..73944e3 100644
430+
--- a/tests/input/ControlStructures.php
431+
+++ b/tests/input/ControlStructures.php
432+
@@ -93,7 +93,7 @@ class ControlStructures
433+
}
434+
try {
435+
echo 4;
436+
- } catch (Throwable $throwable) {
437+
+ } catch (Throwable) {
438+
}
439+
echo 5;
440+
}
441+
diff --git a/tests/input/Exceptions.php b/tests/input/Exceptions.php
442+
index 9b146c6..3aaa30f 100644
443+
--- a/tests/input/Exceptions.php
444+
+++ b/tests/input/Exceptions.php
445+
@@ -3,3 +3,11 @@
446+
declare(strict_types=1);
447+
448+
namespace Exceptions;
449+
+
450+
+use Exception;
451+
+use Throwable;
452+
+
453+
+try {
454+
+ throw new Exception();
455+
+} catch (Throwable $throwable) {
456+
+}
398457
diff --git a/tests/input/PropertyDeclaration.php b/tests/input/PropertyDeclaration.php
399458
index 0891e12..4eb8164 100644
400459
--- a/tests/input/PropertyDeclaration.php

‎tests/php81-compatibility.patch‎

Lines changed: 64 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/tests/expected_report.txt b/tests/expected_report.txt
2-
index 1d5a7d3..e9394b1 100644
2+
index 53dada5..d53fd48 100644
33
--- a/tests/expected_report.txt
44
+++ b/tests/expected_report.txt
5-
@@ -14,23 +14,25 @@ tests/input/constants-var.php 7 0
5+
@@ -14,23 +14,26 @@ tests/input/constants-var.php 7 0
66
tests/input/ControlStructures.php 28 0
77
tests/input/doc-comment-spacing.php 11 0
88
tests/input/duplicate-assignment-variable.php 1 0
@@ -11,6 +11,7 @@ index 1d5a7d3..e9394b1 100644
1111
+tests/input/EarlyReturn.php 7 0
1212
+tests/input/example-class.php 43 0
1313
+tests/input/ExampleBackedEnum.php 3 0
14+
+tests/input/Exceptions.php 1 0
1415
tests/input/forbidden-comments.php 14 0
1516
tests/input/forbidden-functions.php 6 0
1617
tests/input/inline_type_hint_assertions.php 7 0
@@ -36,7 +37,7 @@ index 1d5a7d3..e9394b1 100644
3637
tests/input/semicolon_spacing.php 3 0
3738
tests/input/single-line-array-spacing.php 5 0
3839
tests/input/spread-operator.php 6 0
39-
@@ -39,16 +41,17 @@ tests/input/strings.php 1 0
40+
@@ -39,16 +42,17 @@ tests/input/strings.php 1 0
4041
tests/input/superfluous-naming.php 11 0
4142
tests/input/test-case.php 8 0
4243
tests/input/trailing_comma_on_array.php 1 0
@@ -51,13 +52,26 @@ index 1d5a7d3..e9394b1 100644
5152
+tests/input/UselessConditions.php 21 0
5253
----------------------------------------------------------------------
5354
-A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
54-
+A TOTAL OF 427 ERRORS AND 0 WARNINGS WERE FOUND IN 45 FILES
55+
+A TOTAL OF 428 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
5556
----------------------------------------------------------------------
5657
-PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
57-
+PHPCBF CAN FIX 362 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
58+
+PHPCBF CAN FIX 363 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5859
----------------------------------------------------------------------
5960

6061

62+
diff --git a/tests/fixed/ControlStructures.php b/tests/fixed/ControlStructures.php
63+
index a653086..f8f7f65 100644
64+
--- a/tests/fixed/ControlStructures.php
65+
+++ b/tests/fixed/ControlStructures.php
66+
@@ -104,7 +104,7 @@ class ControlStructures
67+
68+
try {
69+
echo 4;
70+
- } catch (Throwable $throwable) {
71+
+ } catch (Throwable) {
72+
}
73+
74+
echo 5;
6175
diff --git a/tests/fixed/EarlyReturn.php b/tests/fixed/EarlyReturn.php
6276
index caf1dbb..fc734db 100644
6377
--- a/tests/fixed/EarlyReturn.php
@@ -83,6 +97,22 @@ index fe54eb9..cc38c54 100644
8397
+enum ExampleBackedEnum: int
8498
+{
8599
+}
100+
diff --git a/tests/fixed/Exceptions.php b/tests/fixed/Exceptions.php
101+
index 9b146c6..db7408b 100644
102+
--- a/tests/fixed/Exceptions.php
103+
+++ b/tests/fixed/Exceptions.php
104+
@@ -3,3 +3,11 @@
105+
declare(strict_types=1);
106+
107+
namespace Exceptions;
108+
+
109+
+use Exception;
110+
+use Throwable;
111+
+
112+
+try {
113+
+ throw new Exception();
114+
+} catch (Throwable) {
115+
+}
86116
diff --git a/tests/fixed/NamingCamelCase.php b/tests/fixed/NamingCamelCase.php
87117
index 57d9f2b..5493471 100644
88118
--- a/tests/fixed/NamingCamelCase.php
@@ -408,6 +438,19 @@ index 10e6f34..5e26ed8 100644
408438
- private $x = 1;
409439
+ private int|string|null $x = 1;
410440
}
441+
diff --git a/tests/input/ControlStructures.php b/tests/input/ControlStructures.php
442+
index a0e0b2e..73944e3 100644
443+
--- a/tests/input/ControlStructures.php
444+
+++ b/tests/input/ControlStructures.php
445+
@@ -93,7 +93,7 @@ class ControlStructures
446+
}
447+
try {
448+
echo 4;
449+
- } catch (Throwable $throwable) {
450+
+ } catch (Throwable) {
451+
}
452+
echo 5;
453+
}
411454
diff --git a/tests/input/ExampleBackedEnum.php b/tests/input/ExampleBackedEnum.php
412455
index fe54eb9..0c47286 100644
413456
--- a/tests/input/ExampleBackedEnum.php
@@ -420,6 +463,22 @@ index fe54eb9..0c47286 100644
420463
+enum ExampleBackedEnum : int
421464
+{
422465
+}
466+
diff --git a/tests/input/Exceptions.php b/tests/input/Exceptions.php
467+
index 9b146c6..3aaa30f 100644
468+
--- a/tests/input/Exceptions.php
469+
+++ b/tests/input/Exceptions.php
470+
@@ -3,3 +3,11 @@
471+
declare(strict_types=1);
472+
473+
namespace Exceptions;
474+
+
475+
+use Exception;
476+
+use Throwable;
477+
+
478+
+try {
479+
+ throw new Exception();
480+
+} catch (Throwable $throwable) {
481+
+}
423482
diff --git a/tests/input/PropertyDeclaration.php b/tests/input/PropertyDeclaration.php
424483
index 0891e12..acdc445 100644
425484
--- a/tests/input/PropertyDeclaration.php

0 commit comments

Comments
 (0)