From 5ea5d3007563f76a77efbfb66936315441922542 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Thu, 6 Aug 2020 20:03:44 +0300 Subject: [PATCH] [EXCEPTIONS] Inherit the Previous Exception parameter --- lib/exceptions/clientexception.php | 63 ++++++++++++++-------------- lib/exceptions/serverexception.php | 66 +++++++++++++++--------------- 2 files changed, 64 insertions(+), 65 deletions(-) diff --git a/lib/exceptions/clientexception.php b/lib/exceptions/clientexception.php index a74cab4a5f..274e37a203 100644 --- a/lib/exceptions/clientexception.php +++ b/lib/exceptions/clientexception.php @@ -1,55 +1,54 @@ . + /** - * StatusNet, the distributed open-source microblogging tool - * - * class for a client exception (user error) - * - * PHP version 5 - * - * LICENCE: This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program 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. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . + * Class for a client exception (user error) * * @category Exception - * @package StatusNet + * @package GNUsocial * @author Evan Prodromou * @copyright 2008 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} +defined('GNUSOCIAL') || die(); /** * Class for client exceptions * * Subclass of PHP Exception for user errors. * - * @category Exception - * @package StatusNet - * @author Evan Prodromou - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ + * @category Exception + * @package GNUsocial + * @author Evan Prodromou + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ class ClientException extends Exception { - public function __construct($message = null, $code = 400) { - parent::__construct($message, $code); + public function __construct( + string $message = '', + int $code = 500, + Throwable $previous = null + ) { + parent::__construct($message, $code, $previous); } // custom string representation of object - public function __toString() { + public function __toString() + { return __CLASS__ . ": [{$this->code}]: {$this->message}\n"; } } diff --git a/lib/exceptions/serverexception.php b/lib/exceptions/serverexception.php index 0f4c509957..74482e64a5 100644 --- a/lib/exceptions/serverexception.php +++ b/lib/exceptions/serverexception.php @@ -1,55 +1,55 @@ . + /** - * StatusNet, the distributed open-source microblogging tool - * - * class for a server exception (user error) - * - * PHP version 5 - * - * LICENCE: This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program 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. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . + * Class for a server exception (user error) * * @category Exception - * @package StatusNet + * @package GNUsocial * @author Evan Prodromou * @copyright 2008-2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} +defined('GNUSOCIAL') || die(); /** * Class for server exceptions * - * Subclass of PHP Exception for server errors. The user typically can't fix these. + * Subclass of PHP Exception for server errors. + * The user typically can't fix these. * - * @category Exception - * @package StatusNet - * @author Evan Prodromou - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ + * @category Exception + * @package GNUsocial + * @author Evan Prodromou + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ class ServerException extends Exception { - public function __construct($message = "", $code = 500) { - parent::__construct($message, $code); + public function __construct( + string $message = '', + int $code = 500, + Throwable $previous = null + ) { + parent::__construct($message, $code, $previous); } - public function __toString() { + public function __toString() + { return __CLASS__ . ": [{$this->code}]: {$this->message}\n"; } }