jon48 / webtrees-lib

src/Webtrees/Module/AdminTasks/Services/TaskScheduleService.php

Spacing +8 added lines, -8 removed lines

@@ -195,14 +195,14 @@ 
         $query = DB::table('maj_admintasks')
             ->select()
             ->where('majat_status', '=', 'enabled')
-            ->where(function (Builder $query) {
+            ->where(function(Builder $query) {
 
                 $query->where('majat_running', '=', 0)
                 ->orWhere('majat_last_run', '<=', Carbon::now()->subSeconds(self::TASK_TIME_OUT));
             });
             
         if (!$force) {
-            $query->where(function (Builder $query) {
+            $query->where(function(Builder $query) {
 
                 $query->where('majat_running', '=', 0)
                     ->orWhereRaw('DATE_ADD(majat_last_run, INTERVAL majat_frequency MINUTE) <= NOW()');
@@ -238,7 +238,7 @@ 
         if (
             !$task_schedule->isRunning() &&
             ($force || $task_schedule->lastRunTime()->add($task_schedule->frequency())->lessThan(Carbon::now())) &&
-            $task_schedule->setLastResult(false) &&  // @phpstan-ignore-line  Used as setter, not as a condition
+            $task_schedule->setLastResult(false) && // @phpstan-ignore-line  Used as setter, not as a condition
             $task = $this->findTask($task_schedule->taskId())
         ) {
             $task_schedule->startRunning();
@@ -267,17 +267,17 @@ 
      */
     public static function rowMapper(): Closure
     {
-        return static function (stdClass $row): TaskSchedule {
+        return static function(stdClass $row): TaskSchedule {
 
             return new TaskSchedule(
-                (int) $row->majat_id,
+                (int)$row->majat_id,
                 $row->majat_task_id,
                 $row->majat_status === 'enabled',
                 Carbon::parse($row->majat_last_run),
-                (bool) $row->majat_last_result,
+                (bool)$row->majat_last_result,
                 CarbonInterval::minutes($row->majat_frequency),
-                (int) $row->majat_nb_occur,
-                (bool) $row->majat_running
+                (int)$row->majat_nb_occur,
+                (bool)$row->majat_running
             );
         };
     }

src/Webtrees/Module/AdminTasks/Services/HealthCheckService.php

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
     public function changesByRecordType(Tree $tree, int $nb_days): Collection
     {
         return DB::table('change')
-            ->joinSub($this->allGedcomRecords($tree), 'gedrecords', function (JoinClause $join) use ($tree) {
+            ->joinSub($this->allGedcomRecords($tree), 'gedrecords', function(JoinClause $join) use ($tree) {
 
                 $join->on('change.xref', '=', 'gedrecords.ged_id')
                     ->where('change.gedcom_id', '=', $tree->id());
@@ -115,7 +115,7 @@ 
                 new Expression('MAX(log_time) AS lastoccurred')
             )
             ->where('log_type', '=', 'error')
-            ->where(function (Builder $query) use ($tree) {
+            ->where(function(Builder $query) use ($tree) {
                 $query->where('gedcom_id', '=', $tree->id())
                     ->orWhereNull('gedcom_id');
             })

src/Webtrees/Module/AdminTasks/Http/RequestHandlers/TasksList.php

Spacing +10 added lines, -11 removed lines

@@ -74,7 +74,7 @@ 
         }
         
         $task_schedules = $this->taskschedules_service->all(true, true)
-            ->map(function (TaskSchedule $value) {
+            ->map(function(TaskSchedule $value) {
 
                 $row = $value->toArray();
                 $task = $this->taskschedules_service->findTask($row['task_id']);
@@ -86,7 +86,7 @@ 
         $sort_columns   = ['task_name', 'enabled', 'last_run'];
         $module_name = $this->module->name();
         
-        $callback = function (array $row) use ($module_name): array {
+        $callback = function(array $row) use ($module_name): array {
 
             $row['frequency']->setLocale(I18N::locale()->code());
             
@@ -109,21 +109,20 @@ 
             ];
             
             $datum = [
-                view($module_name . '::admin/tasks-table-options', $task_options_params),
-                view($module_name . '::components/yes-no-icons', ['yes' => $row['enabled']]),
-                '<span dir="auto">' . e($row['task_name']) . '</span>',
+                view($module_name.'::admin/tasks-table-options', $task_options_params),
+                view($module_name.'::components/yes-no-icons', ['yes' => $row['enabled']]),
+                '<span dir="auto">'.e($row['task_name']).'</span>',
                 $row['last_run']->unix() === 0 ?
-                view('components/datetime', ['timestamp' => $row['last_run']]) :
-                view('components/datetime-diff', ['timestamp' => $row['last_run']]),
-                view($module_name . '::components/yes-no-icons', ['yes' => $row['last_result']]),
-                '<span dir="auto">' . e($row['frequency']->cascade()->forHumans()) . '</span>',
+                view('components/datetime', ['timestamp' => $row['last_run']]) : view('components/datetime-diff', ['timestamp' => $row['last_run']]),
+                view($module_name.'::components/yes-no-icons', ['yes' => $row['last_result']]),
+                '<span dir="auto">'.e($row['frequency']->cascade()->forHumans()).'</span>',
                 $row['nb_occurrences'] > 0 ? I18N::number($row['nb_occurrences']) : I18N::translate('Unlimited'),
-                view($module_name . '::components/yes-no-icons', [
+                view($module_name.'::components/yes-no-icons', [
                     'yes' => $row['is_running'],
                     'text_yes' => I18N::translate('Running'),
                     'text_no' => I18N::translate('Not running')
                 ]),
-                view($module_name . '::admin/tasks-table-run', $task_run_params)
+                view($module_name.'::admin/tasks-table-run', $task_run_params)
             ];
             
             return $datum;

src/Webtrees/Module/AdminTasks/Http/RequestHandlers/TaskStatusAction.php

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $task_sched_id = (int) $request->getAttribute('task');
+        $task_sched_id = (int)$request->getAttribute('task');
         $task_schedule = $this->taskschedules_service->find($task_sched_id);
         
         $admin_config_route = route(AdminConfigPage::class);
@@ -71,7 +71,7 @@ 
             return redirect($admin_config_route);
         }
         
-        ((bool) $request->getAttribute('enable', false)) ? $task_schedule->enable() : $task_schedule->disable();
+        ((bool)$request->getAttribute('enable', false)) ? $task_schedule->enable() : $task_schedule->disable();
         
         if ($this->taskschedules_service->update($task_schedule) > 0) {
             FlashMessages::addMessage(
@@ -79,14 +79,14 @@ 
                 'success'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” has been updated.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : Task Schedule “'.$task_schedule->id().'” has been updated.');
         } else {
             FlashMessages::addMessage(
                 I18N::translate('An error occured while updating the scheduled task'),
                 'danger'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” could not be updated. See error log.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : Task Schedule “'.$task_schedule->id().'” could not be updated. See error log.');
         }
         
         return redirect($admin_config_route);

src/Webtrees/Module/AdminTasks/Http/RequestHandlers/TokenGenerate.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
         
         $token = Functions::generateRandomToken();
         $this->module->setPreference('MAJ_AT_FORCE_EXEC_TOKEN', $token);
-        Log::addConfigurationLog($this->module->title() . ' : New token generated.');
+        Log::addConfigurationLog($this->module->title().' : New token generated.');
         
         return response(['token' => $token]);
     }

src/Webtrees/Module/AdminTasks/Http/RequestHandlers/AdminConfigPage.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
             $this->module->setPreference('PAT_FORCE_EXEC_TOKEN', $token);
         }
         
-        return $this->viewResponse($this->module->name() . '::admin/config', [
+        return $this->viewResponse($this->module->name().'::admin/config', [
             'title'             =>  $this->module->title(),
             'trigger_token'     =>  $token,
             'trigger_route'     =>  route(TaskTrigger::class, ['task' => '__TASKNAME__', 'force' => '__TOKEN__']),

src/Webtrees/Module/AdminTasks/Http/RequestHandlers/TaskEditAction.php

Spacing +8 added lines, -8 removed lines

@@ -62,7 +62,7 @@ 
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $task_sched_id = (int) $request->getAttribute('task');
+        $task_sched_id = (int)$request->getAttribute('task');
         $task_schedule = $this->taskschedules_service->find($task_sched_id);
         
         $admin_config_route = route(AdminConfigPage::class);
@@ -84,7 +84,7 @@ 
                 'success'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” has been updated.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : Task Schedule “'.$task_schedule->id().'” has been updated.');
         }
         
         return redirect($admin_config_route);
@@ -99,17 +99,17 @@ 
      */
     private function updateGeneralSettings(TaskSchedule $task_schedule, ServerRequestInterface $request): bool
     {
-        $params = (array) $request->getParsedBody();
+        $params = (array)$request->getParsedBody();
         
-        $frequency = (int) $params['frequency'];
+        $frequency = (int)$params['frequency'];
         if ($frequency > 0) {
             $task_schedule->setFrequency(CarbonInterval::minutes($frequency));
         } else {
             FlashMessages::addMessage(I18N::translate('The frequency is not in a valid format'), 'danger');
         }
         
-        $is_limited = (bool) $params['is_limited'];
-        $nb_occur = (int) $params['nb_occur'];
+        $is_limited = (bool)$params['is_limited'];
+        $nb_occur = (int)$params['nb_occur'];
         
         if ($is_limited) {
             if ($nb_occur > 0) {
@@ -139,7 +139,7 @@ 
         
         FlashMessages::addMessage(I18N::translate('An error occured while updating the scheduled task'), 'danger');
         //@phpcs:ignore Generic.Files.LineLength.TooLong
-        Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” could not be updated. See error log.');
+        Log::addConfigurationLog('Module '.$this->module->title().' : Task Schedule “'.$task_schedule->id().'” could not be updated. See error log.');
         return false;
     }
     
@@ -167,7 +167,7 @@ 
                 'danger'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : AdminTask “' . $task->name() . '” specific settings could not be updated. See error log.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : AdminTask “'.$task->name().'” specific settings could not be updated. See error log.');
         }
         
         return true;

src/Webtrees/Module/AdminTasks/Tasks/HealthCheckEmailTask.php

Spacing +8 added lines, -8 removed lines

@@ -136,7 +136,7 @@ 
         $interval_lastrun = $task_schedule->lastRunTime()->diffAsCarbonInterval(Carbon::now());
         //@phpcs:ignore Generic.Files.LineLength.TooLong
         $interval = $interval_lastrun->greaterThan($task_schedule->frequency()) ? $interval_lastrun : $task_schedule->frequency();
-        $nb_days = (int) $interval->ceilDay()->totalDays;
+        $nb_days = (int)$interval->ceilDay()->totalDays;
         
         $view_params_site = [
             'nb_days'               =>  $nb_days,
@@ -155,7 +155,7 @@ 
                 continue;
             }
             
-            $webmaster = $this->user_service->find((int) $tree->getPreference('WEBMASTER_USER_ID'));
+            $webmaster = $this->user_service->find((int)$tree->getPreference('WEBMASTER_USER_ID'));
             if ($webmaster === null) {
                 continue;
             }
@@ -176,9 +176,9 @@ 
                 new TreeUser($tree),
                 $webmaster,
                 new NoReplyUser(),
-                I18N::translate('Health Check Report') . ' - ' . I18N::translate('Tree %s', $tree->name()),
-                view($this->module->name() . '::tasks/healthcheck/email-healthcheck-text', $view_params),
-                view($this->module->name() . '::tasks/healthcheck/email-healthcheck-html', $view_params)
+                I18N::translate('Health Check Report').' - '.I18N::translate('Tree %s', $tree->name()),
+                view($this->module->name().'::tasks/healthcheck/email-healthcheck-text', $view_params),
+                view($this->module->name().'::tasks/healthcheck/email-healthcheck-html', $view_params)
             );
         }
         
@@ -191,7 +191,7 @@ 
      */
     public function configView(ServerRequestInterface $request): string
     {
-        return view($this->module->name() . '::tasks/healthcheck/config', [
+        return view($this->module->name().'::tasks/healthcheck/config', [
             'all_trees'     =>  $this->tree_service->all()
         ]);
     }
@@ -203,11 +203,11 @@ 
     public function updateConfig(ServerRequestInterface $request, TaskSchedule $task_schedule): bool
     {
         try {
-            $params = (array) $request->getParsedBody();
+            $params = (array)$request->getParsedBody();
             
             foreach ($this->tree_service->all() as $tree) {
                 if (Auth::isManager($tree)) {
-                    $tree_enabled = (bool) ($params['HEALTHCHECK_ENABLED_' . $tree->id()] ?? false);
+                    $tree_enabled = (bool)($params['HEALTHCHECK_ENABLED_'.$tree->id()] ?? false);
                     $tree->setPreference(self::TREE_PREFERENCE_NAME, $tree_enabled ? '1' : '0');
                 }
             }

src/Webtrees/Module/AdminTasks/AdminTasksModule.php

Spacing +6 added lines, -6 removed lines

@@ -51,7 +51,7 @@ 
     //How to update the database schema for this module
     private const SCHEMA_TARGET_VERSION   = 2;
     private const SCHEMA_SETTING_NAME     = 'MAJ_ADMTASKS_SCHEMA_VERSION';
-    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
+    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__.'\Schema';
 
     /**
      * {@inheritDoc}
@@ -91,11 +91,11 @@ 
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router) {
+        $router->attach('', '', static function(Map $router) {
 
-            $router->attach('', '/module-maj/admintasks', static function (Map $router) {
+            $router->attach('', '/module-maj/admintasks', static function(Map $router) {
 
-                $router->attach('', '/admin', static function (Map $router) {
+                $router->attach('', '/admin', static function(Map $router) {
 
                     $router->extras([
                         'middleware' => [
@@ -104,7 +104,7 @@ 
                     ]);
                     $router->get(AdminConfigPage::class, '/config', AdminConfigPage::class);
                     
-                    $router->attach('', '/tasks', static function (Map $router) {
+                    $router->attach('', '/tasks', static function(Map $router) {
 
                         $router->get(TasksList::class, '', TasksList::class);
                         $router->get(TaskEditPage::class, '/{task}', TaskEditPage::class);
@@ -148,7 +148,7 @@ 
     {
         $parameters['url'] = route(TaskTrigger::class);
         
-        return view($this->name() . '::snippet', $parameters);
+        return view($this->name().'::snippet', $parameters);
     }
     
     /**