Update test suite and remove legacy PHPUnit workarounds

WyriHaximus-labs · May 15, 2024 · 1321766 · 1321766
1 parent 777551c
commit 1321766
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 96 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "php": ">=7.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.6 || ^5.7"
+        "phpunit/phpunit": "^9.6 || ^7.5"
     },
     "suggest": {
         "ext-pcntl": "For signal handling support when using the StreamSelectLoop"

diff --git a/phpunit.xml.legacy b/phpunit.xml.legacy
@@ -2,7 +2,7 @@
 
 <!-- PHPUnit configuration file with old format for legacy PHPUnit -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/5.7/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true">
     <testsuites>

diff --git a/tests/ExtUvLoopTest.php b/tests/ExtUvLoopTest.php
@@ -45,51 +45,49 @@ public function intervalProvider()
         $tenMillionsIntMax = PHP_INT_MAX + 10000000;
         $tenThousandsTimesIntMax = PHP_INT_MAX * 1000;
 
-        return [
-            [
-                $oversizeInterval,
-                "Interval overflow, value must be lower than '{$maxValue}', but '{$oversizeInterval}' passed."
-            ],
-            [
-                $oneMaxValue,
-                "Interval overflow, value must be lower than '{$maxValue}', but '{$oneMaxValue}' passed.",
-            ],
-            [
-                $tenMaxValue,
-                "Interval overflow, value must be lower than '{$maxValue}', but '{$tenMaxValue}' passed.",
-            ],
-            [
-                $tenMillionsMaxValue,
-                "Interval overflow, value must be lower than '{$maxValue}', but '{$tenMillionsMaxValue}' passed.",
-            ],
-            [
-                $intMax,
-                "Interval overflow, value must be lower than '{$maxValue}', but '{$intMax}' passed.",
-            ],
-            [
-                $oneIntMax,
-                "Interval overflow, value must be lower than '{$maxValue}', but '{$oneIntMax}' passed.",
-            ],
-            [
-                $tenIntMax,
-                "Interval overflow, value must be lower than '{$maxValue}', but '{$tenIntMax}' passed.",
-            ],
-            [
-                $oneHundredIntMax,
-                "Interval overflow, value must be lower than '{$maxValue}', but '{$oneHundredIntMax}' passed.",
-            ],
-            [
-                $oneThousandIntMax,
-                "Interval overflow, value must be lower than '{$maxValue}', but '{$oneThousandIntMax}' passed.",
-            ],
-            [
-                $tenMillionsIntMax,
-                "Interval overflow, value must be lower than '{$maxValue}', but '{$tenMillionsIntMax}' passed.",
-            ],
-            [
-                $tenThousandsTimesIntMax,
-                "Interval overflow, value must be lower than '{$maxValue}', but '{$tenThousandsTimesIntMax}' passed.",
-            ],
+        yield [
+            $oversizeInterval,
+            "Interval overflow, value must be lower than '{$maxValue}', but '{$oversizeInterval}' passed."
+        ];
+        yield [
+            $oneMaxValue,
+            "Interval overflow, value must be lower than '{$maxValue}', but '{$oneMaxValue}' passed.",
+        ];
+        yield [
+            $tenMaxValue,
+            "Interval overflow, value must be lower than '{$maxValue}', but '{$tenMaxValue}' passed.",
+        ];
+        yield [
+            $tenMillionsMaxValue,
+            "Interval overflow, value must be lower than '{$maxValue}', but '{$tenMillionsMaxValue}' passed.",
+        ];
+        yield [
+            $intMax,
+            "Interval overflow, value must be lower than '{$maxValue}', but '{$intMax}' passed.",
+        ];
+        yield [
+            $oneIntMax,
+            "Interval overflow, value must be lower than '{$maxValue}', but '{$oneIntMax}' passed.",
+        ];
+        yield [
+            $tenIntMax,
+            "Interval overflow, value must be lower than '{$maxValue}', but '{$tenIntMax}' passed.",
+        ];
+        yield [
+            $oneHundredIntMax,
+            "Interval overflow, value must be lower than '{$maxValue}', but '{$oneHundredIntMax}' passed.",
+        ];
+        yield [
+            $oneThousandIntMax,
+            "Interval overflow, value must be lower than '{$maxValue}', but '{$oneThousandIntMax}' passed.",
+        ];
+        yield [
+            $tenMillionsIntMax,
+            "Interval overflow, value must be lower than '{$maxValue}', but '{$tenMillionsIntMax}' passed.",
+        ];
+        yield [
+            $tenThousandsTimesIntMax,
+            "Interval overflow, value must be lower than '{$maxValue}', but '{$tenThousandsTimesIntMax}' passed.",
         ];
     }
 }