Skip to content

Commit b0906bb

Browse files
jaymcpjrfnl
authored andcommitted
Docs: clarify wording and code samples for Squiz.WhiteSpace.ScopeClosingBrace
1 parent a2ca0b8 commit b0906bb

File tree

1 file changed

+24
-30
lines changed

1 file changed

+24
-30
lines changed

src/Standards/Squiz/Docs/WhiteSpace/ScopeClosingBraceStandard.xml

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,21 @@ function foo()
1212
echo 'opening brace at column 1';
1313
echo 'closing brace at column 1';
1414
<em>}</em>
15+
16+
class Foo {
17+
echo 'class keyword starts at column 1';
18+
echo 'closing brace at column 1';
19+
<em>}</em>
20+
21+
if ($a > $b) {
22+
echo 'conditional starts at column 1';
23+
echo 'closing brace at column 1';
24+
<em>}</em>
25+
26+
<?php if ($something) { ?>
27+
<p>conditional opening tag at column 1</p>
28+
<p>conditional closing tag at column 1</p>
29+
<?php } ?>
1530
]]>
1631
</code>
1732
<code title="Invalid: Closing brace misaligned with opening brace.">
@@ -21,42 +36,21 @@ function foo()
2136
echo 'opening brace at column 1';
2237
echo 'closing brace at column 2';
2338
<em> }</em>
24-
]]>
25-
</code>
26-
</code_comparison>
27-
<code_comparison>
28-
<code title="Valid: Closing brace aligned with class keyword.">
29-
<![CDATA[
30-
class Foo {
31-
echo 'class keyword starts at column 1';
32-
echo 'closing brace at column 1';
33-
<em>}</em>
34-
]]>
35-
</code>
36-
<code title="Invalid: Closing brace misaligned with class keyword.">
37-
<![CDATA[
39+
3840
class Foo {
3941
echo 'class keyword starts at column 1';
4042
echo 'closing brace at column 2';
4143
<em> }</em>
42-
]]>
43-
</code>
44-
</code_comparison>
45-
<code_comparison>
46-
<code title="Valid: Closing brace aligned with if keyword.">
47-
<![CDATA[
48-
if ($a > $b) {
49-
echo 'conditional starts at column 1';
50-
echo 'closing brace at column 1';
51-
<em>}</em>
52-
]]>
53-
</code>
54-
<code title="Invalid: Closing brace aligned with content.">
55-
<![CDATA[
44+
5645
if ($a > $b) {
5746
echo 'conditional starts at column 1';
5847
echo 'closing brace at column 5';
5948
<em> }</em>
49+
50+
<?php if ($something) { ?>
51+
<p>conditional opening tag at column 1</p>
52+
<p>conditional closing tag at column 2</p>
53+
<?php } ?>
6054
]]>
6155
</code>
6256
</code_comparison>
@@ -66,13 +60,13 @@ if ($a > $b) {
6660
]]>
6761
</standard>
6862
<code_comparison>
69-
<code title="Valid: Newline before closing brace.">
63+
<code title="Valid: Close brace on its own line.">
7064
<![CDATA[
7165
enum Foo {
7266
<em>}</em>
7367
]]>
7468
</code>
75-
<code title="Invalid: No newline before closing brace.">
69+
<code title="Invalid: Close brace on a line containing other code.">
7670
<![CDATA[
7771
enum Foo {<em>}</em>
7872
]]>

0 commit comments

Comments
 (0)