From 3f25039e2a4537375394b41c0f06c97369ed2dae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Mon, 8 Aug 2022 12:32:09 +0200 Subject: [PATCH] Adjust references to 5.6 to 6.0 --- ...ab.wcf_5.6.php => update_com.woltlab.wcf_6.0.php} | 2 +- ...php => update_com.woltlab.wcf_6.0_checkCache.php} | 0 ...com.woltlab.wcf_6.0_checkForMultiDomainSetup.php} | 0 ..._com.woltlab.wcf_6.0_checkSystemRequirements.php} | 0 ...pdate_com.woltlab.wcf_6.0_checkUpdateServers.php} | 0 wcfsetup/install/files/lib/core.functions.php | 2 +- .../update/server/PackageUpdateServer.class.php | 4 ++-- wcfsetup/install/files/lib/data/page/Page.class.php | 2 +- .../lib/http/LegacyPlaceholderResponse.class.php | 2 +- wcfsetup/install/files/lib/http/Pipeline.class.php | 2 +- .../lib/http/RequestHandlerMiddleware.class.php | 2 +- .../http/middleware/AddAcpSecurityHeaders.class.php | 2 +- .../CheckForEnterpriseNonOwnerAccess.class.php | 2 +- .../CheckForExpiredAppEvaluation.class.php | 2 +- .../http/middleware/CheckForOfflineMode.class.php | 2 +- .../http/middleware/CheckSystemEnvironment.class.php | 2 +- .../middleware/EnforceCacheControlPrivate.class.php | 2 +- .../http/middleware/EnforceFrameOptions.class.php | 2 +- wcfsetup/install/files/lib/system/WCF.class.php | 10 +++++----- .../system/application/ApplicationHandler.class.php | 2 +- .../cache/builder/RoutingCacheBuilder.class.php | 2 +- .../install/files/lib/system/io/RemoteFile.class.php | 4 ++-- .../lib/system/request/RequestHandler.class.php | 2 +- .../lib/system/session/SessionHandler.class.php | 2 +- .../lib/system/template/TemplateEngine.class.php | 2 +- .../install/files/lib/util/CronjobUtil.class.php | 2 +- wcfsetup/install/files/lib/util/Diff.class.php | 12 ++++++------ wcfsetup/install/files/lib/util/StringUtil.class.php | 2 +- 28 files changed, 35 insertions(+), 35 deletions(-) rename wcfsetup/install/files/acp/database/{update_com.woltlab.wcf_5.6.php => update_com.woltlab.wcf_6.0.php} (97%) rename wcfsetup/install/files/acp/{update_com.woltlab.wcf_5.6_checkCache.php => update_com.woltlab.wcf_6.0_checkCache.php} (100%) rename wcfsetup/install/files/acp/{update_com.woltlab.wcf_5.6_checkForMultiDomainSetup.php => update_com.woltlab.wcf_6.0_checkForMultiDomainSetup.php} (100%) rename wcfsetup/install/files/acp/{update_com.woltlab.wcf_5.6_checkSystemRequirements.php => update_com.woltlab.wcf_6.0_checkSystemRequirements.php} (100%) rename wcfsetup/install/files/acp/{update_com.woltlab.wcf_5.6_checkUpdateServers.php => update_com.woltlab.wcf_6.0_checkUpdateServers.php} (100%) diff --git a/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_5.6.php b/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.0.php similarity index 97% rename from wcfsetup/install/files/acp/database/update_com.woltlab.wcf_5.6.php rename to wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.0.php index 90fcdb3f7c..e4dca4c327 100644 --- a/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_5.6.php +++ b/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.0.php @@ -1,7 +1,7 @@ * @package WoltLabSuite\Core\Http - * @since 5.6 + * @since 6.0 */ final class LegacyPlaceholderResponse implements ResponseInterface { diff --git a/wcfsetup/install/files/lib/http/Pipeline.class.php b/wcfsetup/install/files/lib/http/Pipeline.class.php index cbc2ad1bc9..097eee5af4 100644 --- a/wcfsetup/install/files/lib/http/Pipeline.class.php +++ b/wcfsetup/install/files/lib/http/Pipeline.class.php @@ -16,7 +16,7 @@ use Psr\Http\Server\RequestHandlerInterface; * @copyright 2001-2022 WoltLab GmbH * @license GNU Lesser General Public License * @package WoltLabSuite\Core\Http - * @since 5.6 + * @since 6.0 */ final class Pipeline implements MiddlewareInterface { diff --git a/wcfsetup/install/files/lib/http/RequestHandlerMiddleware.class.php b/wcfsetup/install/files/lib/http/RequestHandlerMiddleware.class.php index 23114177a9..6716cf7e1a 100644 --- a/wcfsetup/install/files/lib/http/RequestHandlerMiddleware.class.php +++ b/wcfsetup/install/files/lib/http/RequestHandlerMiddleware.class.php @@ -15,7 +15,7 @@ use Psr\Http\Server\RequestHandlerInterface; * @copyright 2001-2022 WoltLab GmbH * @license GNU Lesser General Public License * @package WoltLabSuite\Core\Http - * @since 5.6 + * @since 6.0 */ final class RequestHandlerMiddleware implements RequestHandlerInterface { diff --git a/wcfsetup/install/files/lib/http/middleware/AddAcpSecurityHeaders.class.php b/wcfsetup/install/files/lib/http/middleware/AddAcpSecurityHeaders.class.php index 429ca522b1..97d71fd009 100644 --- a/wcfsetup/install/files/lib/http/middleware/AddAcpSecurityHeaders.class.php +++ b/wcfsetup/install/files/lib/http/middleware/AddAcpSecurityHeaders.class.php @@ -16,7 +16,7 @@ use wcf\system\request\RequestHandler; * @copyright 2001-2022 WoltLab GmbH * @license GNU Lesser General Public License * @package WoltLabSuite\Core\Http\Middleware - * @since 5.6 + * @since 6.0 */ final class AddAcpSecurityHeaders implements MiddlewareInterface { diff --git a/wcfsetup/install/files/lib/http/middleware/CheckForEnterpriseNonOwnerAccess.class.php b/wcfsetup/install/files/lib/http/middleware/CheckForEnterpriseNonOwnerAccess.class.php index aae1ffb1e8..fc04d02898 100644 --- a/wcfsetup/install/files/lib/http/middleware/CheckForEnterpriseNonOwnerAccess.class.php +++ b/wcfsetup/install/files/lib/http/middleware/CheckForEnterpriseNonOwnerAccess.class.php @@ -17,7 +17,7 @@ use wcf\system\WCF; * @copyright 2001-2022 WoltLab GmbH * @license GNU Lesser General Public License * @package WoltLabSuite\Core\Http\Middleware - * @since 5.6 + * @since 6.0 */ final class CheckForEnterpriseNonOwnerAccess implements MiddlewareInterface { diff --git a/wcfsetup/install/files/lib/http/middleware/CheckForExpiredAppEvaluation.class.php b/wcfsetup/install/files/lib/http/middleware/CheckForExpiredAppEvaluation.class.php index fb391a735e..ef7dd0a000 100644 --- a/wcfsetup/install/files/lib/http/middleware/CheckForExpiredAppEvaluation.class.php +++ b/wcfsetup/install/files/lib/http/middleware/CheckForExpiredAppEvaluation.class.php @@ -18,7 +18,7 @@ use wcf\system\WCF; * @copyright 2001-2022 WoltLab GmbH * @license GNU Lesser General Public License * @package WoltLabSuite\Core\Http\Middleware - * @since 5.6 + * @since 6.0 */ final class CheckForExpiredAppEvaluation implements MiddlewareInterface { diff --git a/wcfsetup/install/files/lib/http/middleware/CheckForOfflineMode.class.php b/wcfsetup/install/files/lib/http/middleware/CheckForOfflineMode.class.php index 47ef960891..4213772dcf 100644 --- a/wcfsetup/install/files/lib/http/middleware/CheckForOfflineMode.class.php +++ b/wcfsetup/install/files/lib/http/middleware/CheckForOfflineMode.class.php @@ -21,7 +21,7 @@ use wcf\util\HeaderUtil; * @copyright 2001-2022 WoltLab GmbH * @license GNU Lesser General Public License * @package WoltLabSuite\Core\Http\Middleware - * @since 5.6 + * @since 6.0 */ final class CheckForOfflineMode implements MiddlewareInterface { diff --git a/wcfsetup/install/files/lib/http/middleware/CheckSystemEnvironment.class.php b/wcfsetup/install/files/lib/http/middleware/CheckSystemEnvironment.class.php index 920a4a8b61..d463a1f2ee 100644 --- a/wcfsetup/install/files/lib/http/middleware/CheckSystemEnvironment.class.php +++ b/wcfsetup/install/files/lib/http/middleware/CheckSystemEnvironment.class.php @@ -17,7 +17,7 @@ use wcf\system\WCF; * @copyright 2001-2022 WoltLab GmbH * @license GNU Lesser General Public License * @package WoltLabSuite\Core\Http\Middleware - * @since 5.6 + * @since 6.0 */ final class CheckSystemEnvironment implements MiddlewareInterface { diff --git a/wcfsetup/install/files/lib/http/middleware/EnforceCacheControlPrivate.class.php b/wcfsetup/install/files/lib/http/middleware/EnforceCacheControlPrivate.class.php index e8aa9d688e..66b27e2731 100644 --- a/wcfsetup/install/files/lib/http/middleware/EnforceCacheControlPrivate.class.php +++ b/wcfsetup/install/files/lib/http/middleware/EnforceCacheControlPrivate.class.php @@ -16,7 +16,7 @@ use wcf\http\LegacyPlaceholderResponse; * @copyright 2001-2022 WoltLab GmbH * @license GNU Lesser General Public License * @package WoltLabSuite\Core\Http\Middleware - * @since 5.6 + * @since 6.0 */ final class EnforceCacheControlPrivate implements MiddlewareInterface { diff --git a/wcfsetup/install/files/lib/http/middleware/EnforceFrameOptions.class.php b/wcfsetup/install/files/lib/http/middleware/EnforceFrameOptions.class.php index b8debaff1d..f1b1b22942 100644 --- a/wcfsetup/install/files/lib/http/middleware/EnforceFrameOptions.class.php +++ b/wcfsetup/install/files/lib/http/middleware/EnforceFrameOptions.class.php @@ -15,7 +15,7 @@ use wcf\http\LegacyPlaceholderResponse; * @copyright 2001-2022 WoltLab GmbH * @license GNU Lesser General Public License * @package WoltLabSuite\Core\Http\Middleware - * @since 5.6 + * @since 6.0 */ final class EnforceFrameOptions implements MiddlewareInterface { diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php index 6b58ccd6f7..61bc686aab 100644 --- a/wcfsetup/install/files/lib/system/WCF.class.php +++ b/wcfsetup/install/files/lib/system/WCF.class.php @@ -492,10 +492,10 @@ class WCF // https://github.com/WoltLab/WCF/issues/4806 \define('ENABLE_DESKTOP_NOTIFICATIONS', 1); - // Disabling X-Frame-Options is no longer possible since 5.6. + // Disabling X-Frame-Options is no longer possible since 6.0. \define('HTTP_SEND_X_FRAME_OPTIONS', 1); - // Multi-domain setups were removed in 5.6. + // Multi-domain setups were removed in 6.0. \define('DESKTOP_NOTIFICATION_PACKAGE_ID', 1); // Gravatars were removed in 6.0. @@ -995,7 +995,7 @@ class WCF } /** - * @deprecated 5.6 - This was a workaround for multi-domain setups. + * @deprecated 6.0 - This was a workaround for multi-domain setups. */ public static function getActivePath() { @@ -1133,7 +1133,7 @@ class WCF } /** - * @deprecated 5.6 Use ActiveStyle::getRelativeFavicon() directly. + * @deprecated 6.0 Use ActiveStyle::getRelativeFavicon() directly. */ public function getFavicon() { @@ -1143,7 +1143,7 @@ class WCF } /** - * @deprecated 5.6 This method always returns true. + * @deprecated 6.0 This method always returns true. */ public function useDesktopNotifications() { diff --git a/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php b/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php index 09df70436e..cbc1dd9ffc 100644 --- a/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php +++ b/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php @@ -239,7 +239,7 @@ class ApplicationHandler extends SingletonFactory } /** - * @since 5.6 + * @since 6.0 */ public function getDomainName(): string { diff --git a/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php index 42a1329428..77a2b02b50 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php @@ -292,7 +292,7 @@ class RoutingCacheBuilder extends AbstractCacheBuilder } /** - * @since 5.6 + * @since 6.0 */ private function classNameToControllerName(string $className): string { diff --git a/wcfsetup/install/files/lib/system/io/RemoteFile.class.php b/wcfsetup/install/files/lib/system/io/RemoteFile.class.php index d728986920..98ec787ece 100644 --- a/wcfsetup/install/files/lib/system/io/RemoteFile.class.php +++ b/wcfsetup/install/files/lib/system/io/RemoteFile.class.php @@ -158,7 +158,7 @@ class RemoteFile extends File } /** - * @deprecated 5.6 This method is effectively returning bogus data, because the majority of TLS communication uses Guzzle/cURL. + * @deprecated 6.0 This method is effectively returning bogus data, because the majority of TLS communication uses Guzzle/cURL. */ public static function supportsSSL() { @@ -178,7 +178,7 @@ class RemoteFile extends File } /** - * @deprecated 5.6 See RemoteFile::supportsSSL(). The implementation is a noop. + * @deprecated 6.0 See RemoteFile::supportsSSL(). The implementation is a noop. */ public static function disableSSL() { diff --git a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php index 4ed1d04ce1..6e171a820c 100644 --- a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php +++ b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php @@ -259,7 +259,7 @@ final class RequestHandler extends SingletonFactory } /** - * @deprecated 5.6 - This method always returns false. + * @deprecated 6.0 - This method always returns false. */ public function inRescueMode(): bool { diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php index 3accd7342d..aaf1248c9f 100644 --- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php +++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php @@ -819,7 +819,7 @@ final class SessionHandler extends SingletonFactory } /** - * @deprecated 5.6 Use User::getLanguageIDs() instead. + * @deprecated 6.0 Use User::getLanguageIDs() instead. */ public function getLanguageIDs() { diff --git a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php index d9fc19e0f8..fadd840bb2 100755 --- a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php +++ b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php @@ -604,7 +604,7 @@ class TemplateEngine extends SingletonFactory /** * Renders the template into a fresh PSR-7 StreamInterface. * - * @since 5.6 + * @since 6.0 */ public function fetchStream( string $templateName, diff --git a/wcfsetup/install/files/lib/util/CronjobUtil.class.php b/wcfsetup/install/files/lib/util/CronjobUtil.class.php index f0909ab308..1927a9d429 100644 --- a/wcfsetup/install/files/lib/util/CronjobUtil.class.php +++ b/wcfsetup/install/files/lib/util/CronjobUtil.class.php @@ -5,7 +5,7 @@ namespace wcf\util; use wcf\system\exception\SystemException; /** - * @deprecated 5.6 dragonmantank/cron-expression is used for calculations. + * @deprecated 6.0 dragonmantank/cron-expression is used for calculations. */ final class CronjobUtil { diff --git a/wcfsetup/install/files/lib/util/Diff.class.php b/wcfsetup/install/files/lib/util/Diff.class.php index da6aa91ce7..80b0dc3ba4 100644 --- a/wcfsetup/install/files/lib/util/Diff.class.php +++ b/wcfsetup/install/files/lib/util/Diff.class.php @@ -65,7 +65,7 @@ class Diff protected $d; /** - * @deprecated 5.6 Use sebastian/diff instead. + * @deprecated 6.0 Use sebastian/diff instead. */ public function __construct(array $a, array $b) { @@ -77,7 +77,7 @@ class Diff } /** - * @deprecated 5.6 Use sebastian/diff instead. + * @deprecated 6.0 Use sebastian/diff instead. */ public function getLCS() { @@ -230,7 +230,7 @@ class Diff } /** - * @deprecated 5.6 Use sebastian/diff instead. + * @deprecated 6.0 Use sebastian/diff instead. */ public function getRawDiff() { @@ -240,7 +240,7 @@ class Diff } /** - * @deprecated 5.6 Use sebastian/diff instead. + * @deprecated 6.0 Use sebastian/diff instead. */ public function getUnixDiff($context = 2) { @@ -328,7 +328,7 @@ class Diff * Transforms the output of sebastian/diff's Differ::diffToArray() into * the output of self::getRawDiff(). * - * @since 5.6 + * @since 6.0 */ public static function rawDiffFromSebastianDiff(array $arrayDiff): array { @@ -345,7 +345,7 @@ class Diff } /** - * @deprecated 5.6 Use sebastian/diff instead. + * @deprecated 6.0 Use sebastian/diff instead. */ public function __toString() { diff --git a/wcfsetup/install/files/lib/util/StringUtil.class.php b/wcfsetup/install/files/lib/util/StringUtil.class.php index 30239c9571..5f0a5addfd 100644 --- a/wcfsetup/install/files/lib/util/StringUtil.class.php +++ b/wcfsetup/install/files/lib/util/StringUtil.class.php @@ -503,7 +503,7 @@ final class StringUtil } /** - * @deprecated 5.6 Use `\mb_convert_encoding()` directly. + * @deprecated 6.0 Use `\mb_convert_encoding()` directly. */ public static function convertEncoding($inCharset, $outCharset, $string): string { -- 2.20.1