Merge branch 'feature/generic-fix-invalid-xml-docs-files' of https://…

…github.com/jrfnl/PHP_CodeSniffer
squizlabs · Dec 18, 2022 · e26cc50 · e26cc50
2 parents 62dd954 + e189e3a
commit e26cc50
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/Standards/Generic/Docs/Classes/OpeningBraceSameLineStandard.xml b/src/Standards/Generic/Docs/Classes/OpeningBraceSameLineStandard.xml
@@ -15,6 +15,14 @@ class Foo <em>{</em>
         <![CDATA[
 class Foo
 <em>{</em>
+}
+        ]]>
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: Opening brace is the last thing on the line.">
+        <![CDATA[
+class Foo <em>{</em>
 }
         ]]>
         </code>

diff --git a/src/Standards/Generic/Docs/Formatting/SpaceAfterNotStandard.xml b/src/Standards/Generic/Docs/Formatting/SpaceAfterNotStandard.xml
@@ -10,13 +10,10 @@
 if (!<em> </em>$someVar || !<em> </em>$x instanceOf stdClass) {};
         ]]>
         </code>
-        <code title="Invalid: A NOT operator not followed by whitespace.">
+        <code title="Invalid: A NOT operator not followed by whitespace or followed by too much whitespace.">
         <![CDATA[
 if (!<em></em>$someVar || !<em></em>$x instanceOf stdClass) {};
-        ]]>
-        </code>
-        <code title="Invalid: A NOT operator followed by a new line or more than one space.">
-        <![CDATA[
+
 if (!<em>     </em>$someVar || !<em>
     </em>$x instanceOf stdClass) {};
         ]]>

diff --git a/src/Standards/Generic/Docs/WhiteSpace/ArbitraryParenthesesSpacingStandard.xml b/src/Standards/Generic/Docs/WhiteSpace/ArbitraryParenthesesSpacingStandard.xml
@@ -10,13 +10,10 @@
 $a = (null !== $extra);
         ]]>
         </code>
-        <code title="Invalid: spaces on the inside of a set of arbitrary parentheses.">
+        <code title="Invalid: spaces or new lines on the inside of a set of arbitrary parentheses.">
         <![CDATA[
 $a = ( null !== $extra );
-        ]]>
-        </code>
-        <code title="Invalid: new lines on the inside of a set of arbitrary parentheses.">
-        <![CDATA[
+
 $a = (
     null !== $extra
 );