Upgrade framework

vendor/sebastian/comparator/src/ScalarComparator.php

@@ -1,15 +1,22 @@
-<?php
+<?php declare(strict_types=1);
 /*
- * This file is part of the Comparator package.
+ * This file is part of sebastian/comparator.
  *
  * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace SebastianBergmann\Comparator;
 
+use function is_bool;
+use function is_object;
+use function is_scalar;
+use function is_string;
+use function method_exists;
+use function sprintf;
+use function strtolower;
+
 /**
  * Compares scalar or NULL values for equality.
  */
@@ -18,9 +25,11 @@ class ScalarComparator extends Comparator
     /**
      * Returns whether the comparator can compare two values.
      *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
+     * @param mixed $expected The first value to compare
+     * @param mixed $actual   The second value to compare
+     *
      * @return bool
+     *
      * @since  Method available since Release 3.6.0
      */
     public function accepts($expected, $actual)
@@ -43,14 +52,14 @@ class ScalarComparator extends Comparator
      *
      * @throws ComparisonFailure
      */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)/*: void*/
     {
         $expectedToCompare = $expected;
         $actualToCompare   = $actual;
 
         // always compare as strings to avoid strange behaviour
         // otherwise 0 == 'Foobar'
-        if (is_string($expected) || is_string($actual)) {
+        if ((is_string($expected) && !is_bool($actual)) || (is_string($actual) && !is_bool($expected))) {
             $expectedToCompare = (string) $expectedToCompare;
             $actualToCompare   = (string) $actualToCompare;
 
@@ -60,18 +69,18 @@ class ScalarComparator extends Comparator
             }
         }
 
-        if ($expectedToCompare != $actualToCompare) {
-            if (is_string($expected) && is_string($actual)) {
-                throw new ComparisonFailure(
-                    $expected,
-                    $actual,
-                    $this->exporter->export($expected),
-                    $this->exporter->export($actual),
-                    false,
-                    'Failed asserting that two strings are equal.'
-                );
-            }
+        if ($expectedToCompare !== $actualToCompare && is_string($expected) && is_string($actual)) {
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                $this->exporter->export($expected),
+                $this->exporter->export($actual),
+                false,
+                'Failed asserting that two strings are equal.'
+            );
+        }
 
+        if ($expectedToCompare != $actualToCompare) {
             throw new ComparisonFailure(
                 $expected,
                 $actual,