From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 9 Jan 2025 16:26:25 +0000 (+0100)
Subject: Raise the supported PHP version to 8.4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5037b3e37cf4cb9f313fae1b74676ccfd824a645;p=GitHub%2FWoltLab%2FWCF.git

Raise the supported PHP version to 8.4
---

diff --git a/wcfsetup/install/files/lib/acp/form/PackageEnableUpgradeOverrideForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageEnableUpgradeOverrideForm.class.php
index 28ade0d877..8549a1f1b2 100644
--- a/wcfsetup/install/files/lib/acp/form/PackageEnableUpgradeOverrideForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PackageEnableUpgradeOverrideForm.class.php
@@ -134,20 +134,20 @@ final class PackageEnableUpgradeOverrideForm extends AbstractFormBuilderForm
 
     private function checkMaximumPhpVersion(): ?array
     {
-        // Maximum: PHP 8.3.x
-        if (\PHP_VERSION_ID < 80399) {
+        // Maximum: PHP 8.4.x
+        if (\PHP_VERSION_ID < 80499) {
             return null;
         }
 
         if (WCF::getLanguage()->getFixedLanguageCode() === 'de') {
             return [
                 'title' => 'Inkompatible PHP-Version',
-                'description' => 'Es wird nur PHP 8.1, 8.2 oder 8.3 unterstützt.',
+                'description' => 'Es wird nur PHP 8.1, 8.2, 8.3 oder 8.4 unterstützt.',
             ];
         } else {
             return [
                 'title' => 'Incompatible PHP version',
-                'description' => 'Only PHP 8.1, 8.2 or 8.3 are supported.',
+                'description' => 'Only PHP 8.1, 8.2, 8.3 or 8.4 are supported.',
             ];
         }
     }
diff --git a/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php b/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php
index 7313031d73..b358321503 100644
--- a/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php
@@ -82,7 +82,7 @@ class SystemCheckPage extends AbstractPage
         'minimum' => '8.1.2',
         'deprecated' => [],
         'sufficient' => ['8.1'],
-        'recommended' => ['8.2', '8.3'],
+        'recommended' => ['8.2', '8.3', '8.4'],
     ];
 
     public $foreignKeys = [
diff --git a/wcfsetup/install/files/lib/http/middleware/CheckSystemEnvironment.class.php b/wcfsetup/install/files/lib/http/middleware/CheckSystemEnvironment.class.php
index e9681f4719..4fbdcb0c4a 100644
--- a/wcfsetup/install/files/lib/http/middleware/CheckSystemEnvironment.class.php
+++ b/wcfsetup/install/files/lib/http/middleware/CheckSystemEnvironment.class.php
@@ -27,7 +27,7 @@ final class CheckSystemEnvironment implements MiddlewareInterface
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         if (!RequestHandler::getInstance()->isACPRequest()) {
-            if (!(80100 <= \PHP_VERSION_ID && \PHP_VERSION_ID <= 80399)) {
+            if (!(80100 <= \PHP_VERSION_ID && \PHP_VERSION_ID <= 80499)) {
                 return new HtmlResponse(
                     (new HtmlErrorRenderer())->render(
                         WCF::getLanguage()->getDynamicVariable('wcf.global.error.title'),
diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php
index 73c23af7ba..c729d390c4 100644
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@ -364,7 +364,7 @@ final class WCFSetup extends WCF
     protected function showSystemRequirements(): ResponseInterface
     {
         $phpVersionLowerBound = '8.1.2';
-        $phpVersionUpperBound = '8.3.x';
+        $phpVersionUpperBound = '8.4.x';
         $system = [];
 
         // php version
diff --git a/wcfsetup/install/files/lib/system/acp/dashboard/box/StatusMessageAcpDashboardBox.class.php b/wcfsetup/install/files/lib/system/acp/dashboard/box/StatusMessageAcpDashboardBox.class.php
index d937de91af..3c766672e2 100644
--- a/wcfsetup/install/files/lib/system/acp/dashboard/box/StatusMessageAcpDashboardBox.class.php
+++ b/wcfsetup/install/files/lib/system/acp/dashboard/box/StatusMessageAcpDashboardBox.class.php
@@ -78,7 +78,7 @@ final class StatusMessageAcpDashboardBox extends AbstractAcpDashboardBox
     private function getBasicMessages(): array
     {
         $messages = [];
-        if (!(80100 <= PHP_VERSION_ID && PHP_VERSION_ID <= 80399)) {
+        if (!(80100 <= PHP_VERSION_ID && PHP_VERSION_ID <= 80499)) {
             $messages[] = new StatusMessage(
                 StatusMessageType::Error,
                 WCF::getLanguage()->getDynamicVariable('wcf.global.incompatiblePhpVersion')
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 0e1770a68b..78ebcb56c7 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -4035,7 +4035,7 @@ Dateianhänge:
 		<item name="wcf.global.rss.accessToken.info"><![CDATA[Der Link zum anonymen RSS-Feed enthält nur Inhalte, auf die Gäste Zugriff haben. Der Link zum personalisierten RSS-Feed enthält alle Inhalte, auf die {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} Zugriff {if LANGUAGE_USE_INFORMAL_VARIANT}hast{else}haben{/if}.]]></item>
 		<item name="wcf.global.rss.withAccessToken"><![CDATA[Personalisierter RSS-Feed]]></item>
 		<item name="wcf.global.rss.withoutAccessToken"><![CDATA[Anonymer RSS-Feed]]></item>
-		<item name="wcf.global.incompatiblePhpVersion"><![CDATA[Fehlerhafte Server-Konfiguration: Die eingesetzte Version von „PHP” ist nicht kompatibel, ein Betrieb ist nicht möglich. Es wird mindestens PHP in Version 8.1 benötigt, unterstützt werden die Versionen bis PHP 8.3. Für den Einsatz höherer PHP-Versionen muss die Software auf eine aktuelle Version umgestellt werden.]]></item>
+		<item name="wcf.global.incompatiblePhpVersion"><![CDATA[Fehlerhafte Server-Konfiguration: Die eingesetzte Version von „PHP” ist nicht kompatibel, ein Betrieb ist nicht möglich. Es wird mindestens PHP in Version 8.1 benötigt, unterstützt werden die Versionen bis PHP 8.4. Für den Einsatz höherer PHP-Versionen muss die Software auf eine aktuelle Version umgestellt werden.]]></item>
 	</category>
 	<category name="wcf.global.form">
 		<item name="wcf.global.form.boolean.no"><![CDATA[Nein]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index c558c4a040..bc3d9dbeb4 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3981,7 +3981,7 @@ Attachments:
 		<item name="wcf.global.rss.accessToken.info"><![CDATA[The link to the anonymous RSS feed only contains contents that guests can access. The link to the personalized RSS feed contains all contents that you can access.]]></item>
 		<item name="wcf.global.rss.withAccessToken"><![CDATA[Personalized RSS Feed]]></item>
 		<item name="wcf.global.rss.withoutAccessToken"><![CDATA[Anonymous RSS Feed]]></item>
-		<item name="wcf.global.incompatiblePhpVersion"><![CDATA[Bad server configuration: The configured version of “PHP” is not compatible, operation is not possible. At least PHP in version 8.1 is required, versions up to PHP 8.3 are supported. For the use of higher PHP versions the software must be updated to a current version.]]></item>
+		<item name="wcf.global.incompatiblePhpVersion"><![CDATA[Bad server configuration: The configured version of “PHP” is not compatible, operation is not possible. At least PHP in version 8.1 is required, versions up to PHP 8.4 are supported. For the use of higher PHP versions the software must be updated to a current version.]]></item>
 	</category>
 	<category name="wcf.global.form">
 		<item name="wcf.global.form.boolean.no"><![CDATA[No]]></item>
diff --git a/wcfsetup/test.php b/wcfsetup/test.php
index 09ce8eaa8e..2fc2038508 100644
--- a/wcfsetup/test.php
+++ b/wcfsetup/test.php
@@ -11,7 +11,7 @@ if (isset($_GET['language']) && \in_array($_GET['language'], ['de', 'en'])) {
     $language = $_GET['language'];
 }
 
-const WSC_SRT_VERSION = '6.1.0';
+const WSC_SRT_VERSION = '6.1.1';
 $requiredExtensions = [
     'ctype',
     'dom',
@@ -26,7 +26,7 @@ $requiredExtensions = [
     'zlib',
 ];
 $phpVersionLowerBound = '8.1.2';
-$phpVersionUpperBound = '8.3.x';
+$phpVersionUpperBound = '8.4.x';
 $phrases = [
     'php_requirements' => [
         'de' => 'PHP',