Re-enable ScopeIndent sniff on test that was previously failing

Partial revert of I1e85a43e3f5626ca017893f25553d6a9fbcaaaf0, which disabled the ScopeIndent sniff on this test file due to upstream issue squizlabs/PHP_CodeSniffer#3808. This has now been resolved in 3.11, so the exclusion can be removed. Change-Id: I22d18849d0207528bf14ca6709a74523f20a6ff3
wikimedia · Jan 12, 2025 · aa5f2b5 · aa5f2b5
1 parent 3a61696
commit aa5f2b5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/MediaWiki/Tests/files/Usage/assignment_in_return.php b/MediaWiki/Tests/files/Usage/assignment_in_return.php
@@ -1,8 +1,5 @@
 <?php
 
-// phpcs:disable Generic.WhiteSpace.ScopeIndent.Incorrect
-// Sniff fails with multiline `yield from`: https://github.com/squizlabs/PHP_CodeSniffer/issues/3808
-
 /**
  * Failed examples.
  * @return mixed

diff --git a/MediaWiki/Tests/files/Usage/assignment_in_return.php.expect b/MediaWiki/Tests/files/Usage/assignment_in_return.php.expect
@@ -1,17 +1,17 @@
- 12 | ERROR | [ ] Assignment expression not allowed within "return".
+  9 | ERROR | [ ] Assignment expression not allowed within "return".
     |       |     (MediaWiki.Usage.AssignmentInReturn.AssignmentInReturn)
- 16 | ERROR | [ ] Assignment expression not allowed within "return".
+ 13 | ERROR | [ ] Assignment expression not allowed within "return".
     |       |     (MediaWiki.Usage.AssignmentInReturn.AssignmentInReturn)
- 27 | ERROR | [ ] Assignment expression not allowed within "yield".
+ 24 | ERROR | [ ] Assignment expression not allowed within "yield".
     |       |     (MediaWiki.Usage.AssignmentInReturn.AssignmentInYield)
- 30 | ERROR | [ ] Assignment expression not allowed within "yield".
+ 27 | ERROR | [ ] Assignment expression not allowed within "yield".
     |       |     (MediaWiki.Usage.AssignmentInReturn.AssignmentInYield)
- 33 | ERROR | [ ] Assignment expression not allowed within "yield from".
+ 30 | ERROR | [ ] Assignment expression not allowed within "yield from".
     |       |     (MediaWiki.Usage.AssignmentInReturn.AssignmentInYieldFrom)
- 33 | ERROR | [x] Language constructs must be followed by a single space; expected 1 space between
+ 30 | ERROR | [x] Language constructs must be followed by a single space; expected 1 space between
     |       |     YIELD FROM found
     |       |     "yield\n········from"
     |       |     (Generic.WhiteSpace.LanguageConstructSpacing.IncorrectYieldFrom)
- 35 | ERROR | [ ] Assignment expression not allowed within "yield from".
+ 32 | ERROR | [ ] Assignment expression not allowed within "yield from".
     |       |     (MediaWiki.Usage.AssignmentInReturn.AssignmentInYieldFrom)
-PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY
diff --git a/MediaWiki/Tests/files/Usage/assignment_in_return.php.fixed b/MediaWiki/Tests/files/Usage/assignment_in_return.php.fixed
@@ -1,8 +1,5 @@
 <?php
 
-// phpcs:disable Generic.WhiteSpace.ScopeIndent.Incorrect
-// Sniff fails with multiline `yield from`: https://github.com/squizlabs/PHP_CodeSniffer/issues/3808
-
 /**
  * Failed examples.
  * @return mixed