From ab5d3aa015d4c66f0e82ab6aa1038cf2ac2ed905 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Wed, 18 May 2022 16:57:54 +0200 Subject: [PATCH] Inline WCFSetup::installFiles() `->unzipFiles()` basically consisted only of the call to `::installFiles()`, simplify the control flow by putting those three lines of code inline to make `->unzipFiles()` self-contained. --- .../install/files/lib/system/WCFSetup.class.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php index c71280276f..40819562af 100644 --- a/wcfsetup/install/files/lib/system/WCFSetup.class.php +++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php @@ -650,7 +650,9 @@ final class WCFSetup extends WCF ); } - static::installFiles(); + $fileHandler = new SetupFileHandler(); + new Installer(self::$directories['wcf'], SETUP_FILE, $fileHandler, 'install/files/'); + $fileHandler->dumpToFile(self::$directories['wcf'] . 'files.log'); return $this->gotoNextStep('configureDB'); } @@ -1349,14 +1351,4 @@ final class WCFSetup extends WCF ) ); } - - /** - * Installs the files of the tar archive. - */ - protected static function installFiles() - { - $fileHandler = new SetupFileHandler(); - new Installer(self::$directories['wcf'], SETUP_FILE, $fileHandler, 'install/files/'); - $fileHandler->dumpToFile(self::$directories['wcf'] . 'files.log'); - } } -- 2.20.1