Fix code (style) issues

diff --git a/wcfsetup/install/files/lib/acp/form/FirstTimeSetupForm.class.php b/wcfsetup/install/files/lib/acp/form/FirstTimeSetupForm.class.php
index 80a66f92e2d35da94d1c864d32b4d609c6fc416a..c59ef11b7ed2e73d9a5b07c5c1d8ee0255450a83 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/FirstTimeSetupForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/FirstTimeSetupForm.class.php
@@ -2,7 +2,6 @@
 namespace wcf\acp\form;
 use wcf\data\option\OptionAction;
 use wcf\system\option\OptionHandler;
-use wcf\system\style\StyleHandler;
 use wcf\system\WCF;
 
 /**

diff --git a/wcfsetup/install/files/lib/data/blacklist/status/BlacklistStatus.class.php b/wcfsetup/install/files/lib/data/blacklist/status/BlacklistStatus.class.php
index e6db68023cbf2b5a7e31468eb7fc027d2c7f6a76..6ec02c96de93bd5ccb17b0d970fdb9ceade12c7d 100644 (file)
--- a/wcfsetup/install/files/lib/data/blacklist/status/BlacklistStatus.class.php
+++ b/wcfsetup/install/files/lib/data/blacklist/status/BlacklistStatus.class.php
@@ -74,6 +74,7 @@ class BlacklistStatus extends DatabaseObject {
         * 
         * @param BlacklistStatus[] $status
         * @return string|null
+        * @throws SystemException
         */
        public static function getNextDelta(array $status) {
                // Fetch the index file to determine the oldest possible value that can be retrieved.

diff --git a/wcfsetup/install/files/lib/data/comment/CommentAction.class.php b/wcfsetup/install/files/lib/data/comment/CommentAction.class.php
index b866e11c6fcdbc40fcaa7f0132d11e7bee240032..2a2b1b3d470a00b26d703afc0c349693a8f1fcfd 100644 (file)
--- a/wcfsetup/install/files/lib/data/comment/CommentAction.class.php
+++ b/wcfsetup/install/files/lib/data/comment/CommentAction.class.php
@@ -824,7 +824,7 @@ class CommentAction extends AbstractDatabaseObjectAction implements IMessageInli
        public function validateEdit() {
                $this->validatePrepareEdit();
                
-               $this->validateMessage($this->comment !== null);
+               $this->validateMessage();
        }
        
        /**
@@ -885,7 +885,7 @@ class CommentAction extends AbstractDatabaseObjectAction implements IMessageInli
        public function validateSave() {
                $this->validateBeginEdit();
                
-               $this->validateMessage(true);
+               $this->validateMessage();
        }
        
        /**

diff --git a/wcfsetup/install/files/lib/data/media/ViewableMedia.class.php b/wcfsetup/install/files/lib/data/media/ViewableMedia.class.php
index 28b33512bdeef25ffb537963c0abd1e164dae850..39289a64b229c6713c90b811d7eb6d6884204ebd 100644 (file)
--- a/wcfsetup/install/files/lib/data/media/ViewableMedia.class.php
+++ b/wcfsetup/install/files/lib/data/media/ViewableMedia.class.php
@@ -127,6 +127,7 @@ class ViewableMedia extends DatabaseObjectDecorator {
                        $width = $size;
                        $height = $size;
                        $link = null;
+                       $marginTop = 0;
                        
                        if ($this->tinyThumbnailType) {
                                $link = $this->getThumbnailLink('tiny');

diff --git a/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php b/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
index 931322ef4ac7ce4d00309a0caf8fd758dec6bde8..9dabc1c083c860a99ecaaeb1378ce4d1068e9a4f 100644 (file)
--- a/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
+++ b/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
@@ -6,11 +6,9 @@ use wcf\data\package\update\server\PackageUpdateServer;
 use wcf\data\package\update\version\PackageUpdateVersion;
 use wcf\data\package\Package;
 use wcf\data\search\Search;
-use wcf\data\search\SearchEditor;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\NamedUserException;
-use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
 use wcf\system\package\PackageInstallationScheduler;

diff --git a/wcfsetup/install/files/lib/system/bbcode/BBCodeHandler.class.php b/wcfsetup/install/files/lib/system/bbcode/BBCodeHandler.class.php
index 559960554edcfea4fda396a6adfa95b365db83ca..7cced24b744aabe1c1fed82abbc75c82ed4ca6d7 100644 (file)
--- a/wcfsetup/install/files/lib/system/bbcode/BBCodeHandler.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/BBCodeHandler.class.php
@@ -122,7 +122,7 @@ class BBCodeHandler extends SingletonFactory {
        /**
         * Returns metadata about the highlighters.
         * 
-        * @return      string[]
+        * @return      string[][]
         */
        public function getHighlighterMeta() {
                if ($this->highlighterMeta === null) {

diff --git a/wcfsetup/install/files/lib/system/devtools/pip/TXmlGuiPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/devtools/pip/TXmlGuiPackageInstallationPlugin.class.php
index 682922b1102897cc82f0d379bd03753d34e6fac5..34cfe1d6ec8fd8d231521d86d3c6d816bb4f0885 100644 (file)
--- a/wcfsetup/install/files/lib/system/devtools/pip/TXmlGuiPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/devtools/pip/TXmlGuiPackageInstallationPlugin.class.php
@@ -76,10 +76,7 @@ trait TXmlGuiPackageInstallationPlugin {
                
                $this->saveObject($newElement);
                
-               /** @var DevtoolsProject $project */
-               $project = $this->installation->getProject();
-               
-               $xml->write($this->getXmlFileLocation($project));
+               $xml->write($this->getXmlFileLocation());
        }
        
        /**
@@ -208,16 +205,13 @@ trait TXmlGuiPackageInstallationPlugin {
                
                DOMUtil::removeNode($element);
                
-               /** @var DevtoolsProject $project */
-               $project = $this->installation->getProject();
-               
                $deleteFile = $this->sanitizeXmlFileAfterDeleteEntry($document);
                
                if ($deleteFile) {
-                       unlink($this->getXmlFileLocation($project));
+                       unlink($this->getXmlFileLocation());
                }
                else {
-                       $xml->write($this->getXmlFileLocation($project));
+                       $xml->write($this->getXmlFileLocation());
                }
                
                if (is_subclass_of($this->className, IEditableCachedObject::class)) {
@@ -293,10 +287,7 @@ trait TXmlGuiPackageInstallationPlugin {
                
                $this->saveObject($newElement, $element);
                
-               /** @var DevtoolsProject $project */
-               $project = $this->installation->getProject();
-               
-               $xml->write($this->getXmlFileLocation($project));
+               $xml->write($this->getXmlFileLocation());
                
                return $this->getElementIdentifier($newElement);
        }

diff --git a/wcfsetup/install/files/lib/system/event/listener/AbstractHtmlInputNodeProcessorListener.class.php b/wcfsetup/install/files/lib/system/event/listener/AbstractHtmlInputNodeProcessorListener.class.php
index fd63fe0c2e10871618f2f605fef827a6ca55afd3..0251ee8405831ac650222d71fe12c3fc972e3851 100644 (file)
--- a/wcfsetup/install/files/lib/system/event/listener/AbstractHtmlInputNodeProcessorListener.class.php
+++ b/wcfsetup/install/files/lib/system/event/listener/AbstractHtmlInputNodeProcessorListener.class.php
@@ -1,6 +1,5 @@
 <?php
 namespace wcf\system\event\listener;
-use wcf\data\bbcode\BBCode;
 use wcf\data\bbcode\BBCodeCache;
 use wcf\data\DatabaseObjectDecorator;
 use wcf\data\ITitledObject;

diff --git a/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeProcessor.class.php b/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeProcessor.class.php
index dea9841fe17a1ea8984722e9cee03b1c44b959ea..3830e7fecb13f326d21236882c796953cefb246a 100644 (file)
--- a/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeProcessor.class.php
+++ b/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeProcessor.class.php
@@ -559,9 +559,6 @@ class HtmlInputNodeProcessor extends AbstractHtmlNodeProcessor {
         * @since 5.2
         */
        protected function convertPlainLinks() {
-               /** @var HtmlNodePlainLink[] $links */
-               $links = [];
-               
                /** @var \DOMElement $link */
                foreach ($this->getDocument()->getElementsByTagName('a') as $link) {
                        $href = $link->getAttribute('href');

diff --git a/wcfsetup/install/files/lib/system/mail/Mail.class.php b/wcfsetup/install/files/lib/system/mail/Mail.class.php
index 2ee54cd14e0971f7502c4bc6465a6d03e525ec16..58684c1f4ec1fa85b849fba75b953db4d7306c29 100644 (file)
--- a/wcfsetup/install/files/lib/system/mail/Mail.class.php
+++ b/wcfsetup/install/files/lib/system/mail/Mail.class.php
@@ -7,7 +7,6 @@ use wcf\system\email\mime\PlainTextMimePart;
 use wcf\system\email\Email;
 use wcf\system\email\Mailbox;
 use wcf\system\WCF;
-use wcf\util\FileUtil;
 
 /**
  * This class represents an e-mail.

diff --git a/wcfsetup/install/files/lib/system/request/Request.class.php b/wcfsetup/install/files/lib/system/request/Request.class.php
index e2c638582617abec064d0ae52242605c7c4e349b..89de7fe310758b98bcb207bdcc710e27efce30f0 100644 (file)
--- a/wcfsetup/install/files/lib/system/request/Request.class.php
+++ b/wcfsetup/install/files/lib/system/request/Request.class.php
@@ -114,7 +114,7 @@ class Request {
        /**
         * Returns request meta data.
         * 
-        * @return      string[]
+        * @return      array
         * @since       3.0
         */
        public function getMetaData() {

diff --git a/wcfsetup/install/files/lib/system/search/ArticleSearch.class.php b/wcfsetup/install/files/lib/system/search/ArticleSearch.class.php
index 5f33e23b0fd05bc1ed06b37cac093df8653719e8..b3f87de01308ceb4fa4d127f3ed04ca5f5e31115 100644 (file)
--- a/wcfsetup/install/files/lib/system/search/ArticleSearch.class.php
+++ b/wcfsetup/install/files/lib/system/search/ArticleSearch.class.php
@@ -5,8 +5,6 @@ use wcf\data\article\category\ArticleCategoryNodeTree;
 use wcf\data\article\content\SearchResultArticleContent;
 use wcf\data\article\content\SearchResultArticleContentList;
 use wcf\data\article\Article;
-use wcf\data\category\CategoryNode;
-use wcf\data\category\CategoryNodeTree;
 use wcf\form\IForm;
 use wcf\form\SearchForm;
 use wcf\system\database\util\PreparedStatementConditionBuilder;

diff --git a/wcfsetup/install/files/lib/system/tagging/TagEngine.class.php b/wcfsetup/install/files/lib/system/tagging/TagEngine.class.php
index 6a1c5b5f0f852d4f0bf2ea38ac21ba329cd85325..db14f9297673171e8342217ab8d614995ef35a90 100644 (file)
--- a/wcfsetup/install/files/lib/system/tagging/TagEngine.class.php
+++ b/wcfsetup/install/files/lib/system/tagging/TagEngine.class.php
@@ -6,7 +6,6 @@ use wcf\data\tag\TagAction;
 use wcf\data\tag\TagList;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\InvalidObjectTypeException;
-use wcf\system\language\LanguageFactory;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
 use wcf\util\ArrayUtil;