Merge branch 'master' into 4.x

jrfnl · jrfnl · commit 009bce71ccdb · 2025-09-12T19:10:47.000+02:00
diff --git a/tests/Core/Generators/Fixtures/HTMLDouble.php b/tests/Core/Generators/Fixtures/HTMLDouble.php
@@ -20,12 +20,12 @@ class HTMLDouble extends HTML
      */
     protected function getFormattedFooter()
     {
-        $output ='  <div class="tag-line">Documentation generated on #REDACTED# by <a href="https://github.com/PHPCSStandards/PHP_CodeSniffer">PHP_CodeSniffer #VERSION#</a></div>
+        $output = '  <div class="tag-line">Documentation generated on #REDACTED# by <a href="https://github.com/PHPCSStandards/PHP_CodeSniffer">PHP_CodeSniffer #VERSION#</a></div>
  </body>
 </html>';
 
         // Use the correct line endings based on the OS.
-        return str_replace("\n", PHP_EOL, $output).PHP_EOL;
+        return str_replace("\n", PHP_EOL, $output) . PHP_EOL;
     }
 
     /**
diff --git a/tests/Core/Generators/Fixtures/MarkdownDouble.php b/tests/Core/Generators/Fixtures/MarkdownDouble.php
@@ -20,8 +20,8 @@ class MarkdownDouble extends Markdown
      */
     protected function getFormattedFooter()
     {
-        $output     = PHP_EOL.'Documentation generated on *REDACTED*';
-        $output    .= ' by [PHP_CodeSniffer *VERSION*](https://github.com/PHPCSStandards/PHP_CodeSniffer)'.PHP_EOL;
+        $output  = PHP_EOL . 'Documentation generated on *REDACTED*';
+        $output .= ' by [PHP_CodeSniffer *VERSION*](https://github.com/PHPCSStandards/PHP_CodeSniffer)' . PHP_EOL;
 
         return $output;
     }
diff --git a/tests/Core/Ruleset/Fixtures/ProcessRulesetCliArgsTest/vendor/OrgName/ExtStandard/bootstrap.php b/tests/Core/Ruleset/Fixtures/ProcessRulesetCliArgsTest/vendor/OrgName/ExtStandard/bootstrap.php
@@ -1,3 +1,3 @@
-<?php
-
-// Do nothing. This is just a placeholder file for the "bootstrap" CLI flag test.
+<?php
+
+// Do nothing. This is just a placeholder file for the "bootstrap" CLI flag test.
diff --git a/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/Deprecated/WithLongReplacementSniff.php b/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/Deprecated/WithLongReplacementSniff.php
@@ -11,7 +11,7 @@
 use PHP_CodeSniffer\Sniffs\DeprecatedSniff;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
-class WithLongReplacementSniff implements Sniff,DeprecatedSniff
+class WithLongReplacementSniff implements Sniff, DeprecatedSniff
 {
 
     public function getDeprecationVersion()
diff --git a/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/Deprecated/WithReplacementContainingLinuxNewlinesSniff.php b/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/Deprecated/WithReplacementContainingLinuxNewlinesSniff.php
@@ -11,7 +11,7 @@
 use PHP_CodeSniffer\Sniffs\DeprecatedSniff;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
-class WithReplacementContainingLinuxNewlinesSniff implements Sniff,DeprecatedSniff
+class WithReplacementContainingLinuxNewlinesSniff implements Sniff, DeprecatedSniff
 {
 
     public function getDeprecationVersion()
@@ -27,10 +27,10 @@ public function getRemovalVersion()
     public function getDeprecationMessage()
     {
         return "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n"
-            ."Fusce vel vestibulum nunc. Sed luctus dolor tortor, eu euismod purus pretium sed.\n"
-            ."Fusce egestas congue massa semper cursus. Donec quis pretium tellus.\n"
-            ."In lacinia, augue ut ornare porttitor, diam nunc faucibus purus, et accumsan eros sapien at sem.\n"
-            .'Sed pulvinar aliquam malesuada. Aliquam erat volutpat. Mauris gravida rutrum lectus at egestas.';
+            . "Fusce vel vestibulum nunc. Sed luctus dolor tortor, eu euismod purus pretium sed.\n"
+            . "Fusce egestas congue massa semper cursus. Donec quis pretium tellus.\n"
+            . "In lacinia, augue ut ornare porttitor, diam nunc faucibus purus, et accumsan eros sapien at sem.\n"
+            . 'Sed pulvinar aliquam malesuada. Aliquam erat volutpat. Mauris gravida rutrum lectus at egestas.';
     }
 
     public function register()
diff --git a/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/Deprecated/WithReplacementContainingNewlinesSniff.php b/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/Deprecated/WithReplacementContainingNewlinesSniff.php
@@ -11,7 +11,7 @@
 use PHP_CodeSniffer\Sniffs\DeprecatedSniff;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
-class WithReplacementContainingNewlinesSniff implements Sniff,DeprecatedSniff
+class WithReplacementContainingNewlinesSniff implements Sniff, DeprecatedSniff
 {
 
     public function getDeprecationVersion()
@@ -26,11 +26,11 @@ public function getRemovalVersion()
 
     public function getDeprecationMessage()
     {
-        return 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.'.PHP_EOL
-            .'Fusce vel vestibulum nunc. Sed luctus dolor tortor, eu euismod purus pretium sed.'.PHP_EOL
-            .'Fusce egestas congue massa semper cursus. Donec quis pretium tellus.'.PHP_EOL
-            .'In lacinia, augue ut ornare porttitor, diam nunc faucibus purus, et accumsan eros sapien at sem.'.PHP_EOL
-            .'Sed pulvinar aliquam malesuada. Aliquam erat volutpat. Mauris gravida rutrum lectus at egestas';
+        return 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.' . PHP_EOL
+            . 'Fusce vel vestibulum nunc. Sed luctus dolor tortor, eu euismod purus pretium sed.' . PHP_EOL
+            . 'Fusce egestas congue massa semper cursus. Donec quis pretium tellus.' . PHP_EOL
+            . 'In lacinia, augue ut ornare porttitor, diam nunc faucibus purus, et accumsan eros sapien at sem.' . PHP_EOL
+            . 'Sed pulvinar aliquam malesuada. Aliquam erat volutpat. Mauris gravida rutrum lectus at egestas';
     }
 
     public function register()
diff --git a/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/Deprecated/WithReplacementSniff.php b/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/Deprecated/WithReplacementSniff.php
@@ -11,7 +11,7 @@
 use PHP_CodeSniffer\Sniffs\DeprecatedSniff;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
-class WithReplacementSniff implements Sniff,DeprecatedSniff
+class WithReplacementSniff implements Sniff, DeprecatedSniff
 {
 
     public function getDeprecationVersion()
diff --git a/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/Deprecated/WithoutReplacementSniff.php b/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/Deprecated/WithoutReplacementSniff.php
@@ -11,7 +11,7 @@
 use PHP_CodeSniffer\Sniffs\DeprecatedSniff;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
-class WithoutReplacementSniff implements Sniff,DeprecatedSniff
+class WithoutReplacementSniff implements Sniff, DeprecatedSniff
 {
 
     public function getDeprecationVersion()
diff --git a/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/DeprecatedInvalid/EmptyDeprecationVersionSniff.php b/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/DeprecatedInvalid/EmptyDeprecationVersionSniff.php
@@ -11,7 +11,7 @@
 use PHP_CodeSniffer\Sniffs\DeprecatedSniff;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
-class EmptyDeprecationVersionSniff implements Sniff,DeprecatedSniff
+class EmptyDeprecationVersionSniff implements Sniff, DeprecatedSniff
 {
 
     public function getDeprecationVersion()
diff --git a/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/DeprecatedInvalid/EmptyRemovalVersionSniff.php b/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/DeprecatedInvalid/EmptyRemovalVersionSniff.php
@@ -11,7 +11,7 @@
 use PHP_CodeSniffer\Sniffs\DeprecatedSniff;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
-class EmptyRemovalVersionSniff implements Sniff,DeprecatedSniff
+class EmptyRemovalVersionSniff implements Sniff, DeprecatedSniff
 {
 
     public function getDeprecationVersion()
diff --git a/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/DeprecatedInvalid/InvalidDeprecationMessageSniff.php b/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/DeprecatedInvalid/InvalidDeprecationMessageSniff.php
@@ -12,7 +12,7 @@
 use PHP_CodeSniffer\Sniffs\Sniff;
 use stdClass;
 
-class InvalidDeprecationMessageSniff implements Sniff,DeprecatedSniff
+class InvalidDeprecationMessageSniff implements Sniff, DeprecatedSniff
 {
 
     public function getDeprecationVersion()
diff --git a/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/DeprecatedInvalid/InvalidDeprecationVersionSniff.php b/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/DeprecatedInvalid/InvalidDeprecationVersionSniff.php
@@ -11,7 +11,7 @@
 use PHP_CodeSniffer\Sniffs\DeprecatedSniff;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
-class InvalidDeprecationVersionSniff implements Sniff,DeprecatedSniff
+class InvalidDeprecationVersionSniff implements Sniff, DeprecatedSniff
 {
 
     public function getDeprecationVersion()
diff --git a/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/DeprecatedInvalid/InvalidRemovalVersionSniff.php b/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/DeprecatedInvalid/InvalidRemovalVersionSniff.php
@@ -11,7 +11,7 @@
 use PHP_CodeSniffer\Sniffs\DeprecatedSniff;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
-class InvalidRemovalVersionSniff implements Sniff,DeprecatedSniff
+class InvalidRemovalVersionSniff implements Sniff, DeprecatedSniff
 {
 
     public function getDeprecationVersion()
diff --git a/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/MissingInterface/ValidImplementsViaAbstractSniff.php b/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/MissingInterface/ValidImplementsViaAbstractSniff.php
@@ -14,12 +14,12 @@ final class ValidImplementsViaAbstractSniff extends AbstractArraySniff
 {
 
     protected function processSingleLineArray(File $phpcsFile, int $stackPtr, int $arrayStart, int $arrayEnd, array $indices)
-	{
-		// Do something.
+    {
+        // Do something.
     }
 
     protected function processMultiLineArray(File $phpcsFile, int $stackPtr, int $arrayStart, int $arrayEnd, array $indices)
-	{
-		// Do something.
+    {
+        // Do something.
     }
 }
diff --git a/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/SupportedTokenizers/ListensForPHPAndCSSAndJSSniff.php b/tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/SupportedTokenizers/ListensForPHPAndCSSAndJSSniff.php
@@ -23,7 +23,7 @@ public function register()
     {
         return [
             T_OPEN_TAG,
-            T_OPEN_TAG_WITH_ECHO
+            T_OPEN_TAG_WITH_ECHO,
         ];
     }
 
diff --git a/tests/Core/Runner/Fixtures/AllFilesExcludedSetB/placeholderA.php b/tests/Core/Runner/Fixtures/AllFilesExcludedSetB/placeholderA.php
@@ -1,8 +1,8 @@
-<?php
-/**
- * Test fixture.
- *
- * @see \PHP_CodeSniffer\Tests\Core\Runner\RunAllFilesExcludedErrorTest
- */
-
-echo 'hello';
+<?php
+/**
+ * Test fixture.
+ *
+ * @see \PHP_CodeSniffer\Tests\Core\Runner\RunAllFilesExcludedErrorTest
+ */
+
+echo 'hello';
diff --git a/tests/Core/Runner/Fixtures/AllFilesExcludedSetB/placeholderB.php b/tests/Core/Runner/Fixtures/AllFilesExcludedSetB/placeholderB.php
@@ -1,8 +1,8 @@
-<?php
-/**
- * Test fixture.
- *
- * @see \PHP_CodeSniffer\Tests\Core\Runner\RunAllFilesExcludedErrorTest
- */
-
-echo 'hello';
+<?php
+/**
+ * Test fixture.
+ *
+ * @see \PHP_CodeSniffer\Tests\Core\Runner\RunAllFilesExcludedErrorTest
+ */
+
+echo 'hello';
diff --git a/tests/Core/Runner/Fixtures/AllFilesExcludedSetB/placeholderC.php b/tests/Core/Runner/Fixtures/AllFilesExcludedSetB/placeholderC.php
@@ -1,8 +1,8 @@
-<?php
-/**
- * Test fixture.
- *
- * @see \PHP_CodeSniffer\Tests\Core\Runner\RunAllFilesExcludedErrorTest
- */
-
-echo 'hello';
+<?php
+/**
+ * Test fixture.
+ *
+ * @see \PHP_CodeSniffer\Tests\Core\Runner\RunAllFilesExcludedErrorTest
+ */
+
+echo 'hello';
diff --git a/tests/Core/Runner/Fixtures/AllFilesExcludedSetB/placeholderD.php b/tests/Core/Runner/Fixtures/AllFilesExcludedSetB/placeholderD.php
@@ -1,8 +1,8 @@
-<?php
-/**
- * Test fixture.
- *
- * @see \PHP_CodeSniffer\Tests\Core\Runner\RunAllFilesExcludedErrorTest
- */
-
-echo 'hello';
+<?php
+/**
+ * Test fixture.
+ *
+ * @see \PHP_CodeSniffer\Tests\Core\Runner\RunAllFilesExcludedErrorTest
+ */
+
+echo 'hello';

Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ class HTMLDouble extends HTML`
`20`	`20`	`*/`
`21`	`21`	`protected function getFormattedFooter()`
`22`	`22`	`{`
`23`		`- $output =' <div class="tag-line">Documentation generated on #REDACTED# by <a href="https://github.com/PHPCSStandards/PHP_CodeSniffer">PHP_CodeSniffer #VERSION#</a></div>`
	`23`	`+ $output = ' <div class="tag-line">Documentation generated on #REDACTED# by <a href="https://github.com/PHPCSStandards/PHP_CodeSniffer">PHP_CodeSniffer #VERSION#</a></div>`
`24`	`24`	`</body>`
`25`	`25`	`</html>';`
`26`	`26`
`27`	`27`	`// Use the correct line endings based on the OS.`
`28`		`- return str_replace("\n", PHP_EOL, $output).PHP_EOL;`
	`28`	`+ return str_replace("\n", PHP_EOL, $output) . PHP_EOL;`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ class MarkdownDouble extends Markdown`
`20`	`20`	`*/`
`21`	`21`	`protected function getFormattedFooter()`
`22`	`22`	`{`
`23`		`- $output = PHP_EOL.'Documentation generated on REDACTED';`
`24`		`- $output .= ' by [PHP_CodeSniffer VERSION](https://github.com/PHPCSStandards/PHP_CodeSniffer)'.PHP_EOL;`
	`23`	`+ $output = PHP_EOL . 'Documentation generated on REDACTED';`
	`24`	`+ $output .= ' by [PHP_CodeSniffer VERSION](https://github.com/PHPCSStandards/PHP_CodeSniffer)' . PHP_EOL;`
`25`	`25`
`26`	`26`	`return $output;`
`27`	`27`	`}`
-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 -<?php
+-
 -// Do nothing. This is just a placeholder file for the "bootstrap" CLI flag test.
 +<?php
++
 +// Do nothing. This is just a placeholder file for the "bootstrap" CLI flag test.
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`use PHP_CodeSniffer\Sniffs\DeprecatedSniff;`
`12`	`12`	`use PHP_CodeSniffer\Sniffs\Sniff;`
`13`	`13`
`14`		`-class WithLongReplacementSniff implements Sniff,DeprecatedSniff`
	`14`	`+class WithLongReplacementSniff implements Sniff, DeprecatedSniff`
`15`	`15`	`{`
`16`	`16`
`17`	`17`	`public function getDeprecationVersion()`