Skip to content

Commit bd096dd

Browse files
committed
Merge remote-tracking branch 'origin/documentation/PSR12-control-structures-boolean-operator-placement' into documentation/PSR12-control-structures-boolean-operator-placement
2 parents 68f207e + 2055266 commit bd096dd

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/Standards/PSR12/Docs/ControlStructures/BooleanOperatorPlacementStandard.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
]]>
88
</standard>
99
<code_comparison>
10-
<code title="Valid: Boolean operator between conditions at the beginning of the line.">
10+
<code title="Valid: Boolean operator between conditions consistently at the beginning of the line.">
1111
<![CDATA[
1212
if (
1313
$expr1
@@ -20,7 +20,7 @@ if (
2020
}
2121
]]>
2222
</code>
23-
<code title="Invalid: Boolean operators between conditions at the beginning and the end of the line.">
23+
<code title="Invalid: Mix of boolean operators at the beginning and the end of the line.">
2424
<![CDATA[
2525
if (
2626
$expr1 &&
@@ -33,10 +33,10 @@ if (
3333
</code>
3434
</code_comparison>
3535
<code_comparison>
36-
<code title="Valid: Boolean operator between conditions at the end of the line.">
36+
<code title="Valid: Boolean operator between conditions consistently at the end of the line.">
3737
<![CDATA[
3838
if (
39-
$expr1 &&
39+
$expr1 ||
4040
($expr2 || $expr3) &&
4141
$expr4
4242
) {
@@ -48,7 +48,7 @@ if (
4848
<![CDATA[
4949
match (
5050
$expr1
51-
&& $expr2 &&
51+
&& $expr2 ||
5252
$expr3
5353
) {
5454
// structure body.

0 commit comments

Comments
 (0)