Add static for Display\ResultsTest::dataProviderSortOrder()

MauricioFauth · MauricioFauth · commit 9be8f67aeb92 · 2023-02-22T14:27:07.000-03:00
PHPUnit 10 warns that data providers should be static methods.

Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -10290,11 +10290,6 @@ parameters:
 			count: 1
 			path: test/classes/Display/ResultsTest.php
 
-		-
-			message: "#^Method PhpMyAdmin\\\\Tests\\\\Display\\\\ResultsTest\\:\\:dataProviderSortOrder\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: test/classes/Display/ResultsTest.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\Tests\\\\Display\\\\ResultsTest\\:\\:providerSetConfigParamsForDisplayTable\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -16852,11 +16852,6 @@
       <code>array</code>
       <code>array</code>
     </MixedInferredReturnType>
-    <PossiblyInvalidArgument>
-      <code>testGetSingleAndMultiSortUrls</code>
-      <code>testGetSingleAndMultiSortUrls</code>
-      <code>testGetSingleAndMultiSortUrls</code>
-    </PossiblyInvalidArgument>
   </file>
   <file src="test/classes/Engines/PbxtTest.php">
     <MixedInferredReturnType>
diff --git a/test/classes/Display/ResultsTest.php b/test/classes/Display/ResultsTest.php
@@ -1807,9 +1807,9 @@ public function testGetTable2(): void
     }
 
     /**
-     * @return array[]
+     * @return array<string, array{string, string, int}>
      */
-    public function dataProviderSortOrder(): array
+    public static function dataProviderSortOrder(): array
     {
         return [
             'Default date' => [

Original file line number	Diff line number	Diff line change
`@@ -1807,9 +1807,9 @@ public function testGetTable2(): void`
`1807`	`1807`	`}`
`1808`	`1808`
`1809`	`1809`	`/**`
`1810`		`- * @return array[]`
	`1810`	`+ * @return array<string, array{string, string, int}>`
`1811`	`1811`	`*/`
`1812`		`- public function dataProviderSortOrder(): array`
	`1812`	`+ public static function dataProviderSortOrder(): array`
`1813`	`1813`	`{`
`1814`	`1814`	`return [`
`1815`	`1815`	`'Default date' => [`