test: convert phpunit.xml to v10

and mark dataProvider functions as static in unit tests.

Author: phil-davis

.gitignore

@@ -4,6 +4,7 @@ composer.lock
 
 # Tests
 tests/cov/
-.phpunit.result.cache
+tests/.phpunit.cache
+tests/.phpunit.result.cache
 .php_cs.cache
 .php-cs-fixer.cache

tests/HTTP/FunctionsTest.php

@@ -21,7 +21,7 @@ public function testGetHeaderValuesOnValues2(array $result, array $values1, arra
     /**
      * @return array<int, array<int, array<int, string>>>
      */
-    public function getHeaderValuesDataOnValues2(): array
+    public static function getHeaderValuesDataOnValues2(): array
     {
         return [
             [
@@ -54,7 +54,7 @@ public function testGetHeaderValues($input, array $output): void
     /**
      * @return array<int, mixed>
      */
-    public function getHeaderValuesData(): array
+    public static function getHeaderValuesData(): array
     {
         return [
             [
@@ -97,7 +97,7 @@ public function testPrefer($input, array $output): void
     /**
      * @return array<int, mixed>
      */
-    public function preferData(): array
+    public static function preferData(): array
     {
         return [
             [

tests/HTTP/NegotiateTest.php

@@ -22,7 +22,7 @@ public function testNegotiate(?string $acceptHeader, array $available, ?string $
     /**
      * @return array<int, array<int, mixed>>
      */
-    public function negotiateData(): array
+    public static function negotiateData(): array
     {
         return [
             [ // simple

tests/HTTP/SapiTest.php

@@ -252,7 +252,7 @@ public function testSendContentRangeStream(
     /**
      * @return array<int, array<int, mixed>>
      */
-    public function sendContentRangeStreamData(): array
+    public static function sendContentRangeStreamData(): array
     {
         return [
             ['Ignore this. ', 'Send this.', 10, ' Ignore this at end.'],

tests/phpunit.xml

@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" beStrictAboutCoversAnnotation="true" beStrictAboutOutputDuringTests="true" beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutTodoAnnotatedTests="true" bootstrap="bootstrap.php" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage includeUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">../lib/</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" beStrictAboutOutputDuringTests="true" beStrictAboutTestsThatDoNotTestAnything="true" failOnRisky="true" failOnWarning="true" bootstrap="bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" beStrictAboutCoverageMetadata="true">
   <testsuites>
     <testsuite name="Sabre_HTTP">
       <directory>HTTP/</directory>
@@ -13,4 +8,9 @@
   <php>
     <env name="BASEURL" value="http://localhost:8000"/>
   </php>
+  <source>
+    <include>
+      <directory suffix=".php">../lib/</directory>
+    </include>
+  </source>
 </phpunit>