Upgrade PHPUnit comparators

Author: GromNaN

tests/Comparator/Int64Comparator.php

@@ -5,13 +5,14 @@
 use MongoDB\BSON\Int64;
 use SebastianBergmann\Comparator\Comparator;
 use SebastianBergmann\Comparator\ComparisonFailure;
+use SebastianBergmann\Exporter\Exporter;
 
 use function is_numeric;
 use function sprintf;
 
 class Int64Comparator extends Comparator
 {
-    public function accepts($expected, $actual)
+    public function accepts($expected, $actual): bool
     {
         // Only compare if either value is an Int64 and the other value is numeric
         return ($expected instanceof Int64 && $this->isComparable($actual))
@@ -24,16 +25,17 @@ public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = f
             return;
         }
 
+        $exporter = new Exporter();
+
         throw new ComparisonFailure(
             $expected,
             $actual,
             '',
             '',
-            false,
             sprintf(
                 'Failed asserting that %s matches expected %s.',
-                $this->exporter->export($actual),
-                $this->exporter->export($expected),
+                $exporter->export($actual),
+                $exporter->export($expected),
             ),
         );
     }

tests/Comparator/ServerComparator.php

@@ -10,7 +10,7 @@
 
 class ServerComparator extends Comparator
 {
-    public function accepts($expected, $actual)
+    public function accepts($expected, $actual): bool
     {
         return $expected instanceof Server && $actual instanceof Server;
     }
@@ -26,7 +26,6 @@ public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = f
             $actual,
             '',
             '',
-            false,
             sprintf(
                 'Failed asserting that Server("%s:%d") matches expected Server("%s:%d").',
                 $actual->getHost(),