From 7cb8532eb35ccd657e427a1a40f3fa1baed3c058 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Wed, 22 Sep 2021 12:37:07 +0200 Subject: [PATCH] Remove unnamespaced IPrintableException from install.php --- wcfsetup/install.php | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/wcfsetup/install.php b/wcfsetup/install.php index def1312747..d26d943a92 100644 --- a/wcfsetup/install.php +++ b/wcfsetup/install.php @@ -30,22 +30,7 @@ $neededFilesPattern = [ '!^install/files/lib/util/.*!', '!^install/lang/.*!', '!^install/packages/.*!']; - -// define needed functions and classes -/** @noinspection PhpMultipleClassesDeclarationsInOneFile */ -/** - * WCF::handleException() calls the show method on exceptions that implement this interface. - * - * @package com.woltlab.wcf - * @author Marcel Werk - */ -interface IPrintableException { - public function show(); -} -// define needed classes -// needed are: -// SystemException, PrintableException, BasicFileUtil, Tar, File, ZipFile /** @noinspection PhpMultipleClassesDeclarationsInOneFile */ /** * A SystemException is thrown when an unexpected error occurs. @@ -53,7 +38,7 @@ interface IPrintableException { * @package com.woltlab.wcf * @author Marcel Werk */ -class SystemException extends \Exception implements IPrintableException { +class SystemException extends \Exception { protected $description; protected $information = ''; protected $functions = ''; @@ -481,7 +466,7 @@ function handleException($e) { try { if (!($e instanceof \Exception)) throw $e; - if ($e instanceof IPrintableException || $e instanceof \wcf\system\exception\IPrintableException) { + if ($e instanceof SystemException || $e instanceof \wcf\system\exception\IPrintableException) { $e->show(); exit; } -- 2.20.1