Inline WCFSetup::installFiles()
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 18 May 2022 14:57:54 +0000 (16:57 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 18 May 2022 15:53:27 +0000 (17:53 +0200)
`->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.

wcfsetup/install/files/lib/system/WCFSetup.class.php

index c71280276f8c27514a4610508dffe0d1af8f6f5b..40819562afcf1ba85dc2fb9e0b9d85971aa0f4f6 100644 (file)
@@ -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');
-    }
 }