Merge pull request #223 from humhub/rector/auto-update

luke- · web-flow · commit 54b6830c6383 · 2025-11-07T16:17:53.000+01:00
chore: automated Rector updates
diff --git a/Events.php b/Events.php
@@ -43,7 +43,7 @@ public static function onBeforeRequest($event)
     {
 
         // Only prepare if API request
-        if (substr(Yii::$app->request->pathInfo, 0, 4) != 'api/') {
+        if (!str_starts_with(Yii::$app->request->pathInfo, 'api/')) {
             return;
         }
 
@@ -192,72 +192,42 @@ public static function onLegalModuleUserDataExport(UserDataCollectionEvent $even
     {
         $event->addExportData('user', UserDefinitions::getUser($event->user));
 
-        $event->addExportData('password', array_map(function ($password) {
-            return UserDefinitions::getPassword($password);
-        }, Password::findAll(['user_id' => $event->user->id])));
+        $event->addExportData('password', array_map(UserDefinitions::getPassword(...), Password::findAll(['user_id' => $event->user->id])));
 
-        $event->addExportData('friendship', array_map(function ($friendship) {
-            return UserDefinitions::getFriendship($friendship);
-        }, Friendship::findAll(['user_id' => $event->user->id])));
+        $event->addExportData('friendship', array_map(UserDefinitions::getFriendship(...), Friendship::findAll(['user_id' => $event->user->id])));
 
-        $event->addExportData('mentioning', array_map(function ($mentioning) {
-            return UserDefinitions::getMentioning($mentioning);
-        }, Mentioning::findAll(['user_id' => $event->user->id])));
+        $event->addExportData('mentioning', array_map(UserDefinitions::getMentioning(...), Mentioning::findAll(['user_id' => $event->user->id])));
 
-        $event->addExportData('user-follow', array_map(function ($follow) {
-            return UserDefinitions::getUserFollow($follow);
-        }, Follow::findAll(['user_id' => $event->user->id])));
+        $event->addExportData('user-follow', array_map(UserDefinitions::getUserFollow(...), Follow::findAll(['user_id' => $event->user->id])));
 
-        $event->addExportData('auth', array_map(function ($auth) {
-            return UserDefinitions::getUserAuth($auth);
-        }, Auth::findAll(['user_id' => $event->user->id])));
+        $event->addExportData('auth', array_map(UserDefinitions::getUserAuth(...), Auth::findAll(['user_id' => $event->user->id])));
 
-        $event->addExportData('group', array_map(function ($group) {
-            return UserDefinitions::getGroup($group);
-        }, Group::find()
+        $event->addExportData('group', array_map(UserDefinitions::getGroup(...), Group::find()
             ->innerJoin('group_user', 'group_user.group_id = group.id')
             ->where(['group_user.user_id' => $event->user->id])
             ->all()));
 
-        $event->addExportData('post', array_map(function ($post) {
-            return PostDefinitions::getPost($post);
-        }, Post::findAll(['created_by' => $event->user->id])));
+        $event->addExportData('post', array_map(PostDefinitions::getPost(...), Post::findAll(['created_by' => $event->user->id])));
 
-        $event->addExportData('comment', array_map(function ($comment) {
-            return CommentDefinitions::getComment($comment);
-        }, Comment::findAll(['created_by' => $event->user->id])));
+        $event->addExportData('comment', array_map(CommentDefinitions::getComment(...), Comment::findAll(['created_by' => $event->user->id])));
 
-        $event->addExportData('like', array_map(function ($like) {
-            return LikeDefinitions::getLike($like);
-        }, Like::findAll(['created_by' => $event->user->id])));
+        $event->addExportData('like', array_map(LikeDefinitions::getLike(...), Like::findAll(['created_by' => $event->user->id])));
 
-        $event->addExportData('activity', array_map(function ($activity) {
-            return ActivityDefinitions::getActivity($activity);
-        }, Activity::find()
+        $event->addExportData('activity', array_map(ActivityDefinitions::getActivity(...), Activity::find()
             ->innerJoin('content', 'activity.id = content.object_id and content.object_model = :activityClass', ['activityClass' => Activity::class])
             ->where(['created_by' => $event->user->id])
             ->all()));
 
-        $event->addExportData('invite', array_map(function ($invite) {
-            return InviteDefinitions::getInvite($invite);
-        }, Invite::findAll(['created_by' => $event->user->id])));
+        $event->addExportData('invite', array_map(InviteDefinitions::getInvite(...), Invite::findAll(['created_by' => $event->user->id])));
 
-        $event->addExportData('notification', array_map(function ($notification) {
-            return NotificationDefinitions::getNotification($notification);
-        }, Notification::findAll(['user_id' => $event->user->id])));
+        $event->addExportData('notification', array_map(NotificationDefinitions::getNotification(...), Notification::findAll(['user_id' => $event->user->id])));
 
-        $event->addExportData('space', array_map(function ($space) {
-            return SpaceDefinitions::getSpace($space);
-        }, Space::findAll(['created_by' => $event->user->id])));
+        $event->addExportData('space', array_map(SpaceDefinitions::getSpace(...), Space::findAll(['created_by' => $event->user->id])));
 
-        $event->addExportData('space-membership', array_map(function ($membership) {
-            return SpaceDefinitions::getSpaceMembership($membership);
-        }, Membership::findAll(['user_id' => $event->user->id])));
+        $event->addExportData('space-membership', array_map(SpaceDefinitions::getSpaceMembership(...), Membership::findAll(['user_id' => $event->user->id])));
 
         $files = File::findAll(['created_by' => $event->user->id]);
-        $event->addExportData('file', array_map(function ($file) {
-            return FileDefinitions::getFile($file);
-        }, $files));
+        $event->addExportData('file', array_map(FileDefinitions::getFile(...), $files));
 
         foreach ($files as $file) {
             $event->addExportFile($file->file_name, $file->store->get());
diff --git a/Module.php b/Module.php
@@ -106,7 +106,7 @@ public function isActiveModule($moduleId)
 
     public function beforeAction($action)
     {
-        Yii::$app->on('twofa.beforeCheck', function (Event $event) use ($action) {
+        Yii::$app->on('twofa.beforeCheck', function (Event $event) use ($action): void {
             $event->handled = $action->controller->id !== 'admin-user';
         });
 
diff --git a/components/auth/JwtAuth.php b/components/auth/JwtAuth.php
@@ -33,7 +33,7 @@ public function authenticate($user, $request, $response)
                 ) {
                     return $identity;
                 }
-            } catch (Exception $e) {
+            } catch (Exception) {
                 return null;
             }
         }
diff --git a/controllers/content/ContentController.php b/controllers/content/ContentController.php
@@ -24,13 +24,10 @@ public function actionFindByContainer($id, $orderBy = 'creationTime', $dateUpdat
             return $this->returnError(404, 'Content container not found!');
         }
 
-        switch ($orderBy) {
-            case 'lastUpdate':
-                $orderByColumn = 'updated_at';
-                break;
-            default:
-                $orderByColumn = 'created_at';
-        }
+        $orderByColumn = match ($orderBy) {
+            'lastUpdate' => 'updated_at',
+            default => 'created_at',
+        };
 
         $results = [];
         $query = (new ActiveQueryContent(Content::class))
@@ -41,14 +38,14 @@ public function actionFindByContainer($id, $orderBy = 'creationTime', $dateUpdat
             ->readable();
 
         if (!empty($dateUpdatedFrom)) {
-            $dateUpdatedFrom = is_numeric($dateUpdatedFrom) ? (int) $dateUpdatedFrom : strtotime($dateUpdatedFrom);
+            $dateUpdatedFrom = is_numeric($dateUpdatedFrom) ? (int) $dateUpdatedFrom : strtotime((string) $dateUpdatedFrom);
             $query->andWhere([
                 '>=', Content::tableName() . '.updated_at', date('Y-m-d H:i:s', $dateUpdatedFrom),
             ]);
         }
 
         if (!empty($dateUpdatedTo)) {
-            $dateUpdatedTo = is_numeric($dateUpdatedTo) ? (int) $dateUpdatedTo : strtotime($dateUpdatedTo);
+            $dateUpdatedTo = is_numeric($dateUpdatedTo) ? (int) $dateUpdatedTo : strtotime((string) $dateUpdatedTo);
             $query->andWhere([
                 '<=', Content::tableName() . '.updated_at', date('Y-m-d H:i:s', $dateUpdatedTo),
             ]);
diff --git a/controllers/user/InviteController.php b/controllers/user/InviteController.php
@@ -64,9 +64,7 @@ public function actionList()
 
         $pagination = $this->handlePagination($query, 10);
 
-        $results = ArrayHelper::getColumn($query->all(), function (Invite $invite) {
-            return InviteDefinitions::getInvite($invite);
-        });
+        $results = ArrayHelper::getColumn($query->all(), InviteDefinitions::getInvite(...));
 
         return $this->returnPagination($query, $pagination, $results);
     }
diff --git a/definitions/CommentDefinitions.php b/definitions/CommentDefinitions.php
@@ -22,7 +22,7 @@ public static function getCommentsSummary(ActiveRecord $record)
     {
         $result = [];
 
-        $model = get_class($record);
+        $model = $record::class;
         $pk = $record->getPrimaryKey();
         if ($record instanceof Content) {
             $model = $record->object_model;
diff --git a/definitions/ContentDefinitions.php b/definitions/ContentDefinitions.php
@@ -92,7 +92,7 @@ public static function handleTopicsParam(ActiveQueryContent $query, $contentCont
         $topicsParam = Yii::$app->request->get('topics');
         if (!empty($topicsParam)) {
             $topics = [];
-            foreach (explode(',', $topicsParam) as $topicName) {
+            foreach (explode(',', (string) $topicsParam) as $topicName) {
                 $topic = Topic::findOne(['contentcontainer_id' => $contentContainerId, 'name' => $topicName]);
                 if ($topic !== null) {
                     $topics[] = $topic;
diff --git a/definitions/FileDefinitions.php b/definitions/FileDefinitions.php
@@ -27,9 +27,7 @@ public static function getFiles(ActiveRecord $record)
             $record = $record->getPolymorphicRelation();
         }
 
-        return array_map(function ($v) {
-            return static::getFile($v);
-        }, $record->fileManager->findAll());
+        return array_map(static::getFile(...), $record->fileManager->findAll());
     }
 
 
diff --git a/definitions/LikeDefinitions.php b/definitions/LikeDefinitions.php
@@ -22,7 +22,7 @@ public static function getLikesSummary(ActiveRecord $record)
     {
         $result = [];
 
-        $model = get_class($record);
+        $model = $record::class;
         $pk = $record->getPrimaryKey();
         if ($record instanceof Content) {
             $model = $record->object_model;
diff --git a/definitions/NotificationDefinitions.php b/definitions/NotificationDefinitions.php
@@ -18,7 +18,7 @@ public static function getNotification(Notification $notification)
 
         return [
             'id' => $notification->id,
-            'class' => get_class($baseNotification),
+            'class' => $baseNotification::class,
             'output' => $baseNotification->html(),
             'originator' => UserDefinitions::getUserShort($baseNotification->originator),
             'source' => SourceDefinitions::getSource($baseNotification->source),
diff --git a/definitions/SourceDefinitions.php b/definitions/SourceDefinitions.php
@@ -18,17 +18,12 @@ class SourceDefinitions
 {
     public static function getSource($source)
     {
-        switch (true) {
-            case $source instanceof Space:
-                return SpaceDefinitions::getSpaceShort($source);
-            case $source instanceof Post:
-                return PostDefinitions::getPost($source);
-            case $source instanceof Comment:
-                return CommentDefinitions::getComment($source);
-            case $source instanceof Like:
-                return LikeDefinitions::getLike($source);
-        }
-
-        return get_class($source) . ' definitions are not yet supported.';
+        return match (true) {
+            $source instanceof Space => SpaceDefinitions::getSpaceShort($source),
+            $source instanceof Post => PostDefinitions::getPost($source),
+            $source instanceof Comment => CommentDefinitions::getComment($source),
+            $source instanceof Like => LikeDefinitions::getLike($source),
+            default => $source::class . ' definitions are not yet supported.',
+        };
     }
 }
diff --git a/models/ImpersonateAuthToken.php b/models/ImpersonateAuthToken.php
@@ -35,12 +35,8 @@ public function rules()
             [['user_id'], 'required'],
             [['user_id'], 'unique'],
             [['user_id'], 'exist', 'targetRelation' => 'user', 'targetAttribute' => 'id'],
-            [['expiration'], 'default', 'value' => function () {
-                return new Expression('DATE_ADD(NOW(), INTERVAL 30 MINUTE)');
-            }],
-            [['token'], 'default', 'value' => function () {
-                return 'impersonated-' . Yii::$app->security->generateRandomString(73);
-            }],
+            [['expiration'], 'default', 'value' => fn() => new Expression('DATE_ADD(NOW(), INTERVAL 30 MINUTE)')],
+            [['token'], 'default', 'value' => fn() => 'impersonated-' . Yii::$app->security->generateRandomString(73)],
         ];
     }
 
diff --git a/tests/codeception/api/AuthCest.php b/tests/codeception/api/AuthCest.php
@@ -49,7 +49,7 @@ public function testLoginByJwtBearerToken(ApiTester $I)
 
         $I->sendPost('auth/login', ['username' => 'User3', 'password' => 'user^humhub@PASS%worD!']);
         $I->seeSuccessMessage('Success');
-        list($auth_token) = $I->grabDataFromResponseByJsonPath('auth_token');
+        [$auth_token] = $I->grabDataFromResponseByJsonPath('auth_token');
 
         $I->sendGet('auth/current');
         $I->seeCodeResponseContainsJson(HttpCode::UNAUTHORIZED, ['message' => 'Your request was made with invalid credentials.']);
diff --git a/views/admin/bearer-auth.php b/views/admin/bearer-auth.php
@@ -41,9 +41,7 @@
                 ],
                 [
                     'attribute' => 'token',
-                    'value' => function () {
-                        return str_repeat('*', 30);
-                    }
+                    'value' => fn() => str_repeat('*', 30)
                 ],
                 'expiration:datetime',
                 [
@@ -53,12 +51,10 @@
                         'update' => false,
                     ],
                     'buttons' => [
-                        'delete' => function ($url, $model, $id) {
-                            return Button::danger()
-                                ->link(['revoke-access-token', 'id' => $id])
-                                ->icon('trash')
-                                ->sm();
-                        },
+                        'delete' => fn($url, $model, $id) => Button::danger()
+                            ->link(['revoke-access-token', 'id' => $id])
+                            ->icon('trash')
+                            ->sm(),
                     ],
                 ],
             ],

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function isActiveModule($moduleId)`
`106`	`106`
`107`	`107`	`public function beforeAction($action)`
`108`	`108`	`{`
`109`		`- Yii::$app->on('twofa.beforeCheck', function (Event $event) use ($action) {`
	`109`	`+ Yii::$app->on('twofa.beforeCheck', function (Event $event) use ($action): void {`
`110`	`110`	`$event->handled = $action->controller->id !== 'admin-user';`
`111`	`111`	`});`
`112`	`112`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function authenticate($user, $request, $response)`
`33`	`33`	`) {`
`34`	`34`	`return $identity;`
`35`	`35`	`}`
`36`		`- } catch (Exception $e) {`
	`36`	`+ } catch (Exception) {`
`37`	`37`	`return null;`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,7 @@ public function actionList()`
`64`	`64`
`65`	`65`	`$pagination = $this->handlePagination($query, 10);`
`66`	`66`
`67`		`- $results = ArrayHelper::getColumn($query->all(), function (Invite $invite) {`
`68`		`- return InviteDefinitions::getInvite($invite);`
`69`		`- });`
	`67`	`+ $results = ArrayHelper::getColumn($query->all(), InviteDefinitions::getInvite(...));`
`70`	`68`
`71`	`69`	`return $this->returnPagination($query, $pagination, $results);`
`72`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public static function getCommentsSummary(ActiveRecord $record)`
`22`	`22`	`{`
`23`	`23`	`$result = [];`
`24`	`24`
`25`		`- $model = get_class($record);`
	`25`	`+ $model = $record::class;`
`26`	`26`	`$pk = $record->getPrimaryKey();`
`27`	`27`	`if ($record instanceof Content) {`
`28`	`28`	`$model = $record->object_model;`
Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,7 @@ public static function getFiles(ActiveRecord $record)`
`27`	`27`	`$record = $record->getPolymorphicRelation();`
`28`	`28`	`}`
`29`	`29`
`30`		`- return array_map(function ($v) {`
`31`		`- return static::getFile($v);`
`32`		`- }, $record->fileManager->findAll());`
	`30`	`+ return array_map(static::getFile(...), $record->fileManager->findAll());`
`33`	`31`	`}`
`34`	`32`
`35`	`33`