build: upgrade PHPUnit

lstrojny · Mar 6, 2021 · 7ca083c · 7ca083c
1 parent aba599e
commit 7ca083c
Show file tree

Hide file tree

Showing 56 changed files with 208 additions and 161 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
+        php-versions: ['7.3', '7.4', '8.0', '8.1']
       fail-fast: false
     steps:
       - uses: actions/checkout@v1

diff --git a/.idea/functional-php.iml b/.idea/functional-php.iml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -18,9 +18,9 @@
         "php": "~7|~8"
     },
     "require-dev": {
-        "phpunit/phpunit": "~7",
         "squizlabs/php_codesniffer": "~3.0",
-        "friendsofphp/php-cs-fixer": "^2.14"
+        "friendsofphp/php-cs-fixer": "^2.14",
+        "phpunit/phpunit": "^9.5"
     },
     "autoload": {
         "psr-4": {"Functional\\": "src/Functional"},

diff --git a/tests/Functional/AbstractTestCase.php b/tests/Functional/AbstractTestCase.php
@@ -32,17 +32,16 @@ class AbstractTestCase extends TestCase
 
     private $functions = [];
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->functions = F\flatten(
             (array) (
-                func_num_args() > 0
-               ? func_get_arg(0)
-               : $this->getFunctionName()
+            func_num_args() > 0
+                ? func_get_arg(0)
+                : $this->getFunctionName()
             )
         );
 
-
         foreach ($this->functions as $function) {
             if (!function_exists($function)) {
                 $this->markTestSkipped(
@@ -111,6 +110,6 @@ private function getFunctionName()
             )
         );
 
-        return 'Functional\\' . $function;
+        return 'Functional\\'.$function;
     }
 }
diff --git a/tests/Functional/AverageTest.php b/tests/Functional/AverageTest.php
@@ -68,10 +68,10 @@ public function test()
         $this->assertSame(5, average($this->list));
         $this->assertSame(5, average($this->listIterator));
 
-        $this->assertEquals(0.833333333, average($this->hash2), '', 0.001);
-        $this->assertEquals(0.833333333, average($this->hashIterator2), '', 0.001);
-        $this->assertEquals(0.833333333, average($this->list2), '', 0.001);
-        $this->assertEquals(0.833333333, average($this->listIterator2), '', 0.001);
+        $this->assertEqualsWithDelta(0.833333333, average($this->hash2), 0.001);
+        $this->assertEqualsWithDelta(0.833333333, average($this->hashIterator2), 0.001);
+        $this->assertEqualsWithDelta(0.833333333, average($this->list2), 0.001);
+        $this->assertEqualsWithDelta(0.833333333, average($this->listIterator2), 0.001);
 
         $this->assertNull(average($this->hash3));
         $this->assertNull(average($this->hashIterator3));

diff --git a/tests/Functional/ButLastTest.php b/tests/Functional/ButLastTest.php
@@ -17,7 +17,7 @@
 
 class ButLastTest extends AbstractTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->list = [1, 2, 3, 4];

diff --git a/tests/Functional/ComposeTest.php b/tests/Functional/ComposeTest.php
@@ -14,7 +14,7 @@
 
 class ComposeTest extends AbstractTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }

diff --git a/tests/Functional/ConcatTest.php b/tests/Functional/ConcatTest.php
@@ -14,7 +14,7 @@
 
 class ConcatTest extends AbstractTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }

diff --git a/tests/Functional/DifferenceTest.php b/tests/Functional/DifferenceTest.php
@@ -16,7 +16,7 @@
 
 class DifferenceTest extends AbstractTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->intArray = [1 => 1, 2, "foo" => 3, 4];

diff --git a/tests/Functional/DropTest.php b/tests/Functional/DropTest.php
@@ -18,7 +18,7 @@
 
 class DropTest extends AbstractTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp('Functional\drop_first', 'Functional\drop_last');
         $this->list = ['value1', 'value2', 'value3', 'value4'];