From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Tue, 12 Jul 2022 15:13:53 +0000 (+0200)
Subject: Merge branch '5.5'
X-Git-Tag: 6.0.0_Alpha_1~1117
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=04b4f8e5bae688ff0f7ca626b4c9ee9c24aa70ae;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.5'
---

04b4f8e5bae688ff0f7ca626b4c9ee9c24aa70ae
diff --cc wcfsetup/install/files/lib/system/WCFSetup.class.php
index dea654fce6,a465aa7fa8..6291b49adf
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@@ -262,34 -264,31 +262,31 @@@ final class WCFSetup extends WC
              case 'selectSetupLanguage':
                  if (!self::$developerMode) {
                      $this->calcProgress(0);
 -                    $this->selectSetupLanguage();
 -                    break;
 +
 +                    return $this->selectSetupLanguage();
                  }
  
-             /** @noinspection PhpMissingBreakStatementInspection */
-             // no break
+                 // no break
              case 'showLicense':
                  if (!self::$developerMode) {
                      $this->calcProgress(1);
 -                    $this->showLicense();
 -                    break;
 +
 +                    return $this->showLicense();
                  }
  
-             /** @noinspection PhpMissingBreakStatementInspection */
-             // no break
+                 // no break
              case 'showSystemRequirements':
                  if (!self::$developerMode) {
                      $this->calcProgress(2);
 -                    $this->showSystemRequirements();
 -                    break;
 +
 +                    return $this->showSystemRequirements();
                  }
  
-             // no break
+                 // no break
              case 'configureDirectories':
                  $this->calcProgress(3);
 -                $this->configureDirectories();
 -                break;
 +
 +                return $this->configureDirectories();
  
              case 'unzipFiles':
                  $this->calcProgress(4);
@@@ -739,9 -729,8 +735,8 @@@
  
                              break;
  
-                         // work-around for older MySQL versions that don't know utf8mb4
-                         case 1115:
+                         case 1115: // work-around for older MySQL versions that don't know utf8mb4
 -                            throw new SystemException("Insufficient MySQL version. Version '5.7.31' or greater is needed.");
 +                            throw new SystemException("Insufficient MySQL version. Version '8.0.29' or greater is needed.");
                              break;
  
                          default: