- Merge [999].

sebastianbergmann · Aug 7, 2007 · db09aee · db09aee
1 parent 25dde82
commit db09aee
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/PHPUnit/Framework/Assert.php b/PHPUnit/Framework/Assert.php
@@ -822,9 +822,13 @@ public static function assertObjectNotHasAttribute($attributeName, $object, $mes
      */
     public static function assertSame($expected, $actual, $message = '')
     {
-        $constraint = new PHPUnit_Framework_Constraint_IsIdentical($expected);
+        if (is_bool($expected) && is_bool($actual)) {
+            self::assertEquals($expected, $actual);
+        } else {
+            $constraint = new PHPUnit_Framework_Constraint_IsIdentical($expected);
 
-        self::assertThat($actual, $constraint, $message);
+            self::assertThat($actual, $constraint, $message);
+        }
     }
 
     /**
@@ -860,11 +864,15 @@ public static function assertAttributeSame($expected, $actualAttributeName, $act
      */
     public static function assertNotSame($expected, $actual, $message = '')
     {
-        $constraint = new PHPUnit_Framework_Constraint_Not(
-          new PHPUnit_Framework_Constraint_IsIdentical($expected)
-        );
+        if (is_bool($expected) && is_bool($actual)) {
+            self::assertNotEquals($expected, $actual);
+        } else {
+            $constraint = new PHPUnit_Framework_Constraint_Not(
+              new PHPUnit_Framework_Constraint_IsIdentical($expected)
+            );
 
-        self::assertThat($actual, $constraint, $message);
+            self::assertThat($actual, $constraint, $message);
+        }
     }
 
     /**