Merge pull request #19323 from seamuslee001/default_handler_exception

[civicrm-core.git] / Civi / Test / Legacy / CiviTestListener.php

diff --git a/Civi/Test/Legacy/CiviTestListener.php b/Civi/Test/Legacy/CiviTestListener.php
index 015f1af208e6ca78044b8c75f0b6bccceabb96e1..d7e3a1ad9d1c4fbb947cce9f4834037223481702 100644 (file)
--- a/Civi/Test/Legacy/CiviTestListener.php
+++ b/Civi/Test/Legacy/CiviTestListener.php
@@ -15,10 +15,6 @@ namespace Civi\Test\Legacy;
  * @see HookInterface
  */
 class CiviTestListener extends \PHPUnit_Framework_BaseTestListener {
-  /**
-   * @var \CRM_Core_TemporaryErrorScope
-   */
-  private $errorScope;
 
   /**
    * @var array
@@ -28,7 +24,7 @@ class CiviTestListener extends \PHPUnit_Framework_BaseTestListener {
   private $cache = [];
 
   /**
-   * @var \CRM_Core_Transaction|NULL
+   * @var \CRM_Core_Transaction|null
    */
   private $tx;
 
@@ -45,7 +41,6 @@ class CiviTestListener extends \PHPUnit_Framework_BaseTestListener {
   public function startTest(\PHPUnit_Framework_Test $test) {
     if ($this->isCiviTest($test)) {
       error_reporting(E_ALL);
-      $this->errorScope = \CRM_Core_TemporaryErrorScope::useException();
     }
 
     if ($test instanceof \Civi\Test\HeadlessInterface) {
@@ -74,6 +69,7 @@ class CiviTestListener extends \PHPUnit_Framework_BaseTestListener {
     if ($test instanceof \Civi\Test\HookInterface) {
       \CRM_Utils_Hook::singleton()->reset();
     }
+    \CRM_Utils_Time::resetTime();
     if ($this->isCiviTest($test)) {
       error_reporting(E_ALL & ~E_NOTICE);
       $this->errorScope = NULL;