build: Update squizlabs/php_codesniffer to 3.8.1

https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/tag/3.8.1 Adjust expected texts in the tests as needed Bug: T353926 Change-Id: I2db52638d8acab4732cef8c668a044a79ab8cdee
wikimedia · Jan 26, 2024 · 6927784 · 6927784
1 parent 8c9cb70
commit 6927784
Show file tree

Hide file tree

Showing 20 changed files with 136 additions and 175 deletions.
diff --git a/MediaWiki/Tests/files/AlternativeSyntax/unicode_escape_incomplete.php.expect b/MediaWiki/Tests/files/AlternativeSyntax/unicode_escape_incomplete.php.expect
@@ -1,6 +1,5 @@
  4 | WARNING | [x] Unicode code points should be expressed using four to six uppercase hex digits,
    |         |     with leading zeros used only as necessary for \u{0FFF} and below
    |         |     (MediaWiki.AlternativeSyntax.UnicodeEscape.DigitsNotNormalized)
- 4 | ERROR   | [x] Expected 1 newline at end of file; 0 found
-   |         |     (PSR2.Files.EndFileNewline.NoneFound)
+ 4 | ERROR   | [x] Expected 1 newline at end of file; 0 found (PSR2.Files.EndFileNewline.NoneFound)
 PHPCBF CAN FIX THE 2 MARKED SNIFF VIOLATIONS AUTOMATICALLY
diff --git a/MediaWiki/Tests/files/Arrays/TrailingComma/InvertedConfig/trailing_comma_inverted.php.expect b/MediaWiki/Tests/files/Arrays/TrailingComma/InvertedConfig/trailing_comma_inverted.php.expect
@@ -1,5 +1,4 @@
- 21 | WARNING | [x] Multi-line array with trailing comma
-    |         |     (MediaWiki.Arrays.TrailingComma.MultiLine)
+ 21 | WARNING | [x] Multi-line array with trailing comma (MediaWiki.Arrays.TrailingComma.MultiLine)
  25 | WARNING | [x] Single-line array without trailing comma
     |         |     (MediaWiki.Arrays.TrailingComma.SingleLine)
 PHPCBF CAN FIX THE 2 MARKED SNIFF VIOLATIONS AUTOMATICALLY
diff --git a/MediaWiki/Tests/files/Classes/unused_use.php.expect b/MediaWiki/Tests/files/Classes/unused_use.php.expect
@@ -4,8 +4,7 @@
     |         |     (MediaWiki.Classes.UnusedUseStatement.UnusedUse)
   6 | WARNING | [x] Unused use statement "AFunctionName"
     |         |     (MediaWiki.Classes.UnusedUseStatement.UnusedUse)
- 24 | WARNING | [x] Unused use statement "Unused"
-    |         |     (MediaWiki.Classes.UnusedUseStatement.UnusedUse)
+ 24 | WARNING | [x] Unused use statement "Unused" (MediaWiki.Classes.UnusedUseStatement.UnusedUse)
  26 | WARNING | [x] Unused use statement "SomeAlias"
     |         |     (MediaWiki.Classes.UnusedUseStatement.UnusedUse)
  31 | WARNING | [x] Unused use statement "FullyQualified"

diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
@@ -232,8 +232,7 @@
      |         |     (MediaWiki.Commenting.FunctionComment.ParamPassByReference)
  332 | ERROR   | [ ] Doc comment for parameter "$arg" missing
      |         |     (MediaWiki.Commenting.FunctionComment.MissingParamTag)
- 332 | ERROR   | [ ] Missing parameter type
-     |         |     (MediaWiki.Commenting.FunctionComment.MissingParamType)
+ 332 | ERROR   | [ ] Missing parameter type (MediaWiki.Commenting.FunctionComment.MissingParamType)
  336 | ERROR   | [ ] Return type missing for @return tag in function comment
      |         |     (MediaWiki.Commenting.FunctionComment.MissingReturnType)
  341 | ERROR   | [ ] Exception type missing for @throws tag in function comment
@@ -263,8 +262,7 @@
  389 | ERROR   | [ ] Doc comment for parameter "$notsamecase" missing
      |         |     (MediaWiki.Commenting.FunctionComment.MissingParamTag)
  391 | ERROR   | [ ] Doc comment for parameter $notSameCase does not match case of actual variable
-     |         |     name $notsamecase
-     |         |     (MediaWiki.Commenting.FunctionComment.ParamNameNoCaseMatch)
+     |         |     name $notsamecase (MediaWiki.Commenting.FunctionComment.ParamNameNoCaseMatch)
  397 | ERROR   | [x] Short type of "bool" should be used for @return tag
      |         |     (MediaWiki.Commenting.FunctionComment.NotShortBoolReturn)
  406 | ERROR   | [x] Short type of "int" should be used for @param tag

diff --git a/MediaWiki/Tests/files/Commenting/doc_commenting.php.expect b/MediaWiki/Tests/files/Commenting/doc_commenting.php.expect
@@ -10,8 +10,7 @@
     |       |     (MediaWiki.Commenting.DocComment.SyntaxAlignedDocStar)
  12 | ERROR | [x] Comment close tag not aligned with open tag
     |       |     (MediaWiki.Commenting.DocComment.SyntaxAlignedDocClose)
- 16 | ERROR | [x] Comment open tag must be '/**'
-    |       |     (MediaWiki.Commenting.DocComment.SyntaxOpenTag)
+ 16 | ERROR | [x] Comment open tag must be '/**' (MediaWiki.Commenting.DocComment.SyntaxOpenTag)
  16 | ERROR | [x] Expected at least 1 spaces after doc star; 0 found
     |       |     (MediaWiki.Commenting.DocComment.SpacingDocStar)
  17 | ERROR | [x] Comment star must be a single '*'
@@ -28,38 +27,31 @@
     |       |     (MediaWiki.Commenting.DocComment.SpacingDocStar)
  19 | ERROR | [x] Comment close tag not aligned with open tag
     |       |     (MediaWiki.Commenting.DocComment.SyntaxAlignedDocClose)
- 19 | ERROR | [x] Comment close tag must be '*/'
-    |       |     (MediaWiki.Commenting.DocComment.SyntaxCloseTag)
- 26 | ERROR | [x] Comment open tag must be '/**'
-    |       |     (MediaWiki.Commenting.DocComment.SyntaxOpenTag)
+ 19 | ERROR | [x] Comment close tag must be '*/' (MediaWiki.Commenting.DocComment.SyntaxCloseTag)
+ 26 | ERROR | [x] Comment open tag must be '/**' (MediaWiki.Commenting.DocComment.SyntaxOpenTag)
  27 | ERROR | [x] Comment star must be a single '*'
     |       |     (MediaWiki.Commenting.DocComment.SyntaxMultiDocStar)
  27 | ERROR | [x] Expected at least 1 spaces after doc star; 0 found
     |       |     (MediaWiki.Commenting.DocComment.SpacingDocStar)
  28 | ERROR | [x] Comment star must be a single '*'
     |       |     (MediaWiki.Commenting.DocComment.SyntaxMultiDocStar)
- 29 | ERROR | [x] Comment close tag must be '*/'
-    |       |     (MediaWiki.Commenting.DocComment.SyntaxCloseTag)
- 33 | ERROR | [x] Comment open tag must be '/**'
-    |       |     (MediaWiki.Commenting.DocComment.SyntaxOpenTag)
+ 29 | ERROR | [x] Comment close tag must be '*/' (MediaWiki.Commenting.DocComment.SyntaxCloseTag)
+ 33 | ERROR | [x] Comment open tag must be '/**' (MediaWiki.Commenting.DocComment.SyntaxOpenTag)
  33 | ERROR | [x] Expected 1 spaces after doc star on single line; 0 found
     |       |     (MediaWiki.Commenting.DocComment.SpacingDocStarSingleLine)
  33 | ERROR | [x] Expected 1 spaces before close comment tag on single line; 0 found
     |       |     (MediaWiki.Commenting.DocComment.SpacingSingleLineCloseTag)
- 33 | ERROR | [x] Comment close tag must be '*/'
-    |       |     (MediaWiki.Commenting.DocComment.SyntaxCloseTag)
+ 33 | ERROR | [x] Comment close tag must be '*/' (MediaWiki.Commenting.DocComment.SyntaxCloseTag)
  37 | ERROR | [x] Expected 1 spaces after doc star on single line; 3 found
     |       |     (MediaWiki.Commenting.DocComment.SpacingDocStarSingleLine)
  37 | ERROR | [x] Expected 1 spaces before close comment tag on single line; 2 found
     |       |     (MediaWiki.Commenting.DocComment.SpacingSingleLineCloseTag)
- 41 | ERROR | [x] Comment open tag must be '/**'
-    |       |     (MediaWiki.Commenting.DocComment.SyntaxOpenTag)
+ 41 | ERROR | [x] Comment open tag must be '/**' (MediaWiki.Commenting.DocComment.SyntaxOpenTag)
  42 | ERROR | [x] Comment star tag not aligned with open tag
     |       |     (MediaWiki.Commenting.DocComment.SyntaxAlignedDocStar)
  42 | ERROR | [x] Expected at least 1 spaces after doc star; 0 found
     |       |     (MediaWiki.Commenting.DocComment.SpacingDocStar)
- 42 | ERROR | [x] Comment close tag must be '*/'
-    |       |     (MediaWiki.Commenting.DocComment.SyntaxCloseTag)
+ 42 | ERROR | [x] Comment close tag must be '*/' (MediaWiki.Commenting.DocComment.SyntaxCloseTag)
  42 | ERROR | [x] Comment close tag should have own line
     |       |     (MediaWiki.Commenting.DocComment.CloseTagOwnLine)
  47 | ERROR | [x] Expected at least 1 spaces after doc star; 0 found

diff --git a/MediaWiki/Tests/files/Commenting/license_comment.php.expect b/MediaWiki/Tests/files/Commenting/license_comment.php.expect
@@ -1,20 +1,15 @@
-  5 | WARNING | [x] Incorrect wording of @license
-    |         |     (MediaWiki.Commenting.LicenseComment.LicenceTag)
-  6 | WARNING | [ ] Invalid SPDX license identifier "BSD Clause", see
-    |         |     <https://spdx.org/licenses/>
+  5 | WARNING | [x] Incorrect wording of @license (MediaWiki.Commenting.LicenseComment.LicenceTag)
+  6 | WARNING | [ ] Invalid SPDX license identifier "BSD Clause", see <https://spdx.org/licenses/>
     |         |     (MediaWiki.Commenting.LicenseComment.InvalidLicenseTag)
   7 | WARNING | [ ] @license not followed by a license
     |         |     (MediaWiki.Commenting.LicenseComment.LicenseTagEmpty)
   7 | ERROR   | [ ] Content missing for @license tag in class comment
     |         |     (MediaWiki.Commenting.EmptyTag.ClassLicense)
-  9 | WARNING | [ ] Deprecated SPDX license identifier "GPL-2.0+", see
-    |         |     <https://spdx.org/licenses/>
+  9 | WARNING | [ ] Deprecated SPDX license identifier "GPL-2.0+", see <https://spdx.org/licenses/>
     |         |     (MediaWiki.Commenting.LicenseComment.DeprecatedLicenseTag)
- 10 | WARNING | [x] Invalid SPDX license identifier "GNU GPL v2+", see
-    |         |     <https://spdx.org/licenses/>
+ 10 | WARNING | [x] Invalid SPDX license identifier "GNU GPL v2+", see <https://spdx.org/licenses/>
     |         |     (MediaWiki.Commenting.LicenseComment.InvalidLicenseTag)
- 11 | WARNING | [ ] Deprecated SPDX license identifier "GPL-2.0+", see
-    |         |     <https://spdx.org/licenses/>
+ 11 | WARNING | [ ] Deprecated SPDX license identifier "GPL-2.0+", see <https://spdx.org/licenses/>
     |         |     (MediaWiki.Commenting.LicenseComment.DeprecatedLicenseTag)
  11 | WARNING | [ ] Deprecated SPDX license identifier "LGPL-2.1+", see
     |         |     <https://spdx.org/licenses/>

diff --git a/MediaWiki/Tests/files/Commenting/phpunit_annotations.php.expect b/MediaWiki/Tests/files/Commenting/phpunit_annotations.php.expect
@@ -4,8 +4,8 @@
      |         |     (MediaWiki.Commenting.PhpunitAnnotations.NotTestClass)
   18 | WARNING | [ ] The phpunit annotation @backupGlobals should not be used.
      |         |     (MediaWiki.Commenting.PhpunitAnnotations.ForbiddenBackupGlobals)
-  24 | WARNING | [ ] The phpunit annotation @coversNothing should only be used inside test
-     |         |     classes. (MediaWiki.Commenting.PhpunitAnnotations.NotTestClass)
+  24 | WARNING | [ ] The phpunit annotation @coversNothing should only be used inside test classes.
+     |         |     (MediaWiki.Commenting.PhpunitAnnotations.NotTestClass)
   30 | WARNING | [x] Use @coversDefaultClass annotation instead of @coverDefaultClass
      |         |     (MediaWiki.Commenting.PhpunitAnnotations.SingularCoverDefaultClass)
   31 | WARNING | [x] Use @group small annotation instead of @small
@@ -20,8 +20,8 @@
      |         |     (MediaWiki.Commenting.MissingCovers.MissingCovers)
   49 | WARNING | [ ] The phpunit annotation @after should only be used for tearDown functions
      |         |     (*TearDown). (MediaWiki.Commenting.PhpunitAnnotations.NotTearDownFunction)
-  55 | WARNING | [ ] The phpunit annotation @dataProvider should only be used for test
-     |         |     functions. (MediaWiki.Commenting.PhpunitAnnotations.NotTestFunction)
+  55 | WARNING | [ ] The phpunit annotation @dataProvider should only be used for test functions.
+     |         |     (MediaWiki.Commenting.PhpunitAnnotations.NotTestFunction)
   73 | WARNING | [ ] Do not use @expectedException, use $this->expectException().
      |         |     (MediaWiki.Commenting.PhpunitAnnotations.ForbiddenExpectedException)
   74 | WARNING | [ ] Do not use @expectedExceptionMessage, use $this->expectExceptionMessage().
@@ -42,10 +42,10 @@
      |         |     (MediaWiki.Commenting.MissingCovers.MissingCovers)
  124 | ERROR   | [x] Import statements must not begin with a leading backslash
      |         |     (PSR12.Files.ImportStatement.LeadingSlash)
- 128 | WARNING | [x] Use absolute class name (\Path\To\OtherClass) for @covers annotation
-     |         |     instead (MediaWiki.Commenting.PhpunitAnnotations.AbsoluteCovers)
- 133 | WARNING | [x] Use absolute class name (\Path\To\OtherClass) for @covers annotation
-     |         |     instead (MediaWiki.Commenting.PhpunitAnnotations.AbsoluteCovers)
+ 128 | WARNING | [x] Use absolute class name (\Path\To\OtherClass) for @covers annotation instead
+     |         |     (MediaWiki.Commenting.PhpunitAnnotations.AbsoluteCovers)
+ 133 | WARNING | [x] Use absolute class name (\Path\To\OtherClass) for @covers annotation instead
+     |         |     (MediaWiki.Commenting.PhpunitAnnotations.AbsoluteCovers)
  142 | WARNING | [x] Use absolute class name (\Path\To\AnotherClass) for @coversDefaultClass
      |         |     annotation instead
      |         |     (MediaWiki.Commenting.PhpunitAnnotations.AbsoluteCoversDefaultClass)

diff --git a/MediaWiki/Tests/files/ExtraCharacters/parenthesis_after_keyword_incomplete.php.expect b/MediaWiki/Tests/files/ExtraCharacters/parenthesis_after_keyword_incomplete.php.expect
@@ -1,3 +1,2 @@
- 4 | ERROR | [x] Expected 1 newline at end of file; 0 found
-   |       |     (PSR2.Files.EndFileNewline.NoneFound)
+ 4 | ERROR | [x] Expected 1 newline at end of file; 0 found (PSR2.Files.EndFileNewline.NoneFound)
 PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY
diff --git a/MediaWiki/Tests/files/PHPUnit/deprecated.php.expect b/MediaWiki/Tests/files/PHPUnit/deprecated.php.expect
@@ -69,8 +69,8 @@
     |       |     (MediaWiki.PHPUnit.DeprecatedPHPUnitMethods.AttributeMethods)
  68 | ERROR | [ ] The PHPUnit method assertAttributeGreaterThanOrEqual() was deprecated in PHPUnit
     |       |     8. (MediaWiki.PHPUnit.DeprecatedPHPUnitMethods.AttributeMethods)
- 69 | ERROR | [ ] The PHPUnit method assertAttributeNotInstanceOf() was deprecated in PHPUnit
-    |       |     8. (MediaWiki.PHPUnit.DeprecatedPHPUnitMethods.AttributeMethods)
+ 69 | ERROR | [ ] The PHPUnit method assertAttributeNotInstanceOf() was deprecated in PHPUnit 8.
+    |       |     (MediaWiki.PHPUnit.DeprecatedPHPUnitMethods.AttributeMethods)
  70 | ERROR | [ ] The PHPUnit method getStaticAttribute() was deprecated in PHPUnit 8.
     |       |     (MediaWiki.PHPUnit.DeprecatedPHPUnitMethods.AttributeMethods)
  71 | ERROR | [ ] The PHPUnit method attribute() was deprecated in PHPUnit 8.

diff --git a/MediaWiki/Tests/files/PHPUnit/typehints.php.expect b/MediaWiki/Tests/files/PHPUnit/typehints.php.expect
@@ -2,38 +2,38 @@
     |         |     (MediaWiki.PHPUnit.PHPUnitTypeHints.MissingTypehint)
   9 | ERROR   | [x] The PHPUnit method tearDown() should have a return typehint of "void"
     |         |     (MediaWiki.PHPUnit.PHPUnitTypeHints.MissingTypehint)
- 12 | ERROR   | [x] The PHPUnit method setUpBeforeClass() should have a return typehint of
-    |         |     "void" (MediaWiki.PHPUnit.PHPUnitTypeHints.MissingTypehint)
- 15 | ERROR   | [x] The PHPUnit method tearDownAfterClass() should have a return typehint of
-    |         |     "void" (MediaWiki.PHPUnit.PHPUnitTypeHints.MissingTypehint)
+ 12 | ERROR   | [x] The PHPUnit method setUpBeforeClass() should have a return typehint of "void"
+    |         |     (MediaWiki.PHPUnit.PHPUnitTypeHints.MissingTypehint)
+ 15 | ERROR   | [x] The PHPUnit method tearDownAfterClass() should have a return typehint of "void"
+    |         |     (MediaWiki.PHPUnit.PHPUnitTypeHints.MissingTypehint)
  20 | ERROR   | [ ] The PHPUnit method setUp() should have a return typehint of "void"
     |         |     (MediaWiki.PHPUnit.PHPUnitTypeHints.WrongTypehint)
  23 | ERROR   | [ ] The PHPUnit method tearDown() should have a return typehint of "void"
     |         |     (MediaWiki.PHPUnit.PHPUnitTypeHints.WrongTypehint)
- 26 | ERROR   | [ ] The PHPUnit method setUpBeforeClass() should have a return typehint of
-    |         |     "void" (MediaWiki.PHPUnit.PHPUnitTypeHints.WrongTypehint)
- 29 | ERROR   | [ ] The PHPUnit method tearDownAfterClass() should have a return typehint of
-    |         |     "void" (MediaWiki.PHPUnit.PHPUnitTypeHints.WrongTypehint)
+ 26 | ERROR   | [ ] The PHPUnit method setUpBeforeClass() should have a return typehint of "void"
+    |         |     (MediaWiki.PHPUnit.PHPUnitTypeHints.WrongTypehint)
+ 29 | ERROR   | [ ] The PHPUnit method tearDownAfterClass() should have a return typehint of "void"
+    |         |     (MediaWiki.PHPUnit.PHPUnitTypeHints.WrongTypehint)
  47 | WARNING | [x] Namespaced PHPUnit TestCase class should be used instead
     |         |     (MediaWiki.PHPUnit.PHPUnitClassUsage.NotNamespaced)
  48 | ERROR   | [x] The PHPUnit method setUp() should have a return typehint of "void"
     |         |     (MediaWiki.PHPUnit.PHPUnitTypeHints.MissingTypehint)
  51 | ERROR   | [x] The PHPUnit method tearDown() should have a return typehint of "void"
     |         |     (MediaWiki.PHPUnit.PHPUnitTypeHints.MissingTypehint)
- 54 | ERROR   | [x] The PHPUnit method setUpBeforeClass() should have a return typehint of
-    |         |     "void" (MediaWiki.PHPUnit.PHPUnitTypeHints.MissingTypehint)
- 57 | ERROR   | [x] The PHPUnit method tearDownAfterClass() should have a return typehint of
-    |         |     "void" (MediaWiki.PHPUnit.PHPUnitTypeHints.MissingTypehint)
+ 54 | ERROR   | [x] The PHPUnit method setUpBeforeClass() should have a return typehint of "void"
+    |         |     (MediaWiki.PHPUnit.PHPUnitTypeHints.MissingTypehint)
+ 57 | ERROR   | [x] The PHPUnit method tearDownAfterClass() should have a return typehint of "void"
+    |         |     (MediaWiki.PHPUnit.PHPUnitTypeHints.MissingTypehint)
  61 | WARNING | [x] Namespaced PHPUnit TestCase class should be used instead
     |         |     (MediaWiki.PHPUnit.PHPUnitClassUsage.NotNamespaced)
  62 | ERROR   | [ ] The PHPUnit method setUp() should have a return typehint of "void"
     |         |     (MediaWiki.PHPUnit.PHPUnitTypeHints.WrongTypehint)
  65 | ERROR   | [ ] The PHPUnit method tearDown() should have a return typehint of "void"
     |         |     (MediaWiki.PHPUnit.PHPUnitTypeHints.WrongTypehint)
- 68 | ERROR   | [ ] The PHPUnit method setUpBeforeClass() should have a return typehint of
-    |         |     "void" (MediaWiki.PHPUnit.PHPUnitTypeHints.WrongTypehint)
- 71 | ERROR   | [ ] The PHPUnit method tearDownAfterClass() should have a return typehint of
-    |         |     "void" (MediaWiki.PHPUnit.PHPUnitTypeHints.WrongTypehint)
+ 68 | ERROR   | [ ] The PHPUnit method setUpBeforeClass() should have a return typehint of "void"
+    |         |     (MediaWiki.PHPUnit.PHPUnitTypeHints.WrongTypehint)
+ 71 | ERROR   | [ ] The PHPUnit method tearDownAfterClass() should have a return typehint of "void"
+    |         |     (MediaWiki.PHPUnit.PHPUnitTypeHints.WrongTypehint)
  75 | WARNING | [x] Namespaced PHPUnit TestCase class should be used instead
     |         |     (MediaWiki.PHPUnit.PHPUnitClassUsage.NotNamespaced)
 PHPCBF CAN FIX THE 11 MARKED SNIFF VIOLATIONS AUTOMATICALLY
diff --git a/MediaWiki/Tests/files/Usage/double_not_operator.php.expect b/MediaWiki/Tests/files/Usage/double_not_operator.php.expect
@@ -1,21 +1,14 @@
-  3 | WARNING | [x] Use (bool) instead of !!
-    |         |     (MediaWiki.Usage.DoubleNotOperator.DoubleNotOperator)
-  6 | WARNING | [x] Use (bool) instead of !!
-    |         |     (MediaWiki.Usage.DoubleNotOperator.DoubleNotOperator)
-  8 | WARNING | [x] Use (bool) instead of !!
-    |         |     (MediaWiki.Usage.DoubleNotOperator.DoubleNotOperator)
- 12 | WARNING | [x] Use (bool) instead of !!
-    |         |     (MediaWiki.Usage.DoubleNotOperator.DoubleNotOperator)
+  3 | WARNING | [x] Use (bool) instead of !! (MediaWiki.Usage.DoubleNotOperator.DoubleNotOperator)
+  6 | WARNING | [x] Use (bool) instead of !! (MediaWiki.Usage.DoubleNotOperator.DoubleNotOperator)
+  8 | WARNING | [x] Use (bool) instead of !! (MediaWiki.Usage.DoubleNotOperator.DoubleNotOperator)
+ 12 | WARNING | [x] Use (bool) instead of !! (MediaWiki.Usage.DoubleNotOperator.DoubleNotOperator)
  12 | ERROR   | [x] Expected 0 spaces after NOT operator; 1 found
     |         |     (Generic.Formatting.SpaceAfterNot.Incorrect)
- 13 | WARNING | [x] Use (bool) instead of !!
-    |         |     (MediaWiki.Usage.DoubleNotOperator.DoubleNotOperator)
+ 13 | WARNING | [x] Use (bool) instead of !! (MediaWiki.Usage.DoubleNotOperator.DoubleNotOperator)
  13 | ERROR   | [x] Expected 0 spaces after NOT operator; 4 found
     |         |     (Generic.Formatting.SpaceAfterNot.Incorrect)
- 14 | WARNING | [x] Use (bool) instead of !!
-    |         |     (MediaWiki.Usage.DoubleNotOperator.DoubleNotOperator)
- 15 | WARNING | [x] Use (bool) instead of !!
-    |         |     (MediaWiki.Usage.DoubleNotOperator.DoubleNotOperator)
+ 14 | WARNING | [x] Use (bool) instead of !! (MediaWiki.Usage.DoubleNotOperator.DoubleNotOperator)
+ 15 | WARNING | [x] Use (bool) instead of !! (MediaWiki.Usage.DoubleNotOperator.DoubleNotOperator)
  16 | WARNING | [ ] Use (bool) instead of !!, possibly with extra parenthesis due to operator
     |         |     precedence (MediaWiki.Usage.DoubleNotOperator.DoubleNotOperatorParenthesis)
  18 | WARNING | [ ] Use (bool) instead of !!, possibly with extra parenthesis due to operator

diff --git a/MediaWiki/Tests/files/Usage/extend_class_usage.php.expect b/MediaWiki/Tests/files/Usage/extend_class_usage.php.expect
@@ -1,7 +1,7 @@
   16 | WARNING | Should use function $this->msg() rather than function wfMessage()
      |         | (MediaWiki.Usage.ExtendClassUsage.FunctionVarUsage)
-  27 | WARNING | Should use function $this->getConfig()->get() rather than global
-     |         | $wgMyConfigGlobal (MediaWiki.Usage.ExtendClassUsage.FunctionConfigUsage)
+  27 | WARNING | Should use function $this->getConfig()->get() rather than global $wgMyConfigGlobal
+     |         | (MediaWiki.Usage.ExtendClassUsage.FunctionConfigUsage)
   32 | WARNING | Deprecated global $wgContLang used
      |         | (MediaWiki.Usage.DeprecatedGlobalVariables.Deprecated$wgContLang)
   37 | ERROR   | Only one object structure is allowed in a file