Remove explicit return types

See #2508
See #2720

diff --git a/wcfsetup/install/files/lib/data/like/Like.class.php b/wcfsetup/install/files/lib/data/like/Like.class.php
index bb07b36c4f40a1b2492400d98bcfbe6da634fc7d..b9a20fcdad6fa78499caed876b68761c65d0133e 100644 (file)
--- a/wcfsetup/install/files/lib/data/like/Like.class.php
+++ b/wcfsetup/install/files/lib/data/like/Like.class.php
@@ -98,7 +98,7 @@ class Like extends DatabaseObject {
         * @return      ReactionType
         * @since       3.2
         */
-       public function getReactionType(): ReactionType {
+       public function getReactionType() {
                return ReactionTypeCache::getInstance()->getReactionTypeByID($this->reactionTypeID);
        }
 }

diff --git a/wcfsetup/install/files/lib/data/like/object/LikeObject.class.php b/wcfsetup/install/files/lib/data/like/object/LikeObject.class.php
index 23e7c66342025001220f457d00dd74267181c22d..9ac2d813b2de6da98e6c80c7e457e75e9e73c604 100644 (file)
--- a/wcfsetup/install/files/lib/data/like/object/LikeObject.class.php
+++ b/wcfsetup/install/files/lib/data/like/object/LikeObject.class.php
@@ -139,7 +139,7 @@ class LikeObject extends DatabaseObject {
         * @return      integer[]
         * @since       3.2
         */
-       public function getReactions(): array {
+       public function getReactions() {
                return $this->reactions; 
        }
        

diff --git a/wcfsetup/install/files/lib/data/reaction/ReactionAction.class.php b/wcfsetup/install/files/lib/data/reaction/ReactionAction.class.php
index d0ec69c9534ea5c5401ff8b5bce139f91e1d6aaf..21e3ba9dd2de5e3d5b3f33790790a73fa8dba6f2 100644 (file)
--- a/wcfsetup/install/files/lib/data/reaction/ReactionAction.class.php
+++ b/wcfsetup/install/files/lib/data/reaction/ReactionAction.class.php
@@ -81,7 +81,7 @@ class ReactionAction extends AbstractDatabaseObjectAction {
         *
         * @return      string[]
         */
-       public function getReactionDetails(): array {
+       public function getReactionDetails() {
                $likeList = new ViewableLikeList();
                $likeList->getConditionBuilder()->add('objectID = ?', [$this->parameters['data']['objectID']]);
                $likeList->getConditionBuilder()->add('objectTypeID = ?', [$this->objectType->objectTypeID]);
@@ -142,7 +142,7 @@ class ReactionAction extends AbstractDatabaseObjectAction {
         * 
         * @return array
         */
-       public function react(): array {
+       public function react() {
                $reactionData = ReactionHandler::getInstance()->react($this->likeableObject, WCF::getUser(), $this->reactionType->reactionTypeID);
                
                // get stats

diff --git a/wcfsetup/install/files/lib/data/reaction/type/ReactionType.class.php b/wcfsetup/install/files/lib/data/reaction/type/ReactionType.class.php
index 7e64db68eea055b74c98e4355d17e35bed3e8cbb..e2f70b9b6a0283f9f6f0c73c438c870994ae6a9b 100644 (file)
--- a/wcfsetup/install/files/lib/data/reaction/type/ReactionType.class.php
+++ b/wcfsetup/install/files/lib/data/reaction/type/ReactionType.class.php
@@ -47,7 +47,7 @@ class ReactionType extends DatabaseObject implements ITitledObject {
        /**
         * @inheritDoc
         */
-       public function getTitle(): string {
+       public function getTitle() {
                return WCF::getLanguage()->get($this->title);
        }
        
@@ -56,7 +56,7 @@ class ReactionType extends DatabaseObject implements ITitledObject {
         * 
         * @return      string
         */
-       public function renderIcon(): string {
+       public function renderIcon() {
                return WCF::getTPL()->fetch('reactionTypeImage', 'wcf', [
                        'reactionType' => $this
                ], true);
@@ -67,7 +67,7 @@ class ReactionType extends DatabaseObject implements ITitledObject {
         * 
         * @return string
         */
-       public function getIconPath(): string {
+       public function getIconPath() {
                return WCF::getPath() . 'images/reaction/'. $this->iconFile;
        }
        
@@ -76,7 +76,7 @@ class ReactionType extends DatabaseObject implements ITitledObject {
         * 
         * @return      bool
         */
-       public function isPositive(): bool {
+       public function isPositive() {
                return $this->type == self::REACTION_TYPE_POSITIVE;
        }
        
@@ -85,7 +85,7 @@ class ReactionType extends DatabaseObject implements ITitledObject {
         *
         * @return      bool
         */
-       public function isNegative(): bool {
+       public function isNegative() {
                return $this->type == self::REACTION_TYPE_NEGATIVE;
        }
        
@@ -94,7 +94,7 @@ class ReactionType extends DatabaseObject implements ITitledObject {
         *
         * @return      bool
         */
-       public function isNeutral(): bool {
+       public function isNeutral() {
                return $this->type == self::REACTION_TYPE_NEUTRAL;
        }
 }

diff --git a/wcfsetup/install/files/lib/data/reaction/type/ReactionTypeCache.class.php b/wcfsetup/install/files/lib/data/reaction/type/ReactionTypeCache.class.php
index de7269d404d6ca9d76f55efc07bddcdb38ae681e..ea8e0f8c98e0afd851d8ccf7ca13fa2faf5f6cfd 100644 (file)
--- a/wcfsetup/install/files/lib/data/reaction/type/ReactionTypeCache.class.php
+++ b/wcfsetup/install/files/lib/data/reaction/type/ReactionTypeCache.class.php
@@ -53,7 +53,7 @@ class ReactionTypeCache extends SingletonFactory {
         * @param       integer[]       $reactionTypeIDs
         * @return      ReactionType[]
         */
-       public function getReactionTypesByID(array $reactionTypeIDs): array {
+       public function getReactionTypesByID(array $reactionTypeIDs) {
                $returnValues = [];
                
                foreach ($reactionTypeIDs as $reactionType) {
@@ -68,7 +68,7 @@ class ReactionTypeCache extends SingletonFactory {
         *
         * @return      ReactionType[]
         */
-       public function getReactionTypes(): array {
+       public function getReactionTypes() {
                return $this->reactionTypes;
        }
        
@@ -77,7 +77,7 @@ class ReactionTypeCache extends SingletonFactory {
         *
         * @return      ReactionType[]
         */
-       public function getEnabledReactionTypes(): array {
+       public function getEnabledReactionTypes() {
                return $this->enabledReactionTypes;
        }
        

diff --git a/wcfsetup/install/files/lib/system/cache/builder/ReactionTypeCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/ReactionTypeCacheBuilder.class.php
index 566863c2039783114c862ab0c323bc73f5effcca..ecef1f4b15d957f3140d77e1ca28b620b66d3f5a 100644 (file)
--- a/wcfsetup/install/files/lib/system/cache/builder/ReactionTypeCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/ReactionTypeCacheBuilder.class.php
@@ -15,7 +15,7 @@ class ReactionTypeCacheBuilder extends AbstractCacheBuilder {
        /**
         * @inheritDoc
         */
-       public function rebuild(array $parameters): array {
+       public function rebuild(array $parameters) {
                $reactionTypeList = new ReactionTypeList();
                
                if (isset($parameters['onlyEnabled']) && $parameters['onlyEnabled']) {

diff --git a/wcfsetup/install/files/lib/system/reaction/ReactionHandler.class.php b/wcfsetup/install/files/lib/system/reaction/ReactionHandler.class.php
index d547c0598dc97134f8f346675969df246f2c955a..0b220ee0a45a8e5427cc5de3dda082a7b65eed60 100644 (file)
--- a/wcfsetup/install/files/lib/system/reaction/ReactionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/reaction/ReactionHandler.class.php
@@ -61,7 +61,7 @@ class ReactionHandler extends SingletonFactory {
         * 
         * @return string
         */
-       public function getReactionsJSVariable(): string {
+       public function getReactionsJSVariable() {
                $reactions = ReactionTypeCache::getInstance()->getEnabledReactionTypes();
                
                $returnValues = []; 
@@ -103,7 +103,7 @@ class ReactionHandler extends SingletonFactory {
         * @param       integer         $objectID
         * @return      string
         */
-       public function getDataAttributes($objectName, $objectID): string {
+       public function getDataAttributes($objectName, $objectID) {
                $objectType = $this->getObjectType($objectName);
                if ($objectType === null) {
                        throw new \InvalidArgumentException("ObjectName '{$objectName}' is unknown for definition 'com.woltlab.wcf.like.likeableObject'.");
@@ -178,7 +178,7 @@ class ReactionHandler extends SingletonFactory {
         * @param       ObjectType      $objectType
         * @return      LikeObject[]
         */
-       public function getLikeObjects(ObjectType $objectType): array {
+       public function getLikeObjects(ObjectType $objectType) {
                if (isset($this->likeObjectCache[$objectType->objectTypeID])) {
                        return $this->likeObjectCache[$objectType->objectTypeID];
                }
@@ -194,7 +194,7 @@ class ReactionHandler extends SingletonFactory {
         * @param       array           $objectIDs
         * @return      integer
         */
-       public function loadLikeObjects(ObjectType $objectType, array $objectIDs): int {
+       public function loadLikeObjects(ObjectType $objectType, array $objectIDs) {
                if (empty($objectIDs)) {
                        return 0;
                }
@@ -244,7 +244,7 @@ class ReactionHandler extends SingletonFactory {
         * @param       integer         $time
         * @return      array
         */
-       public function react(ILikeObject $likeable, User $user, $reactionTypeID, $time = TIME_NOW): array {
+       public function react(ILikeObject $likeable, User $user, $reactionTypeID, $time = TIME_NOW) {
                // verify if object is already liked by user
                $like = Like::getLike($likeable->getObjectType()->objectTypeID, $likeable->getObjectID(), $user->userID);
                
@@ -350,7 +350,7 @@ class ReactionHandler extends SingletonFactory {
         * @param       ReactionType    $reactionType
         * @return      array
         */
-       private function updateLikeObject(ILikeObject $likeable, LikeObject $likeObject, Like $like, ReactionType $reactionType): array {
+       private function updateLikeObject(ILikeObject $likeable, LikeObject $likeObject, Like $like, ReactionType $reactionType) {
                // update existing object
                if ($likeObject->likeObjectID) {
                        $likes = $likeObject->likes;
@@ -495,7 +495,7 @@ class ReactionHandler extends SingletonFactory {
         * @param       User            $user
         * @return      array
         */
-       public function revertReact(Like $like, ILikeObject $likeable, LikeObject $likeObject, User $user): array {
+       public function revertReact(Like $like, ILikeObject $likeable, LikeObject $likeObject, User $user) {
                if (!$like->likeID) {
                        throw new \InvalidArgumentException('The given parameter $like is invalid.');
                }
@@ -550,7 +550,7 @@ class ReactionHandler extends SingletonFactory {
         * @param       Like            $like
         * @return      array
         */
-       private function revertLikeObject(LikeObject $likeObject, Like $like): array {
+       private function revertLikeObject(LikeObject $likeObject, Like $like) {
                if (!$likeObject->likeObjectID) {
                        throw new \InvalidArgumentException('The given parameter $likeObject is invalid.');
                }

diff --git a/wcfsetup/install/files/lib/system/user/notification/event/TReactionUserNotificationEvent.class.php b/wcfsetup/install/files/lib/system/user/notification/event/TReactionUserNotificationEvent.class.php
index d71a22f61ec1913fe00d62de5150a6108823b8b1..7e9c0f2311b8ac297fe3a389af43013d6e185717 100644 (file)
--- a/wcfsetup/install/files/lib/system/user/notification/event/TReactionUserNotificationEvent.class.php
+++ b/wcfsetup/install/files/lib/system/user/notification/event/TReactionUserNotificationEvent.class.php
@@ -29,7 +29,7 @@ trait TReactionUserNotificationEvent {
         *
         * @return int[] 
         */
-       protected final function getReactionsForAuthors(): array {
+       protected final function getReactionsForAuthors() {
                if ($this->cachedReactions !== null) {
                        return $this->cachedReactions; 
                }