From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Wed, 18 May 2022 14:57:54 +0000 (+0200)
Subject: Inline WCFSetup::installFiles()
X-Git-Tag: 6.0.0_Alpha_1~1276^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ab5d3aa015d4c66f0e82ab6aa1038cf2ac2ed905;p=GitHub%2FWoltLab%2FWCF.git

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.
---

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');
-    }
 }