From 1142c60432ad3050d4144c168581e323011bd5ed Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 16 Mar 2024 20:27:10 +0100
Subject: [PATCH] Tests: make dataproviders `static`

As of PHPUnit 10, data providers are (again) expected to be `static` methods.

This updates the test suite to respect that.

Includes removing the use of `$this` from select data providers.

Refs:
* https://github.com/sebastianbergmann/phpunit/commit/9caafe2d49b33a21f87db248a8ad6ca7c7bdac09
* sebastianbergmann/phpunit 5100
---
 tests/Unit/Errors/ParallelLintErrorTest.php              | 4 ++--
 tests/Unit/Errors/SyntaxErrorGetLineTest.php             | 2 +-
 tests/Unit/Errors/SyntaxErrorGetNormalizeMessageTest.php | 4 ++--
 tests/Unit/Errors/SyntaxErrorTranslateTokensTest.php     | 2 +-
 tests/Unit/Outputs/OutputTest.php                        | 2 +-
 tests/Unit/SettingsAddPathsTest.php                      | 2 +-
 tests/Unit/SettingsParseArgumentsTest.php                | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/Unit/Errors/ParallelLintErrorTest.php b/tests/Unit/Errors/ParallelLintErrorTest.php
index 8bda3cc..db69b55 100644
--- a/tests/Unit/Errors/ParallelLintErrorTest.php
+++ b/tests/Unit/Errors/ParallelLintErrorTest.php
@@ -31,7 +31,7 @@ public function testGetMessage($message, $expected)
      *
      * @return array
      */
-    public function dataGetMessage()
+    public static function dataGetMessage()
     {
         return array(
             'Message: empty string' => array(
@@ -88,7 +88,7 @@ public function testGetShortFilePath($filePath, $expectedShort)
      *
      * @return array
      */
-    public function dataGetFilePath()
+    public static function dataGetFilePath()
     {
         $cwd = getcwd();
 
diff --git a/tests/Unit/Errors/SyntaxErrorGetLineTest.php b/tests/Unit/Errors/SyntaxErrorGetLineTest.php
index 86b824c..dd10e71 100644
--- a/tests/Unit/Errors/SyntaxErrorGetLineTest.php
+++ b/tests/Unit/Errors/SyntaxErrorGetLineTest.php
@@ -31,7 +31,7 @@ public function testGetLine($message, $expected)
      *
      * @return array
      */
-    public function dataGetLine()
+    public static function dataGetLine()
     {
         return array(
             'Message: empty string' => array(
diff --git a/tests/Unit/Errors/SyntaxErrorGetNormalizeMessageTest.php b/tests/Unit/Errors/SyntaxErrorGetNormalizeMessageTest.php
index 8eb47aa..7223cc4 100644
--- a/tests/Unit/Errors/SyntaxErrorGetNormalizeMessageTest.php
+++ b/tests/Unit/Errors/SyntaxErrorGetNormalizeMessageTest.php
@@ -31,7 +31,7 @@ public function testMessageNormalizationWithoutTokenTranslation($message, $expec
      *
      * @return array
      */
-    public function dataMessageNormalization()
+    public static function dataMessageNormalization()
     {
         return array(
             'Strip leading and trailing information - fatal error' => array(
@@ -85,7 +85,7 @@ public function testFilePathHandling($filePath, $fileName)
      *
      * @return array
      */
-    public function dataFilePathHandling()
+    public static function dataFilePathHandling()
     {
         return array(
             'Plain file name' => array(
diff --git a/tests/Unit/Errors/SyntaxErrorTranslateTokensTest.php b/tests/Unit/Errors/SyntaxErrorTranslateTokensTest.php
index a991c63..a1b5c44 100644
--- a/tests/Unit/Errors/SyntaxErrorTranslateTokensTest.php
+++ b/tests/Unit/Errors/SyntaxErrorTranslateTokensTest.php
@@ -31,7 +31,7 @@ public function testTranslateTokens($message, $expected)
      *
      * @return array
      */
-    public function dataTranslateTokens()
+    public static function dataTranslateTokens()
     {
         return array(
             'No token name in message' => array(
diff --git a/tests/Unit/Outputs/OutputTest.php b/tests/Unit/Outputs/OutputTest.php
index 79b5b8e..8deed33 100644
--- a/tests/Unit/Outputs/OutputTest.php
+++ b/tests/Unit/Outputs/OutputTest.php
@@ -68,7 +68,7 @@ public function testCheckstyleOutput()
         $this->assertInstanceOf('SimpleXMLElement', $parsed);
     }
 
-    public function getGitLabOutputData()
+    public static function getGitLabOutputData()
     {
         return array(
             array(
diff --git a/tests/Unit/SettingsAddPathsTest.php b/tests/Unit/SettingsAddPathsTest.php
index 182e3f1..bd72c0d 100644
--- a/tests/Unit/SettingsAddPathsTest.php
+++ b/tests/Unit/SettingsAddPathsTest.php
@@ -36,7 +36,7 @@ public function testAddPaths($original, $extra, $expected)
      *
      * @return array
      */
-    public function dataAddPaths()
+    public static function dataAddPaths()
     {
         return array(
             'No paths passed on CLI, no extra paths' => array(
diff --git a/tests/Unit/SettingsParseArgumentsTest.php b/tests/Unit/SettingsParseArgumentsTest.php
index 6bd751d..55e5102 100644
--- a/tests/Unit/SettingsParseArgumentsTest.php
+++ b/tests/Unit/SettingsParseArgumentsTest.php
@@ -35,7 +35,7 @@ public function testParseArgumentsInvalidArgument($command, $unsupported)
      *
      * @return array
      */
-    public function dataParseArgumentsInvalidArgument()
+    public static function dataParseArgumentsInvalidArgument()
     {
         return array(
             'Unsupported short argument' => array(
@@ -79,7 +79,7 @@ public function testParseArguments($command, array $expectedChanged)
      *
      * @return array
      */
-    public function dataParseArguments()
+    public static function dataParseArguments()
     {
         return array(
             'No arguments at all' => array(