Merge pull request php-annotations#104 from benesch/fail-php-exceptions

Fail test cases when a PHP error occurs after a successful check

Author: Alexander Obuhovich

test/lib/xTest.php

@@ -120,10 +120,6 @@ public function run(xTestRunner $testRunner)
 
                 }
 
-                if (is_null($this->result) && !(($exception instanceof xTestException) && $exception->getCode() == xTestException::FAIL)) {
-                    $this->result = (string)$exception;
-                }
-
                 $count++;
 
                 if ($this->result === true) {
@@ -155,6 +151,9 @@ public function run(xTestRunner $testRunner)
     private function assertException(\Exception $e = null)
     {
         if (!is_string($this->expectedException)) {
+            if ($e && !(($e instanceof xTestException) && $e->getCode() == xTestException::FAIL)) {
+                $this->result = (string)$e;
+            }
             return;
         }