Fix type documentation issues

diff --git a/wcfsetup/install/files/lib/data/trophy/Trophy.class.php b/wcfsetup/install/files/lib/data/trophy/Trophy.class.php
index 1a9b54b63542bfa4be5e09c644b065d00e52bb56..771aadf39d8ec465b450a8e8038ed2c840cae531 100644 (file)
--- a/wcfsetup/install/files/lib/data/trophy/Trophy.class.php
+++ b/wcfsetup/install/files/lib/data/trophy/Trophy.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\data\trophy;
+use wcf\data\condition\Condition;
 use wcf\data\trophy\category\TrophyCategory;
 use wcf\data\trophy\category\TrophyCategoryCache;
 use wcf\data\DatabaseObject;

diff --git a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodePre.class.php b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodePre.class.php
index 8e931f380ed0049dedc1464cc016ab8cd3faf736..1637cebdbcc414a47c49aa33273f5b62087dd757 100644 (file)
--- a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodePre.class.php
+++ b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodePre.class.php
@@ -191,7 +191,7 @@ class HtmlOutputNodePre extends AbstractHtmlOutputNode {
         * @param       string          $code
         * @param       integer         $start
         * @param       string          $split
-        * @return      string
+        * @return      string[]
         */
        protected function makeLineNumbers($code, $start, $split = "\n") {
                $lines = explode($split, $code);

diff --git a/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php b/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php
index 286acba475b665ed294527db573ce205c93a0806..130d26b0335e5e7e55f44f4670c8f597d34c185d 100644 (file)
--- a/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php
+++ b/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php
@@ -27,7 +27,7 @@ abstract class TreeMenu extends SingletonFactory {
        
        /**
         * list of all menu items
-        * @var ITreeMenuItem[]
+        * @var ITreeMenuItem[][]
         */
        public $menuItems = null;
        

diff --git a/wcfsetup/install/files/lib/system/message/quote/MessageQuoteManager.class.php b/wcfsetup/install/files/lib/system/message/quote/MessageQuoteManager.class.php
index fce83b3419b18fc1ea1a2f56ac8e93a3977ac8e5..7dcd009a74139c4a00dd8e891e373d9a4d222bf1 100644 (file)
--- a/wcfsetup/install/files/lib/system/message/quote/MessageQuoteManager.class.php
+++ b/wcfsetup/install/files/lib/system/message/quote/MessageQuoteManager.class.php
@@ -424,7 +424,7 @@ class MessageQuoteManager extends SingletonFactory {
         * @param       IMessage        $message
         * @param       string          $text
         * @param       boolean         $renderAsString
-        * @return      string
+        * @return      array|string
         */
        public function renderQuote(IMessage $message, $text, $renderAsString = true) {
                $parameters = [

diff --git a/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php b/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
index 0be950c6a4cc53889507742d3e4a8f1799ae9d14..c023cf901eab0ffbdb3d53fb80d7a197220c9de7 100644 (file)
--- a/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
+++ b/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
@@ -193,7 +193,7 @@ class TemplateScriptingCompiler {
         * @param       string          $sourceContent
         * @param       array           $metaData
         * @param       boolean         $isolated
-        * @return      string
+        * @return      array|boolean
         * @throws      SystemException
         */
        public function compileString($identifier, $sourceContent, array $metaData = [], $isolated = false) {

diff --git a/wcfsetup/install/files/lib/util/ArrayUtil.class.php b/wcfsetup/install/files/lib/util/ArrayUtil.class.php
index 24ebb5f6ca309b9e3f2519a030ab57336214779e..1c10956c9db0690e85f08a3fe49e0fdc0ed42514 100644 (file)
--- a/wcfsetup/install/files/lib/util/ArrayUtil.class.php
+++ b/wcfsetup/install/files/lib/util/ArrayUtil.class.php
@@ -14,9 +14,9 @@ final class ArrayUtil {
        /**
         * Applies StringUtil::trim() to all elements of the given array.
         * 
-        * @param       array           $array
+        * @param       array|string    $array
         * @param       boolean         $removeEmptyElements
-        * @return      array
+        * @return      array|string
         */
        public static function trim($array, $removeEmptyElements = true) {
                if (!is_array($array)) {
@@ -35,8 +35,8 @@ final class ArrayUtil {
        /**
         * Applies intval() to all elements of the given array.
         * 
-        * @param       array           $array
-        * @return      array
+        * @param       array|string    $array
+        * @return      array|string
         */
        public static function toIntegerArray($array) {
                if (!is_array($array)) {
@@ -53,8 +53,8 @@ final class ArrayUtil {
        /**
         * Converts html special characters in the given array.
         * 
-        * @param       array           $array
-        * @return      array
+        * @param       array|string    $array
+        * @return      array|string
         */
        public static function encodeHTML($array) {
                if (!is_array($array)) {
@@ -104,8 +104,8 @@ final class ArrayUtil {
        /**
         * Converts dos to unix newlines.
         * 
-        * @param       array           $array
-        * @return      array
+        * @param       array|string    $array
+        * @return      array|string
         */
        public static function unifyNewlines($array) {
                if (!is_array($array)) {
@@ -125,8 +125,8 @@ final class ArrayUtil {
         * 
         * @param       string          $inCharset
         * @param       string          $outCharset
-        * @param       array           $array
-        * @return      string
+        * @param       array|string    $array
+        * @return      array|string
         */
        public static function convertEncoding($inCharset, $outCharset, $array) {
                if (!is_array($array)) {