From: Tim Düsterhus Date: Tue, 3 Aug 2021 10:36:59 +0000 (+0200) Subject: Update style for PHP CS Fixer 3.0.1 X-Git-Tag: 5.5.0_Alpha_1~509 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=55a3a8424fb50748cdc8e83e4ae5c0be71697b05;p=GitHub%2FWoltLab%2FWCF.git Update style for PHP CS Fixer 3.0.1 --- diff --git a/wcfsetup/install/files/lib/data/DatabaseObject.class.php b/wcfsetup/install/files/lib/data/DatabaseObject.class.php index 6f3c90b91f..5f22458b01 100644 --- a/wcfsetup/install/files/lib/data/DatabaseObject.class.php +++ b/wcfsetup/install/files/lib/data/DatabaseObject.class.php @@ -36,13 +36,13 @@ abstract class DatabaseObject implements IIDObject, IStorableObject * sort field * @var mixed */ - protected static $sortBy = null; + protected static $sortBy; /** * sort order * @var mixed */ - protected static $sortOrder = null; + protected static $sortOrder; /** * object data diff --git a/wcfsetup/install/files/lib/data/application/Application.class.php b/wcfsetup/install/files/lib/data/application/Application.class.php index 4b30506568..bf6c704d28 100644 --- a/wcfsetup/install/files/lib/data/application/Application.class.php +++ b/wcfsetup/install/files/lib/data/application/Application.class.php @@ -54,7 +54,7 @@ class Application extends DatabaseObject * list of all available application directories * @var string[] */ - protected static $directories = null; + protected static $directories; /** * @inheritDoc diff --git a/wcfsetup/install/files/lib/data/bbcode/media/provider/BBCodeMediaProvider.class.php b/wcfsetup/install/files/lib/data/bbcode/media/provider/BBCodeMediaProvider.class.php index 9023120319..a36e1db78d 100644 --- a/wcfsetup/install/files/lib/data/bbcode/media/provider/BBCodeMediaProvider.class.php +++ b/wcfsetup/install/files/lib/data/bbcode/media/provider/BBCodeMediaProvider.class.php @@ -36,7 +36,7 @@ class BBCodeMediaProvider extends DatabaseObject implements IRouteController * cached providers * @var BBCodeMediaProvider[] */ - protected static $cache = null; + protected static $cache; /** * media provider callback instance diff --git a/wcfsetup/install/files/lib/data/package/Package.class.php b/wcfsetup/install/files/lib/data/package/Package.class.php index 87feebbb55..0404eec5f5 100644 --- a/wcfsetup/install/files/lib/data/package/Package.class.php +++ b/wcfsetup/install/files/lib/data/package/Package.class.php @@ -70,13 +70,13 @@ class Package extends DatabaseObject implements ILinkableObject, IRouteControlle * list of ids of packages which are required by another package * @var int[] */ - protected static $requiredPackageIDs = null; + protected static $requiredPackageIDs; /** * package requirements * @var array */ - protected static $requirements = null; + protected static $requirements; /** * @inheritDoc diff --git a/wcfsetup/install/files/lib/data/template/group/TemplateGroup.class.php b/wcfsetup/install/files/lib/data/template/group/TemplateGroup.class.php index 481ddacc5f..3d17b2ecf0 100644 --- a/wcfsetup/install/files/lib/data/template/group/TemplateGroup.class.php +++ b/wcfsetup/install/files/lib/data/template/group/TemplateGroup.class.php @@ -29,9 +29,9 @@ class TemplateGroup extends DatabaseObject /** * @var TemplateGroup[][] */ - protected static $templateGroupStructure = null; + protected static $templateGroupStructure; - protected static $selectList = null; + protected static $selectList; /** * Returns whether the template group is immutable (i.e. whether it's the email diff --git a/wcfsetup/install/files/lib/data/user/UserEditor.class.php b/wcfsetup/install/files/lib/data/user/UserEditor.class.php index f9a8513b30..d4ffc0a923 100644 --- a/wcfsetup/install/files/lib/data/user/UserEditor.class.php +++ b/wcfsetup/install/files/lib/data/user/UserEditor.class.php @@ -35,7 +35,7 @@ class UserEditor extends DatabaseObjectEditor implements IEditableCachedObject * list of user options default values * @var array */ - protected static $userOptionDefaultValues = null; + protected static $userOptionDefaultValues; /** * Returns the encoded password hash + algorithm for the given password. diff --git a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php index a8220855eb..1f5d4796ce 100644 --- a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php +++ b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php @@ -71,13 +71,13 @@ class UserGroup extends DatabaseObject implements ITitledObject * group cache * @var UserGroup[] */ - protected static $cache = null; + protected static $cache; /** * list of accessible groups for active user * @var int[] */ - protected static $accessibleGroups = null; + protected static $accessibleGroups; /** * @var UserGroup|null diff --git a/wcfsetup/install/files/lib/system/CLIWCF.class.php b/wcfsetup/install/files/lib/system/CLIWCF.class.php index 7780cb48ae..cda9e55335 100644 --- a/wcfsetup/install/files/lib/system/CLIWCF.class.php +++ b/wcfsetup/install/files/lib/system/CLIWCF.class.php @@ -43,13 +43,13 @@ class CLIWCF extends WCF * instance of ConsoleReader * @var ConsoleReader */ - protected static $consoleReader = null; + protected static $consoleReader; /** * instance of ArgvParser * @var \Zend\Console\Getopt */ - protected static $argvParser = null; + protected static $argvParser; /** @noinspection PhpMissingParentConstructorInspection */ diff --git a/wcfsetup/install/files/lib/system/background/job/EmailDeliveryBackgroundJob.class.php b/wcfsetup/install/files/lib/system/background/job/EmailDeliveryBackgroundJob.class.php index 8edbb53c97..e2bce68c39 100644 --- a/wcfsetup/install/files/lib/system/background/job/EmailDeliveryBackgroundJob.class.php +++ b/wcfsetup/install/files/lib/system/background/job/EmailDeliveryBackgroundJob.class.php @@ -59,7 +59,7 @@ class EmailDeliveryBackgroundJob extends AbstractBackgroundJob * instance of the default transport * @var \wcf\system\email\transport\IEmailTransport */ - protected static $transport = null; + protected static $transport; /** * Creates the job using the given the email and the destination mailbox. diff --git a/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php b/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php index 123b222763..4ae964cdcc 100644 --- a/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php +++ b/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php @@ -24,7 +24,7 @@ class AttachmentBBCode extends AbstractBBCode * @var GroupedAttachmentList * @deprecated */ - protected static $attachmentList = null; + protected static $attachmentList; /** * active object id diff --git a/wcfsetup/install/files/lib/system/email/Email.class.php b/wcfsetup/install/files/lib/system/email/Email.class.php index 14a8401ad9..689438e444 100644 --- a/wcfsetup/install/files/lib/system/email/Email.class.php +++ b/wcfsetup/install/files/lib/system/email/Email.class.php @@ -116,7 +116,7 @@ class Email * Mail host for use in the Message-Id * @var string */ - private static $host = null; + private static $host; /** * Returns the mail host for use in the Message-Id. diff --git a/wcfsetup/install/files/lib/system/form/builder/FormDocument.class.php b/wcfsetup/install/files/lib/system/form/builder/FormDocument.class.php index 55d4e34bea..c2323e7fdc 100644 --- a/wcfsetup/install/files/lib/system/form/builder/FormDocument.class.php +++ b/wcfsetup/install/files/lib/system/form/builder/FormDocument.class.php @@ -30,6 +30,7 @@ class FormDocument implements IFormDocument use TFormNode; use TFormParentNode { TFormParentNode::cleanup insteadof TFormNode; + hasValidationErrors as protected traitHasValidationErrors; readValues as protected traitReadValues; validate as protected traitValidate; diff --git a/wcfsetup/install/files/lib/system/form/builder/container/FormContainer.class.php b/wcfsetup/install/files/lib/system/form/builder/container/FormContainer.class.php index a8f517e3a5..b576ba2fd8 100644 --- a/wcfsetup/install/files/lib/system/form/builder/container/FormContainer.class.php +++ b/wcfsetup/install/files/lib/system/form/builder/container/FormContainer.class.php @@ -26,6 +26,7 @@ class FormContainer implements IFormContainer use TFormElement; use TFormParentNode { TFormParentNode::cleanup insteadof TFormElement; + validateChild as protected defaultValidateChild; } diff --git a/wcfsetup/install/files/lib/system/form/builder/field/AbstractNumericFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/AbstractNumericFormField.class.php index 45b4439cc1..b750bdcf18 100644 --- a/wcfsetup/install/files/lib/system/form/builder/field/AbstractNumericFormField.class.php +++ b/wcfsetup/install/files/lib/system/form/builder/field/AbstractNumericFormField.class.php @@ -30,6 +30,7 @@ abstract class AbstractNumericFormField extends AbstractFormField implements use TAttributeFormField { getReservedFieldAttributes as private defaultGetReservedFieldAttributes; } + use TAutoCompleteFormField; use TAutoFocusFormField; use TCssClassFormField; diff --git a/wcfsetup/install/files/lib/system/form/builder/field/DateFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/DateFormField.class.php index 27f4d6cbd3..d02de198a0 100644 --- a/wcfsetup/install/files/lib/system/form/builder/field/DateFormField.class.php +++ b/wcfsetup/install/files/lib/system/form/builder/field/DateFormField.class.php @@ -25,6 +25,7 @@ class DateFormField extends AbstractFormField implements use TInputAttributeFormField { getReservedFieldAttributes as private inputGetReservedFieldAttributes; } + use TAutoFocusFormField; use TCssClassFormField; use TImmutableFormField; diff --git a/wcfsetup/install/files/lib/system/form/builder/field/EmailFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/EmailFormField.class.php index 3547b722d0..8b7d1b4e38 100644 --- a/wcfsetup/install/files/lib/system/form/builder/field/EmailFormField.class.php +++ b/wcfsetup/install/files/lib/system/form/builder/field/EmailFormField.class.php @@ -32,6 +32,7 @@ class EmailFormField extends AbstractFormField implements use TAttributeFormField { getReservedFieldAttributes as private defaultGetReservedFieldAttributes; } + use TAutoCompleteFormField; use TAutoFocusFormField; use TCssClassFormField; @@ -40,6 +41,7 @@ class EmailFormField extends AbstractFormField implements use TI18nFormField { validate as protected i18nValidate; } + use TPatternFormField; use TPlaceholderFormField; diff --git a/wcfsetup/install/files/lib/system/form/builder/field/RatingFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/RatingFormField.class.php index e9e59480d3..d4ab760dbb 100644 --- a/wcfsetup/install/files/lib/system/form/builder/field/RatingFormField.class.php +++ b/wcfsetup/install/files/lib/system/form/builder/field/RatingFormField.class.php @@ -36,9 +36,11 @@ class RatingFormField extends AbstractFormField implements use TMaximumFormField { maximum as protected traitMaximum; } + use TMinimumFormField { minimum as protected traitMinimum; } + use TNullableFormField; /** diff --git a/wcfsetup/install/files/lib/system/form/builder/field/SingleSelectionFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/SingleSelectionFormField.class.php index f13e0623b5..9e10b9a6a7 100644 --- a/wcfsetup/install/files/lib/system/form/builder/field/SingleSelectionFormField.class.php +++ b/wcfsetup/install/files/lib/system/form/builder/field/SingleSelectionFormField.class.php @@ -24,6 +24,7 @@ class SingleSelectionFormField extends AbstractFormField implements use TFilterableSelectionFormField { filterable as protected traitFilterable; } + use TNullableFormField; /** diff --git a/wcfsetup/install/files/lib/system/form/builder/field/TextFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/TextFormField.class.php index 5985f451ba..0d69c39b8a 100644 --- a/wcfsetup/install/files/lib/system/form/builder/field/TextFormField.class.php +++ b/wcfsetup/install/files/lib/system/form/builder/field/TextFormField.class.php @@ -37,6 +37,7 @@ class TextFormField extends AbstractFormField implements use TI18nFormField { validate as protected i18nValidate; } + use TMaximumLengthFormField; use TMinimumLengthFormField; use TPatternFormField; diff --git a/wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php index f0bc75f67a..bb7ca57ca4 100644 --- a/wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php +++ b/wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php @@ -25,6 +25,7 @@ class UploadFormField extends AbstractFormField use TMaximumFormField { maximum as traitMaximum; } + use TMinimumFormField; /** diff --git a/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygFormField.class.php index 5b3fc4ff5a..f65fa172fd 100644 --- a/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygFormField.class.php +++ b/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygFormField.class.php @@ -41,6 +41,7 @@ class WysiwygFormField extends AbstractFormField implements use TInputAttributeFormField { getReservedFieldAttributes as private inputGetReservedFieldAttributes; } + use TMaximumLengthFormField; use TMinimumLengthFormField; use TObjectTypeFormNode; diff --git a/wcfsetup/install/files/lib/system/io/RemoteFile.class.php b/wcfsetup/install/files/lib/system/io/RemoteFile.class.php index d5d96288ad..63fb68718e 100644 --- a/wcfsetup/install/files/lib/system/io/RemoteFile.class.php +++ b/wcfsetup/install/files/lib/system/io/RemoteFile.class.php @@ -42,7 +42,7 @@ class RemoteFile extends File * true if PHP supports SSL/TLS * @var bool */ - private static $hasSSLSupport = null; + private static $hasSSLSupport; /** @noinspection PhpMissingParentConstructorInspection */ diff --git a/wcfsetup/install/files/lib/system/option/UseroptionsOptionType.class.php b/wcfsetup/install/files/lib/system/option/UseroptionsOptionType.class.php index 1bdde232d7..22aaf2da23 100644 --- a/wcfsetup/install/files/lib/system/option/UseroptionsOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/UseroptionsOptionType.class.php @@ -20,7 +20,7 @@ class UseroptionsOptionType extends AbstractOptionType * list of available user options * @var string[] */ - protected static $userOptions = null; + protected static $userOptions; /** * @inheritDoc diff --git a/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php index f5b45805a2..9d69e94132 100644 --- a/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php +++ b/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php @@ -54,6 +54,7 @@ abstract class AbstractOptionPackageInstallationPlugin extends AbstractXMLPackag // class use TXmlGuiPackageInstallationPlugin { addDeleteElement as defaultAddDeleteElement; + sanitizeXmlFileAfterDeleteEntry as defaultSanitizeXmlFileAfterDeleteEntry; } diff --git a/wcfsetup/install/files/lib/system/user/authentication/password/algorithm/Phpbb3.class.php b/wcfsetup/install/files/lib/system/user/authentication/password/algorithm/Phpbb3.class.php index 8eb5a76362..eef8ac37e2 100644 --- a/wcfsetup/install/files/lib/system/user/authentication/password/algorithm/Phpbb3.class.php +++ b/wcfsetup/install/files/lib/system/user/authentication/password/algorithm/Phpbb3.class.php @@ -18,6 +18,7 @@ final class Phpbb3 implements IPasswordAlgorithm { use TPhpass { verify as phpassVerify; + hash as phpassHash; } diff --git a/wcfsetup/install/files/lib/system/user/notification/event/ArticleLikeUserNotificationEvent.class.php b/wcfsetup/install/files/lib/system/user/notification/event/ArticleLikeUserNotificationEvent.class.php index 84850473ca..5da349b045 100644 --- a/wcfsetup/install/files/lib/system/user/notification/event/ArticleLikeUserNotificationEvent.class.php +++ b/wcfsetup/install/files/lib/system/user/notification/event/ArticleLikeUserNotificationEvent.class.php @@ -27,6 +27,7 @@ class ArticleLikeUserNotificationEvent extends AbstractSharedUserNotificationEve use TTestableLikeUserNotificationEvent { TTestableLikeUserNotificationEvent::canBeTriggeredByGuests insteadof TTestableUserNotificationEvent; } + use TTestableArticleUserNotificationEvent; use TTestableCategorizedUserNotificationEvent; use TTestableUserNotificationEvent; diff --git a/wcfsetup/install/files/lib/system/user/notification/event/TTestableCommentLikeUserNotificationEvent.class.php b/wcfsetup/install/files/lib/system/user/notification/event/TTestableCommentLikeUserNotificationEvent.class.php index 00bdc13fe6..9b0c461e87 100644 --- a/wcfsetup/install/files/lib/system/user/notification/event/TTestableCommentLikeUserNotificationEvent.class.php +++ b/wcfsetup/install/files/lib/system/user/notification/event/TTestableCommentLikeUserNotificationEvent.class.php @@ -21,6 +21,7 @@ trait TTestableCommentLikeUserNotificationEvent use TTestableCommentUserNotificationEvent; use TTestableLikeUserNotificationEvent { TTestableLikeUserNotificationEvent::canBeTriggeredByGuests insteadof TTestableCommentUserNotificationEvent; + TTestableLikeUserNotificationEvent::getTestObjects insteadof TTestableCommentUserNotificationEvent; } diff --git a/wcfsetup/install/files/lib/system/user/notification/event/TTestableCommentResponseLikeUserNotificationEvent.class.php b/wcfsetup/install/files/lib/system/user/notification/event/TTestableCommentResponseLikeUserNotificationEvent.class.php index d13af3973c..a03e553c1c 100644 --- a/wcfsetup/install/files/lib/system/user/notification/event/TTestableCommentResponseLikeUserNotificationEvent.class.php +++ b/wcfsetup/install/files/lib/system/user/notification/event/TTestableCommentResponseLikeUserNotificationEvent.class.php @@ -21,6 +21,7 @@ trait TTestableCommentResponseLikeUserNotificationEvent use TTestableCommentResponseUserNotificationEvent; use TTestableLikeUserNotificationEvent { TTestableLikeUserNotificationEvent::canBeTriggeredByGuests insteadof TTestableCommentResponseUserNotificationEvent; + TTestableLikeUserNotificationEvent::getTestObjects insteadof TTestableCommentResponseUserNotificationEvent; } diff --git a/wcfsetup/install/files/lib/util/DateUtil.class.php b/wcfsetup/install/files/lib/util/DateUtil.class.php index 5a120629de..da1a6e529f 100644 --- a/wcfsetup/install/files/lib/util/DateUtil.class.php +++ b/wcfsetup/install/files/lib/util/DateUtil.class.php @@ -155,19 +155,19 @@ final class DateUtil * 1=monday * @var int */ - private static $firstDayOfTheWeek = null; + private static $firstDayOfTheWeek; /** * order of the week days * @var string[] */ - private static $weekDays = null; + private static $weekDays; /** * order of the week days (short textual representation) * @var string[] */ - private static $shortWeekDays = null; + private static $shortWeekDays; /** * Returns a formatted date. diff --git a/wcfsetup/install/files/lib/util/FileUtil.class.php b/wcfsetup/install/files/lib/util/FileUtil.class.php index 05b8eab8ea..71640c74f4 100644 --- a/wcfsetup/install/files/lib/util/FileUtil.class.php +++ b/wcfsetup/install/files/lib/util/FileUtil.class.php @@ -21,19 +21,19 @@ final class FileUtil * finfo instance * @var \finfo */ - protected static $finfo = null; + protected static $finfo; /** * memory limit in bytes * @var int */ - protected static $memoryLimit = null; + protected static $memoryLimit; /** * chmod mode * @var string */ - protected static $mode = null; + protected static $mode; /** * Tries to find the temp folder.