Merge pull request #15861 from JMAConsulting/core-1398

[civicrm-core.git] / CRM / Core / Exception.php

diff --git a/CRM/Core/Exception.php b/CRM/Core/Exception.php
index 8cecf32a514967950893ea938b80fd6b02aabddf..b099c0a07ab3137aa19bd226ea5231f568b2a80b 100644 (file)
--- a/CRM/Core/Exception.php
+++ b/CRM/Core/Exception.php
@@ -1,27 +1,11 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
@@ -38,7 +22,7 @@
  *   Extra params to return. eg an extra array of ids. It is not mandatory, but can help the computer using the api. Keep in mind the api consumer isn't to be trusted. eg. the database password is NOT a good extra data.
  */
 class CRM_Core_Exception extends PEAR_Exception {
-  private $errorData = array();
+  private $errorData = [];
 
   /**
    * Class constructor.
@@ -48,9 +32,9 @@ class CRM_Core_Exception extends PEAR_Exception {
    * @param array $errorData
    * @param null $previous
    */
-  public function __construct($message, $error_code = 0, $errorData = array(), $previous = NULL) {
-    parent::__construct(ts($message));
-    $this->errorData = $errorData + array('error_code' => $error_code);
+  public function __construct($message, $error_code = 0, $errorData = [], $previous = NULL) {
+    parent::__construct($message);
+    $this->errorData = $errorData + ['error_code' => $error_code];
   }
 
   /**