Merge branch '5.5'
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 12 Jul 2022 15:13:53 +0000 (17:13 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 12 Jul 2022 15:13:53 +0000 (17:13 +0200)
1  2 
com.woltlab.wcf/fileDelete.xml
wcfsetup/install/files/lib/data/package/PackageAction.class.php
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/system/WCFSetup.class.php
wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
wcfsetup/install/files/lib/util/CronjobUtil.class.php
wcfsetup/install/files/lib/util/ImageUtil.class.php

Simple merge
index dea654fce643a565160f3350c9ab2940f29818f9,a465aa7fa8489f5d170c49c20032433bad6d57ea..6291b49adf13ad884966d68a7372e7c49fc518cf
@@@ -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);
  
                              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: