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

Use PHP CS Fixer

.github/workflows/php-cs-fixer.yml

@@ -0,0 +1,7 @@
+name: PHP CS Fixer
+
+on: push
+
+jobs:
+  fixers:
+    uses: humhub/actions/.github/workflows/module-php-cs-fixer.yml@main

Events.php

@@ -2,7 +2,6 @@
 
 namespace humhub\modules\fcmPush;
 
-
 use humhub\components\mail\Message;
 use humhub\modules\fcmPush\assets\FcmPushAsset;
 use humhub\modules\fcmPush\assets\FirebaseAsset;
@@ -21,7 +20,6 @@
 
 class Events
 {
-
     private const SESSION_VAR_LOGOUT = 'mobileAppHandleLogout';
     private const SESSION_VAR_LOGIN = 'mobileAppHandleLogin';
 
@@ -133,7 +131,8 @@ public static function onAfterLogin()
         Yii::$app->session->set(self::SESSION_VAR_LOGIN, 1);
     }
 
-    public static function onAuthChoiceBeforeRun(Event $event) {
+    public static function onAuthChoiceBeforeRun(Event $event)
+    {
         /** @var AuthChoice $sender */
         $sender = $event->sender;
 

Module.php

@@ -10,7 +10,6 @@
 
 class Module extends \humhub\components\Module
 {
-
     /**
      * @inheritdoc
      */

commands/SendController.php

@@ -9,7 +9,6 @@
 
 class SendController extends \yii\console\Controller
 {
-
     public function actionSendToUser($userId, $title, $message)
     {
         /** @var Module $module */
@@ -23,7 +22,7 @@ public function actionSendToUser($userId, $title, $message)
             $message,
             null,
             null,
-            null
+            null,
         );
     }
-}
+}

components/NotificationTargetProvider.php

@@ -61,4 +61,4 @@ public function isActive(User $user = null)
 
         return true;
     }
-}
+}

components/SendReport.php

@@ -4,13 +4,13 @@
 
 class SendReport
 {
-    const STATE_SUCCESS = 1;
-    const STATE_ERROR = 2;
+    public const STATE_SUCCESS = 1;
+    public const STATE_ERROR = 2;
 
     public $failedTokens = [];
 
     public function __construct($state, $failedTokens = [])
     {
 
     }
-}
+}

components/UrlRule.php

@@ -1,40 +1,40 @@
-<?php
-/**
- * @link https://www.humhub.org/
- * @copyright Copyright (c) HumHub GmbH & Co. KG
- * @license https://www.humhub.com/licences
- */
-
-namespace humhub\modules\fcmPush\components;
-
-use humhub\modules\fcmPush\services\WellKnownService;
-use yii\base\Component;
-use yii\web\UrlRuleInterface;
-
-class UrlRule extends Component implements UrlRuleInterface
-{
-    /**
-     * @inheritdoc
-     */
-    public function createUrl($manager, $route, $params)
-    {
-        if ($route === trim(WellKnownService::URL_ROUTE, '/') && isset($params['file'])) {
-            return WellKnownService::URL_PREFIX . $params['file'];
-        }
-
-        return false;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function parseRequest($manager, $request)
-    {
-        $path = $request->getPathInfo();
-        if (str_starts_with($path, WellKnownService::URL_PREFIX)) {
-            return WellKnownService::instance($path)->getRuleRoute() ?? false;
-        }
-
-        return false;
-    }
-}
+<?php
+/**
+ * @link https://www.humhub.org/
+ * @copyright Copyright (c) HumHub GmbH & Co. KG
+ * @license https://www.humhub.com/licences
+ */
+
+namespace humhub\modules\fcmPush\components;
+
+use humhub\modules\fcmPush\services\WellKnownService;
+use yii\base\Component;
+use yii\web\UrlRuleInterface;
+
+class UrlRule extends Component implements UrlRuleInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function createUrl($manager, $route, $params)
+    {
+        if ($route === trim(WellKnownService::URL_ROUTE, '/') && isset($params['file'])) {
+            return WellKnownService::URL_PREFIX . $params['file'];
+        }
+
+        return false;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function parseRequest($manager, $request)
+    {
+        $path = $request->getPathInfo();
+        if (str_starts_with($path, WellKnownService::URL_PREFIX)) {
+            return WellKnownService::instance($path)->getRuleRoute() ?? false;
+        }
+
+        return false;
+    }
+}

config.php

@@ -5,7 +5,6 @@
 
 use humhub\modules\fcmPush\Events;
 use humhub\components\Controller;
-
 //use humhub\modules\notification\widgets\NotificationInfoWidget;
 use humhub\modules\user\widgets\AuthChoice;
 use humhub\widgets\LayoutAddons;

controllers/AdminController.php

@@ -13,7 +13,6 @@
  */
 class AdminController extends Controller
 {
-
     public function actionIndex()
     {
 
@@ -27,4 +26,4 @@ public function actionIndex()
         return $this->render('index', ['model' => $model]);
     }
 
-}
+}

controllers/MobileAppController.php

@@ -2,7 +2,6 @@
 
 namespace humhub\modules\fcmPush\controllers;
 
-
 use humhub\modules\admin\components\Controller;
 use humhub\modules\admin\notifications\NewVersionAvailable;
 use humhub\modules\fcmPush\models\FcmUser;
@@ -11,7 +10,6 @@
 
 class MobileAppController extends Controller
 {
-
     /**
      * Renders the index view for the module
      *

controllers/StatusController.php

@@ -15,14 +15,14 @@ class StatusController extends Controller
     public function actionIndex()
     {
         if (!$this->module->isActivated) {
-            return $this->returnStatus(404,'FCM Module is not installed');
+            return $this->returnStatus(404, 'FCM Module is not installed');
         }
 
         if (!$this->module->getDriverService()->hasConfiguredDriver()) {
-            return $this->returnStatus(501,'Push Proxy is not configured');
+            return $this->returnStatus(501, 'Push Proxy is not configured');
         }
 
-        return $this->returnStatus(200,'OK, Push (Proxy) is correctly configured');
+        return $this->returnStatus(200, 'OK, Push (Proxy) is correctly configured');
     }
 
     private function returnStatus(int $code, string $message): Response

controllers/TokenController.php

@@ -40,11 +40,11 @@ public function actionUpdate()
 
         return $this->asJson([
             'success' => (
-            (new TokenService())->storeTokenForUser(
-                Yii::$app->user->getIdentity(),
-                $driver,
-                Yii::$app->request->post('token')
-            )
+                (new TokenService())->storeTokenForUser(
+                    Yii::$app->user->getIdentity(),
+                    $driver,
+                    Yii::$app->request->post('token'),
+                )
             ),
         ]);
     }
@@ -63,11 +63,11 @@ public function actionUpdateMobileApp()
 
         return $this->asJson([
             'success' => (
-            (new TokenService())->storeTokenForUser(
-                Yii::$app->user->getIdentity(),
-                $driver,
-                Yii::$app->request->post('token')
-            )
+                (new TokenService())->storeTokenForUser(
+                    Yii::$app->user->getIdentity(),
+                    $driver,
+                    Yii::$app->request->post('token'),
+                )
             ),
         ]);
     }
@@ -89,9 +89,9 @@ public function actionDeleteMobileApp()
 
         return $this->asJson([
             'success' => (
-            (new TokenService())->deleteToken(
-                Yii::$app->request->post('token')
-            )
+                (new TokenService())->deleteToken(
+                    Yii::$app->request->post('token'),
+                )
             ),
         ]);
     }

docs/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+2.0.8 (Unreleased)
+-------------------------
+- Enh #52: Use PHP CS Fixer
+
 2.0.7 (September 2, 2024)
 -------------------------
 - Fix #48: Fix go service for multiline links

driver/DriverInterface.php

@@ -15,4 +15,4 @@ public function processCloudMessage(array $tokens, string $title, string $body,
     public function getSenderId(): string;
 
     public function isConfigured(): bool;
-}
+}

driver/Fcm.php

@@ -29,7 +29,7 @@ public function processCloudMessage(array $tokens, string $title, string $body,
         if ($this->messaging === null) {
             Module::registerAutoloader();
 
-            $factory = (new Factory)->withServiceAccount($this->config->getJsonAsArray());
+            $factory = (new Factory())->withServiceAccount($this->config->getJsonAsArray());
             $this->messaging = $factory->createMessaging();
         }
 
@@ -67,4 +67,4 @@ public function isConfigured(): bool
     {
         return (!empty($this->config->json) && !empty($this->config->senderId));
     }
-}
+}

driver/FcmLegacy.php

@@ -35,15 +35,15 @@ public function processCloudMessage(array $tokens, string $title, string $body,
                 "title" => $title,
                 "body" => $body,
                 "icon" => SiteIcon::getUrl(180),
-                "click_action" => $url
+                "click_action" => $url,
             ],
             "data" => [
                 "title" => $title,
                 "body" => $body,
                 "icon" => SiteIcon::getUrl(180),
-                "url" => $url
+                "url" => $url,
             ],
-            "registration_ids" => $tokens
+            "registration_ids" => $tokens,
         ];
 
         $response = $this->post('send', $data)->send();
@@ -64,4 +64,4 @@ public function getSenderId(): string
     {
         return $this->config->senderId;
     }
-}
+}

driver/Proxy.php

@@ -38,7 +38,7 @@ public function processCloudMessage(array $tokens, string $title, string $body,
             'imageUrl' => $imageUrl,
             'iconUrl' => SiteIcon::getUrl(180),
             'url' => $url,
-            'notificationCount' => $notificationCount
+            'notificationCount' => $notificationCount,
         ];
 
         $response = $this->post('/push', $data)->send();
@@ -63,4 +63,4 @@ public function getSenderId(): string
 
         return $module->humhubProxySenderId;
     }
-}
+}

helpers/MobileAppHelper.php

@@ -73,7 +73,7 @@ public static function isAppWithCustomFcm(): bool
             Yii::$app->request->headers->has('x-humhub-app-bundle-id') &&
             !str_contains(
                 Yii::$app->request->headers->get('x-humhub-app-bundle-id', '', true),
-                'com.humhub.app'
+                'com.humhub.app',
             )
         );
 

migrations/m190819_210853_initial.php

@@ -17,7 +17,7 @@ public function safeUp()
             'token' => $this->string(255),
             'user_id' => $this->integer()->notNull(),
             'created_at' => $this->dateTime()->defaultValue(new \yii\db\Expression('NOW()')),
-            'updated_at' => $this->dateTime()
+            'updated_at' => $this->dateTime(),
         ]);
 
         $this->addForeignKey('f_user', 'fcmpush_user', 'user_id', 'user', 'id', 'CASCADE', 'CASCADE');

models/FcmUser.php

@@ -19,7 +19,6 @@
  */
 class FcmUser extends ActiveRecord
 {
-
     /**
      * @inheritDoc
      */
@@ -63,4 +62,4 @@ public function getUser()
         return $this->hasOne(User::class, ['id' => 'user_id']);
     }
 
-}
+}

module.json

@@ -11,7 +11,7 @@
     "humhub": {
         "minVersion": "1.14"
     },
-    "version": "2.0.7",
+    "version": "2.0.8",
     "screenshots": [
         "resources/screenshot1.PNG",
         "resources/screenshot2.PNG"

services/DriverService.php

@@ -103,4 +103,4 @@ private function getConfiguredDriverByType(string $class): ?DriverInterface
     }
 
 
-}
+}