- Merge [1711].

sebastianbergmann · Nov 24, 2007 · 766300f · 766300f
1 parent 22e70ad
commit 766300f
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/PHPUnit/Framework/TestCase.php b/PHPUnit/Framework/TestCase.php
@@ -258,9 +258,7 @@ public function getExpectedException()
      */
     public function setExpectedException($exceptionName)
     {
-        if ((is_string($exceptionName) && class_exists($exceptionName)) || $exceptionName === NULL) {
-            $this->expectedException = $exceptionName;
-        }
+        $this->expectedException = $exceptionName;
     }
 
     /**
@@ -420,7 +418,7 @@ protected function runTest()
         }
 
         catch (Exception $e) {
-            if ($this->expectedException !== NULL &&
+            if (is_string($this->expectedException) &&
                 $e instanceof $this->expectedException) {
                 return;
             } else {