test: fix/refactor tests for newer php and phpunit

Author: adhocore

phpunit.xml.dist

@@ -8,7 +8,6 @@
   convertWarningsToExceptions="true"
   processIsolation="false"
   stopOnFailure="false"
-  syntaxCheck="false"
   bootstrap="tests/bootstrap.php"
 >
   <testsuites>

tests/HigherOrderMessageTest.php

@@ -39,7 +39,7 @@ class HigherOrderMessageTest extends TestCase
      */
     protected $hom2;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/UnderscoreArrayTest.php

@@ -68,9 +68,7 @@ public function test_unique_uniq()
 
         $this->assertSame(
             ['a', '', 3 => 1, 5 => 0, 7 => 'b', 8 => 3, 9 => 2],
-            underscore($array)->uniq(function ($i) {
-                return $i;
-            })->get(),
+            underscore($array)->uniq(fn ($i) => $i)->get(),
             'uniq'
         );
     }
@@ -130,7 +128,7 @@ public function test_object()
         $array = [[1, 2], 'a' => 3, 'b' => 'B'];
 
         foreach (underscore($array)->object() as $index => $value) {
-            $this->assertInternalType('object', $value);
+            $this->assertTrue(is_object($value));
             $this->assertSame($index, $value->index);
             $this->assertSame($array[$index], $value->value);
         }

tests/UnderscoreBaseTest.php

@@ -24,6 +24,7 @@ public function toArray()
 
 class Json implements \JsonSerializable
 {
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return ['a' => 1, 'b' => 2, 'c' => 3];
@@ -74,7 +75,7 @@ public function test_underscore()
 
     public function test_now()
     {
-        $this->assertInternalType('float', _::_()->now());
+        $this->assertNotEmpty(_::_()->now());
     }
 
     public function test_keys_values()
@@ -126,10 +127,6 @@ public function test_clone_tap()
         $this->assertSame($main, $tap, 'hard equal');
     }
 
-    /**
-     * @expectedException \Ahc\Underscore\UnderscoreException
-     * @expectedExceptionMessage The mixin with name 'notMixedIn' is not defined
-     */
     public function test_mixin()
     {
         _::mixin('double', function () {
@@ -140,9 +137,12 @@ public function test_mixin()
 
         $und = underscore([10, 20, 30]);
 
-        $this->assertInternalType('callable', [$und, 'double']);
+        $this->assertIsCallable([$und, 'double']);
         $this->assertSame([20, 40, 60], $und->double()->toArray());
 
+        $this->expectException(\Ahc\Underscore\UnderscoreException::class);
+        $this->expectExceptionMessage("The mixin with name 'notMixedIn' is not defined");
+
         $und->notMixedIn();
     }
 
@@ -168,12 +168,11 @@ public function test_hom()
         $this->assertSame([1 => 64, 3 => 36, 5 => 16, 7 => 4, 9 => 0], $sq);
     }
 
-    /**
-     * @expectedException \Ahc\Underscore\UnderscoreException
-     * @expectedExceptionMessage The 'anon' is not defined
-     */
     public function test_hom_throws()
     {
+        $this->expectException(\Ahc\Underscore\UnderscoreException::class);
+        $this->expectExceptionMessage("The 'anon' is not defined");
+
         underscore()->anon->value();
     }
 }