Fix weak comparison between '0' and false

sebastianbergmann · Sep 14, 2022 · a6635b6 · a6635b6
1 parent 1071dfc
commit a6635b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/ScalarComparator.php b/src/ScalarComparator.php
@@ -51,7 +51,7 @@ public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = f
 
         // 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;
 

diff --git a/tests/ScalarComparatorTest.php b/tests/ScalarComparatorTest.php
@@ -46,6 +46,7 @@ public function acceptsSucceedsProvider()
             ['1', true],
             [1, true],
             [0, false],
+            ['0', false],
             [0.1, '0.1']
         ];
     }
@@ -77,6 +78,7 @@ public function assertEqualsSucceedsProvider()
             ['1', true],
             [1, true],
             [0, false],
+            ['0', false],
             [0.1, '0.1'],
             [false, null],
             [false, false],