Merge pull request #182 from humhub/enh/php-cs-fixer

Use PHP CS Fixer
humhub · Oct 8, 2024 · 049d673 · 049d673
2 parents f4f1b1e + 7ce2394
commit 049d673
Show file tree

Hide file tree

Showing 62 changed files with 129 additions and 153 deletions.
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -0,0 +1,7 @@
+name: PHP CS Fixer
+
+on: push
+
+jobs:
+  tests:
+    uses: humhub/actions/.github/workflows/module-php-cs-fixer.yml@main
diff --git a/Module.php b/Module.php
@@ -14,16 +14,15 @@
 
 class Module extends BaseModule
 {
-
     /**
      * @event triggered before a request (inside event Application::EVENT_BEFORE_REQUEST of this Module)
      */
-    const EVENT_REST_API_ADD_RULES = 'restApiAddRules';
+    public const EVENT_REST_API_ADD_RULES = 'restApiAddRules';
 
     /**
      * @var string Prefix for REST API endpoint URLs
      */
-    const API_URL_PREFIX = 'api/v1/';
+    public const API_URL_PREFIX = 'api/v1/';
 
     /**
      * @inheritdoc

diff --git a/components/BaseContentController.php b/components/BaseContentController.php
@@ -25,7 +25,6 @@
 use yii\web\HttpException;
 use yii\web\UploadedFile;
 
-
 /**
  * BaseContentController provides basic CRUD operations for HumHub content records
  *
@@ -90,7 +89,7 @@ public function actionFind()
     /**
      * Finds content by given container
      *
-     * @param integer $containerId the id of the content container
+     * @param int $containerId the id of the content container
      * @return array the rest output
      * @throws \yii\db\IntegrityException
      */
@@ -504,9 +503,9 @@ protected function updateScheduledAt(ContentActiveRecord $activeRecord, array $d
         }
 
         $validator = DynamicModel::validateData([
-            'scheduled_at' => $data['scheduled_at']
+            'scheduled_at' => $data['scheduled_at'],
         ], [
-            ['scheduled_at', 'datetime', 'format' => 'php:Y-m-d H:i:s']
+            ['scheduled_at', 'datetime', 'format' => 'php:Y-m-d H:i:s'],
         ]);
 
         if (!$validator->validate()) {
@@ -527,9 +526,9 @@ public function updateCreatedAt(ContentActiveRecord $activeRecord, array $data):
         }
 
         $validator = DynamicModel::validateData([
-            'created_at' => $data['created_at']
+            'created_at' => $data['created_at'],
         ], [
-            ['created_at', 'datetime', 'format' => 'php:Y-m-d H:i:s']
+            ['created_at', 'datetime', 'format' => 'php:Y-m-d H:i:s'],
         ]);
 
         if (!$validator->validate()) {

diff --git a/components/BaseController.php b/components/BaseController.php
@@ -69,7 +69,7 @@ public function behaviors()
                     ]] : [],
                     ConfigureForm::getInstance()->enableBasicAuth ? [[
                         'class' => HttpBasicAuth::class,
-                        'auth' => function($username, $password) {
+                        'auth' => function ($username, $password) {
                             if (($identity = AuthController::authByUserAndPassword($username, $password)) && $this->isUserEnabled($identity)) {
                                 return $identity;
                             }
@@ -79,12 +79,12 @@ public function behaviors()
                     ]] : [],
                     [[
                         'class' => ImpersonateAuth::class,
-                    ]]
+                    ]],
                 ),
             ],
             'languagePicker' => [
                 'class' => LanguagePickerBehavior::class,
-            ]
+            ],
         ], parent::behaviors());
     }
 

diff --git a/components/auth/JwtAuth.php b/components/auth/JwtAuth.php
@@ -20,7 +20,7 @@ public function authenticate($user, $request, $response)
     {
         $authHeader = $request->getHeaders()->get($this->header);
 
-        if ($request->getHeaders()->get($this->header) &&$this->pattern !== null && preg_match($this->pattern, $authHeader, $matches)) {
+        if ($request->getHeaders()->get($this->header) && $this->pattern !== null && preg_match($this->pattern, $authHeader, $matches)) {
             $token = $matches[1];
 
             try {

diff --git a/controllers/AdminController.php b/controllers/AdminController.php
@@ -37,7 +37,7 @@ public function actionIndex()
         return $this->render('tabs', [
             'tab' => $this->renderPartial('index', [
                 'model' => $model,
-            ])
+            ]),
         ]);
     }
 
@@ -54,7 +54,7 @@ public function actionJwtAuth()
         return $this->render('tabs', [
             'tab' => $this->renderPartial('jwt-auth', [
                 'model' => $model,
-            ])
+            ]),
         ]);
     }
 
@@ -72,19 +72,19 @@ public function actionBearerAuth()
                 'bearerTokenModel' => $bearerTokenModel,
                 'bearerTokensProvider' => new ActiveDataProvider([
                     'query' => RestUserBearerToken::find()->with('user'),
-                    'sort'=> [
-                        'defaultOrder' => ['id' => SORT_ASC]
+                    'sort' => [
+                        'defaultOrder' => ['id' => SORT_ASC],
                     ],
-                ])
-            ])
+                ]),
+            ]),
         ]);
     }
 
     public function actionRevokeAccessToken($id)
     {
         RestUserBearerToken::deleteAll(['id' => $id]);
 
-        $this->view->success(Yii::t('RestModule.base','Bearer Access Token Successfully Revoked'));
+        $this->view->success(Yii::t('RestModule.base', 'Bearer Access Token Successfully Revoked'));
 
         return $this->redirect(['bearer-auth']);
     }

diff --git a/controllers/ErrorController.php b/controllers/ErrorController.php
@@ -6,8 +6,8 @@
  */
 
 namespace humhub\modules\rest\controllers;
-use humhub\modules\rest\components\BaseController;
 
+use humhub\modules\rest\components\BaseController;
 
 /**
  * Class ErrorController
@@ -18,4 +18,4 @@ public function actionNotfound()
     {
         return $this->returnError(404, 'Requested action not found!');
     }
-}
+}
diff --git a/controllers/activity/ActivityController.php b/controllers/activity/ActivityController.php
@@ -61,4 +61,4 @@ public function actionFindByContainer($containerId)
         }
         return $this->returnPagination($query, $pagination, $results);
     }
-}
+}
diff --git a/controllers/auth/AuthController.php b/controllers/auth/AuthController.php
@@ -53,7 +53,7 @@ public function actionIndex()
             'iss' => Yii::$app->settings->get('baseUrl'),
             'nbf' => $issuedAt,
             'uid' => $user->id,
-            'email' => $user->email
+            'email' => $user->email,
         ];
 
         $config = JwtAuthForm::getInstance();
@@ -65,14 +65,14 @@ public function actionIndex()
 
         return $this->returnSuccess('Success', 200, [
             'auth_token' => $jwt,
-            'expired_at' => (!isset($data['exp'])) ? 0 : $data['exp']
+            'expired_at' => (!isset($data['exp'])) ? 0 : $data['exp'],
         ]);
     }
 
 
     public static function authByUserAndPassword($username, $password)
     {
-        $login = new Login;
+        $login = new Login();
         if (!$login->load(['username' => $username, 'password' => $password], '') || !$login->validate()) {
             return null;
         }

diff --git a/controllers/comment/CommentController.php b/controllers/comment/CommentController.php
@@ -107,7 +107,7 @@ public function actionFindByObject($objectModel, $objectId)
     {
         $content = Content::findOne([
             'object_model' => $objectModel,
-            'object_id' => $objectId
+            'object_id' => $objectId,
         ]);
 
         return $this->getPagedComments($content);
@@ -175,4 +175,4 @@ public function getObject()
         return $this->_object;
     }
 
-}
+}
diff --git a/controllers/content/ContainerController.php b/controllers/content/ContainerController.php
@@ -11,10 +11,8 @@
 use humhub\modules\rest\definitions\ContentDefinitions;
 use humhub\modules\content\models\ContentContainer;
 
-
 class ContainerController extends BaseController
 {
-
     public function actionList()
     {
         $results = [];
@@ -30,4 +28,4 @@ public function actionList()
 
 
 
-}
+}
diff --git a/controllers/content/ContentController.php b/controllers/content/ContentController.php
@@ -14,10 +14,8 @@
 use humhub\modules\rest\definitions\ContentDefinitions;
 use humhub\modules\content\models\Content;
 
-
 class ContentController extends BaseController
 {
-
     public function actionFindByContainer($id, $orderBy = 'creationTime', $dateUpdatedFrom = null, $dateUpdatedTo = null)
     {
         $contentContainer = ContentContainer::findOne(['id' => (int) $id]);
@@ -41,17 +39,17 @@ public function actionFindByContainer($id, $orderBy = 'creationTime', $dateUpdat
             ->orderBy([Content::tableName() . '.' . $orderByColumn => SORT_DESC])
             ->readable();
 
-        if(!empty($dateUpdatedFrom)) {
+        if (!empty($dateUpdatedFrom)) {
             $dateUpdatedFrom = is_numeric($dateUpdatedFrom) ? (int) $dateUpdatedFrom : strtotime($dateUpdatedFrom);
             $query->andWhere([
-                '>=', Content::tableName() . '.updated_at', date('Y-m-d H:i:s', $dateUpdatedFrom)
+                '>=', Content::tableName() . '.updated_at', date('Y-m-d H:i:s', $dateUpdatedFrom),
             ]);
         }
 
-        if(!empty($dateUpdatedTo)) {
+        if (!empty($dateUpdatedTo)) {
             $dateUpdatedTo = is_numeric($dateUpdatedTo) ? (int) $dateUpdatedTo : strtotime($dateUpdatedTo);
             $query->andWhere([
-                '<=', Content::tableName() . '.updated_at', date('Y-m-d H:i:s', $dateUpdatedTo)
+                '<=', Content::tableName() . '.updated_at', date('Y-m-d H:i:s', $dateUpdatedTo),
             ]);
         }
 

diff --git a/controllers/file/FileController.php b/controllers/file/FileController.php
@@ -14,7 +14,6 @@
 
 class FileController extends BaseController
 {
-
     public function actionDownload($id)
     {
         $file = File::findOne(['id' => $id]);
@@ -40,4 +39,4 @@ public function actionDownload($id)
         }
     }
 
-}
+}
diff --git a/controllers/like/LikeController.php b/controllers/like/LikeController.php
@@ -13,10 +13,8 @@
 use humhub\modules\like\models\Like;
 use Yii;
 
-
 class LikeController extends BaseController
 {
-
     public function actionFindByObject()
     {
         $contentFilter = [
@@ -76,4 +74,4 @@ public function actionDelete($id)
     }
 
 
-}
+}
diff --git a/controllers/notification/NotificationController.php b/controllers/notification/NotificationController.php
@@ -68,4 +68,4 @@ public function actionMarkAsSeen()
 
         return $this->returnSuccess('All notifications successfully marked as seen');
     }
-}
+}
diff --git a/controllers/post/PostController.php b/controllers/post/PostController.php
@@ -7,13 +7,11 @@
 
 namespace humhub\modules\rest\controllers\post;
 
-
 use humhub\modules\content\components\ContentActiveRecord;
 use humhub\modules\post\models\Post;
 use humhub\modules\rest\components\BaseContentController;
 use humhub\modules\rest\definitions\PostDefinitions;
 
-
 class PostController extends BaseContentController
 {
     /**
@@ -33,4 +31,4 @@ public function returnContentDefinition(ContentActiveRecord $contentRecord)
         $post = Post::findOne(['id' => $contentRecord->id]);
         return PostDefinitions::getPost($post);
     }
-}
+}
diff --git a/controllers/space/ArchiveController.php b/controllers/space/ArchiveController.php
@@ -65,4 +65,4 @@ public function actionUnarchive($id)
 
         return $this->returnSuccess('Space successfully unarchived!');
     }
-}
+}
diff --git a/controllers/space/MembershipController.php b/controllers/space/MembershipController.php
@@ -106,4 +106,4 @@ public function actionRole($spaceId, $userId)
 
         return $this->returnSuccess('Member updated!');
     }
-}
+}
diff --git a/controllers/space/SpaceController.php b/controllers/space/SpaceController.php
@@ -20,7 +20,6 @@
  */
 class SpaceController extends BaseController
 {
-
     public function actionIndex()
     {
         $results = [];
@@ -50,7 +49,7 @@ public function actionView($id)
 
     public function actionCreate()
     {
-        if (!Yii::$app->user->permissionmanager->can(new CreatePublicSpace) && !Yii::$app->user->permissionmanager->can(new CreatePrivateSpace)) {
+        if (!Yii::$app->user->permissionmanager->can(new CreatePublicSpace()) && !Yii::$app->user->permissionmanager->can(new CreatePrivateSpace())) {
             return $this->returnError(403, 'You are not allowed to create spaces!');
         }
 
@@ -136,4 +135,4 @@ public function actionDelete($id)
 
         return $this->returnError(500, 'Internal error while delete space!');
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,4 +61,4 @@ public function actionFindByContainer($containerId) @@
             }
             return $this->returnPagination($query, $pagination, $results);
         }
-    }
+    }