Merge pull request #19323 from seamuslee001/default_handler_exception
authorEileen McNaughton <emcnaughton@wikimedia.org>
Mon, 11 Jan 2021 21:40:37 +0000 (10:40 +1300)
committerGitHub <noreply@github.com>
Mon, 11 Jan 2021 21:40:37 +0000 (10:40 +1300)
REF Update CiviCRM default PEAR Error handling to be exception rather…

1  2 
CRM/Admin/Form/Setting/Smtp.php
CRM/Core/Config.php
Civi/Test/CiviTestListener.php
Civi/Test/CiviTestListenerPHPUnit7.php
Civi/Test/Legacy/CiviTestListener.php

Simple merge
index 6fe7137e336d107047c775868a73d751830c7229,7f4bdd02685586a8d4e6fa6c11364603d70f9f7c..b11fc554e2b022414d5e04a64da7396c018ce26d
@@@ -86,9 -86,13 +86,9 @@@ class CRM_Core_Config extends CRM_Core_
     */
    public static function &singleton($loadFromDB = TRUE, $force = FALSE) {
      if (self::$_singleton === NULL || $force) {
-       $GLOBALS['civicrm_default_error_scope'] = CRM_Core_TemporaryErrorScope::create(['CRM_Core_Error', 'handle']);
+       $GLOBALS['civicrm_default_error_scope'] = CRM_Core_TemporaryErrorScope::create(['CRM_Core_Error', 'exceptionHandler'], 1);
        $errorScope = CRM_Core_TemporaryErrorScope::create(['CRM_Core_Error', 'simpleHandler']);
  
 -      if (defined('E_DEPRECATED')) {
 -        error_reporting(error_reporting() & ~E_DEPRECATED);
 -      }
 -
        self::$_singleton = new CRM_Core_Config();
        \Civi\Core\Container::boot($loadFromDB);
        if ($loadFromDB && self::$_singleton->dsn) {
Simple merge
Simple merge