Use PHP CS Fixer

.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

Events.php

@@ -379,7 +379,7 @@ public static function onCronRun($event)
             } catch (\Throwable $e) {
                 Yii::error($e);
                 $controller->stdout('error.' . PHP_EOL, Console::FG_RED);
-                $controller->stderr("\n".$e->getTraceAsString()."\n", Console::BOLD);
+                $controller->stderr("\n" . $e->getTraceAsString() . "\n", Console::BOLD);
             }
             $module->settings->set('lastReminderRunTS', time());
         }

activities/ResponseAttend.php

@@ -19,7 +19,6 @@
  */
 class ResponseAttend extends BaseActivity implements ConfigurableActivityInterface
 {
-
     public $viewName = 'response_attend';
     public $moduleId = 'calendar';
 

activities/ResponseDeclined.php

@@ -19,7 +19,6 @@
  */
 class ResponseDeclined extends BaseActivity implements ConfigurableActivityInterface
 {
-
     public $viewName = 'response_declined';
     public $moduleId = 'calendar';
 

activities/ResponseInvited.php

@@ -19,7 +19,6 @@
  */
 class ResponseInvited extends BaseActivity implements ConfigurableActivityInterface
 {
-
     public $viewName = 'response_invited';
     public $moduleId = 'calendar';
 

assets/CalendarAsset.php

@@ -17,18 +17,18 @@ class CalendarAsset extends AssetBundle
     public $defer = true;
 
     public $publishOptions = [
-        'forceCopy' => false
+        'forceCopy' => false,
     ];
-    
+
     public $sourcePath = '@calendar/resources/js';
 
     public $js = [
-        'humhub.calendar.Calendar.min.js'
+        'humhub.calendar.Calendar.min.js',
     ];
 
     public $depends = [
         FullCalendarAssets::class,
-        CalendarBaseAssets::class
+        CalendarBaseAssets::class,
     ];
 
     /**
@@ -44,7 +44,7 @@ public static function register($view)
                 'button.week' => Yii::t('CalendarModule.calendar', 'Week'),
                 'button.day' => Yii::t('CalendarModule.calendar', 'Day'),
                 'button.list' => Yii::t('CalendarModule.calendar', 'List'),
-            ]
+            ],
         ]);
         return parent::register($view);
     }

assets/CalendarBaseAssets.php

@@ -15,16 +15,16 @@ class CalendarBaseAssets extends AssetBundle
     public $defer = true;
 
     public $publishOptions = [
-        'forceCopy' => false
+        'forceCopy' => false,
     ];
-    
+
     public $sourcePath = '@calendar/resources';
 
     public $css = [
         'css/calendar.min.css',
     ];
 
     public $js = [
-        'js/humhub.calendar.min.js'
+        'js/humhub.calendar.min.js',
     ];
 }

assets/FullCalendarAssets.php

@@ -15,7 +15,7 @@ class FullCalendarAssets extends AssetBundle
     public $defer = true;
 
     public $publishOptions = ['forceCopy' => false];
-    
+
     public $sourcePath = '@calendar/resources';
 
     public $css = ['css/fullcalendar.bundle.min.css'];

assets/ParticipationFormAssets.php

@@ -17,7 +17,7 @@ class ParticipationFormAssets extends AssetBundle
      * @inheritdoc
      */
     public $publishOptions = [
-        'forceCopy' => false
+        'forceCopy' => false,
     ];
 
     /**

assets/RecurrenceFormAssets.php

@@ -15,9 +15,9 @@ class RecurrenceFormAssets extends AssetBundle
     public $defer = true;
 
     public $publishOptions = [
-        'forceCopy' => false
+        'forceCopy' => false,
     ];
-    
+
     public $sourcePath = '@calendar/resources';
 
     public $js = [

assets/ReminderFormAssets.php

@@ -15,9 +15,9 @@ class ReminderFormAssets extends AssetBundle
     public $defer = true;
 
     public $publishOptions = [
-        'forceCopy' => false
+        'forceCopy' => false,
     ];
-    
+
     public $sourcePath = '@calendar/resources';
 
     public $js = [

config.php

@@ -26,7 +26,7 @@
         ['class' => ProfileMenu::class, 'event' => ProfileMenu::EVENT_INIT, 'callback' => [Events::class, 'onProfileMenuInit']],
         ['class' => SpaceSidebar::class, 'event' => SpaceSidebar::EVENT_INIT, 'callback' => [Events::class, 'onSpaceSidebarInit']],
         ['class' => ProfileSidebar::class, 'event' => ProfileSidebar::EVENT_INIT, 'callback' => [Events::class, 'onProfileSidebarInit']],
-        ['class' => DashboardSidebar::class, 'event' =>DashboardSidebar::EVENT_INIT, 'callback' => [Events::class, 'onDashboardSidebarInit']],
+        ['class' => DashboardSidebar::class, 'event' => DashboardSidebar::EVENT_INIT, 'callback' => [Events::class, 'onDashboardSidebarInit']],
         ['class' => TopMenu::class, 'event' => TopMenu::EVENT_INIT, 'callback' => [Events::class, 'onTopMenuInit']],
         ['class' => 'humhub\modules\calendar\interfaces\CalendarService', 'event' => 'getItemTypes', 'callback' => [Events::class, 'onGetCalendarItemTypes']],
         ['class' => 'humhub\modules\calendar\interfaces\CalendarService', 'event' => 'findItems', 'callback' => [Events::class, 'onFindCalendarItems']],

controllers/AbstractConfigController.php

@@ -26,10 +26,10 @@
  */
 abstract class AbstractConfigController extends ContentContainerController
 {
-    const VIEW_CONFIG_DEFAULT = '@calendar/views/common/defaultConfig';
-    const VIEW_CONFIG_TYPE = '@calendar/views/common/typesConfig';
-    const VIEW_CONFIG_EDIT_TYPE_MODAL = '@calendar/views/common/editTypeModal';
-    const VIEW_CONFIG_CALENDARS = '@calendar/views/common/calendarsConfig';
+    public const VIEW_CONFIG_DEFAULT = '@calendar/views/common/defaultConfig';
+    public const VIEW_CONFIG_TYPE = '@calendar/views/common/typesConfig';
+    public const VIEW_CONFIG_EDIT_TYPE_MODAL = '@calendar/views/common/editTypeModal';
+    public const VIEW_CONFIG_CALENDARS = '@calendar/views/common/calendarsConfig';
 
     /**
      * @var CalendarService
@@ -57,7 +57,7 @@ public function actionIndex()
         }
 
         return $this->render(static::VIEW_CONFIG_DEFAULT, [
-            'model' => $model
+            'model' => $model,
         ]);
     }
 
@@ -68,13 +68,13 @@ public function actionTypes()
             : CalendarEntryType::findGlobal();
 
         $typeDataProvider = new ActiveDataProvider([
-            'query' => $query
+            'query' => $query,
         ]);
 
         return $this->render(static::VIEW_CONFIG_TYPE, [
             'typeDataProvider' => $typeDataProvider,
             'createUrl' => URL::toCreateType($this->contentContainer),
-            'contentContainer' => $this->contentContainer
+            'contentContainer' => $this->contentContainer,
         ]);
     }
 
@@ -115,7 +115,7 @@ public function actionCalendars()
         $types = $this->calendarService->getCalendarItemTypes($this->contentContainer);
         return $this->render(static::VIEW_CONFIG_CALENDARS, [
             'contentContainer' => $this->contentContainer,
-            'calendars' => $types
+            'calendars' => $types,
         ]);
     }
 

controllers/ConfigController.php

@@ -40,7 +40,7 @@ public function actionSnippet()
         }
 
         return $this->render('snippet', [
-            'model' => $model
+            'model' => $model,
         ]);
     }
 
@@ -53,8 +53,8 @@ public function actionMenu()
         }
 
         return $this->render('menu', [
-            'model' => $model
+            'model' => $model,
         ]);
     }
 
-}
+}

controllers/FullCalendarController.php

@@ -19,10 +19,10 @@ public function getAccessRules()
         return [
             ['login'],
             ['json'],
-            ['post']
+            ['post'],
         ];
     }
-    
+
     public function actionUpdate($id)
     {
         $this->forcePostRequest();
@@ -67,4 +67,4 @@ public function actionUpdate($id)
         return $this->asJson(['success' => false, 'error' => $result]);
     }
 
-}
+}

controllers/GlobalController.php

@@ -48,7 +48,7 @@ class GlobalController extends Controller
     public function getAccessRules()
     {
         return [
-            ['login' => ['enable', 'select']]
+            ['login' => ['enable', 'select']],
         ];
     }
 
@@ -84,7 +84,7 @@ public function actionIndex()
             'selectors' => $this->getSelectorSettings(),
             'filters' => $this->getFilterSettings(),
             'canConfigure' => $moduleEnabled,
-            'editUrl' => Url::to(['/calendar/entry/edit'])
+            'editUrl' => Url::to(['/calendar/entry/edit']),
         ]);
     }
 
@@ -141,9 +141,10 @@ public function actionSelect($start = null, $end = null)
         $calendarMemberSpaceQuery = Membership::getUserSpaceQuery(Yii::$app->user->getIdentity());
 
         if (!ContentContainerModuleManager::getDefaultState(Space::class, 'calendar')) {
-            $calendarMemberSpaceQuery->leftJoin('contentcontainer_module',
+            $calendarMemberSpaceQuery->leftJoin(
+                'contentcontainer_module',
                 'contentcontainer_module.module_id = :calendar AND contentcontainer_module.contentcontainer_id = space.contentcontainer_id',
-                [':calendar' => 'calendar']
+                [':calendar' => 'calendar'],
             )->andWhere('contentcontainer_module.module_id IS NOT NULL')
                 ->andWhere(['contentcontainer_module.module_state' => ContentContainerModuleState::STATE_ENABLED]);
         }
@@ -254,7 +255,7 @@ public function actionEnable($start, $end)
             'header' => Yii::t('CalendarModule.base', '<strong>Add</strong> profile calendar'),
             'body' => Yii::t('CalendarModule.base', 'In order to add events to your profile, you have to enable the calendar module first.'),
             'footer' => $enableButton . $nextButton . $cancelButton,
-            'centerText' => true
+            'centerText' => true,
         ]);
     }
 
@@ -276,7 +277,7 @@ public function actionEnableConfig()
             'header' => Yii::t('CalendarModule.base', '<strong>Add</strong> profile calendar'),
             'body' => Yii::t('CalendarModule.base', 'Do you want to install this module on your profile?'),
             'footer' => $enableButton . $nextButton . $cancelButton,
-            'centerText' => true
+            'centerText' => true,
         ]);
     }
 

controllers/IcalController.php

@@ -12,23 +12,22 @@
 use yii\web\HttpException;
 use yii\web\NotFoundHttpException;
 
-
 class IcalController extends Controller
 {
     /**
      * @var CalendarService
      */
     public $calendarService;
 
-    const EXPORT_MIME = 'text/calendar';
+    public const EXPORT_MIME = 'text/calendar';
 
     /**
      * @return array
      */
     public function getAccessRules()
     {
         return [
-            [ControllerAccess::RULE_LOGGED_IN_ONLY]
+            [ControllerAccess::RULE_LOGGED_IN_ONLY],
         ];
     }
 
@@ -58,7 +57,7 @@ public function actionExport($id)
 
         $uid = $model->getUid() ?: $this->uniqueId;
 
-        return Yii::$app->response->sendContentAsFile($ics, $uid.'.ics', ['mimeType' => static::EXPORT_MIME]);
+        return Yii::$app->response->sendContentAsFile($ics, $uid . '.ics', ['mimeType' => static::EXPORT_MIME]);
     }
 
     /**

controllers/ReminderController.php

@@ -25,7 +25,7 @@ class ReminderController extends ContentContainerController
     public function getAccessRules()
     {
         return [
-            [ControllerAccess::RULE_LOGGED_IN_ONLY]
+            [ControllerAccess::RULE_LOGGED_IN_ONLY],
         ];
     }
 
@@ -54,12 +54,12 @@ public function actionSet($id)
             throw new HttpException(400);
         }
 
-        $reminderSettings = new ReminderSettings(['entry' =>$model, 'user' => Yii::$app->user->getIdentity()]);
+        $reminderSettings = new ReminderSettings(['entry' => $model, 'user' => Yii::$app->user->getIdentity()]);
 
         if($reminderSettings->load(Yii::$app->request->post()) && $reminderSettings->save()) {
             return ModalClose::widget(['saved' => true]);
         }
 
         return $this->renderAjax('userLevelReminder', ['reminderSettings' => $reminderSettings]);
     }
-}
+}

controllers/ViewController.php

@@ -21,7 +21,6 @@
  */
 class ViewController extends ContentContainerController
 {
-
     /**
      * @inheritdoc
      */
@@ -75,7 +74,7 @@ public function actionLoadAjax($start, $end)
         // Don't expand recurrence event on filter by "I'm attending" because this option is selected per each date separately
         $expand = !in_array(AbstractCalendarQuery::FILTER_PARTICIPATE, $filters);
 
-        foreach ($this->calendarService->getCalendarItems( new DateTime($start), new DateTime($end), $filters, $this->contentContainer, null, $expand, $types) as $entry) {
+        foreach ($this->calendarService->getCalendarItems(new DateTime($start), new DateTime($end), $filters, $this->contentContainer, null, $expand, $types) as $entry) {
             $result[] = FullCalendar::getFullCalendarArray($entry);
         }
 

controllers/rest/CalendarController.php

@@ -122,11 +122,11 @@ public function actionRespond($id)
         }
 
         if (! in_array((int)$respondType, [
-                CalendarEntryParticipant::PARTICIPATION_STATE_NONE,
-                CalendarEntryParticipant::PARTICIPATION_STATE_DECLINED,
-                CalendarEntryParticipant::PARTICIPATION_STATE_MAYBE,
-                CalendarEntryParticipant::PARTICIPATION_STATE_ACCEPTED,
-            ], true)) {
+            CalendarEntryParticipant::PARTICIPATION_STATE_NONE,
+            CalendarEntryParticipant::PARTICIPATION_STATE_DECLINED,
+            CalendarEntryParticipant::PARTICIPATION_STATE_MAYBE,
+            CalendarEntryParticipant::PARTICIPATION_STATE_ACCEPTED,
+        ], true)) {
             return $this->returnError(400, 'Invalid respond type');
         }
 

docs/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.5.13 (Unreleased)
+----------------------
+- Enh #489: Use PHP CS Fixer
+
 1.5.12 (June 25, 2024)
 ----------------------
 - Fix #487: Base event notification broken