jon48 / webtrees-lib

app/Module/AdminTasks/Http/RequestHandlers/TasksList.php

Spacing +10 added lines, -12 removed lines

@@ -61,12 +61,12 @@ 
         $module = $this->module;
         $module_name = $this->module->name();
         return response(['data' => $this->taskschedules_service->all(true, true)
-            ->map(function (TaskSchedule $schedule) use ($module, $module_name): array {
+            ->map(function(TaskSchedule $schedule) use ($module, $module_name): array {
                 $task = $this->taskschedules_service->findTask($schedule->taskId());
                 $task_name = $task !== null ? $task->name() : I18N::translate('Task not found');
 
                 return [
-                    'edit' =>   view($module_name . '::admin/tasks-table-options', [
+                    'edit' =>   view($module_name.'::admin/tasks-table-options', [
                         'task_sched_id' => $schedule->id(),
                         'task_sched_enabled' => $schedule->isEnabled(),
                         'task_edit_route' => route(TaskEditPage::class, ['task' => $schedule->id()]),
@@ -76,37 +76,35 @@ 
                         ])
                     ]),
                     'status'    =>  [
-                        'display'   =>  view($module_name . '::components/yes-no-icons', [
+                        'display'   =>  view($module_name.'::components/yes-no-icons', [
                             'yes' => $schedule->isEnabled()
                         ]),
                         'raw'       =>  $schedule->isEnabled() ? 1 : 0
                     ],
                     'task_name' =>  [
-                        'display'   =>  '<span dir="auto">' . e($task_name) . '</span>',
+                        'display'   =>  '<span dir="auto">'.e($task_name).'</span>',
                         'raw'       =>  $task_name
                     ],
                     'last_run'  =>  [
                         'display'   =>  $schedule->lastRunTime()->unix() === 0 ?
-                            view('components/datetime', ['timestamp' => $schedule->lastRunTime()]) :
-                            view('components/datetime-diff', ['timestamp' => $schedule->lastRunTime()]),
+                            view('components/datetime', ['timestamp' => $schedule->lastRunTime()]) : view('components/datetime-diff', ['timestamp' => $schedule->lastRunTime()]),
                         'raw'       =>  $schedule->lastRunTime()->unix()
                     ],
                     'last_result'   =>  [
-                        'display'   => view($module_name . '::components/yes-no-icons', [
+                        'display'   => view($module_name.'::components/yes-no-icons', [
                             'yes' => $schedule->wasLastRunSuccess()
                         ]),
                         'raw'       =>  $schedule->wasLastRunSuccess() ? 1 : 0
                     ],
-                    'frequency' =>  '<span dir="auto">' . e($schedule->frequency()->cascade()->forHumans()) . '</span>',
+                    'frequency' =>  '<span dir="auto">'.e($schedule->frequency()->cascade()->forHumans()).'</span>',
                     'nb_occurrences'    =>  $schedule->remainingOccurences() > 0 ?
-                        I18N::number($schedule->remainingOccurences()) :
-                        I18N::translate('Unlimited'),
-                    'running'   =>  view($module_name . '::components/yes-no-icons', [
+                        I18N::number($schedule->remainingOccurences()) : I18N::translate('Unlimited'),
+                    'running'   =>  view($module_name.'::components/yes-no-icons', [
                         'yes' => $schedule->isRunning(),
                         'text_yes' => I18N::translate('Running'),
                         'text_no' => I18N::translate('Not running')
                     ]),
-                    'run'       =>  view($module_name . '::admin/tasks-table-run', [
+                    'run'       =>  view($module_name.'::admin/tasks-table-run', [
                         'task_sched_id' => $schedule->id(),
                         'run_route' => route(TaskTrigger::class, [
                             'task'  =>  $schedule->taskId(),

app/Module/AdminTasks/Http/RequestHandlers/TaskEditAction.php

Spacing +8 added lines, -8 removed lines

@@ -64,7 +64,7 @@ 
             return redirect($admin_config_route);
         }
 
-        $task_sched_id = (int) $request->getAttribute('task');
+        $task_sched_id = (int)$request->getAttribute('task');
         $task_schedule = $this->taskschedules_service->find($task_sched_id);
 
         if ($task_schedule === null) {
@@ -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);
@@ -103,17 +103,17 @@ 
             return false;
         }
 
-        $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) {
@@ -143,7 +143,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;
     }
 
@@ -175,7 +175,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;

app/Module/AdminTasks/Http/RequestHandlers/TaskStatusAction.php

Spacing +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
             return redirect($admin_config_route);
         }
 
-        $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);
@@ -73,7 +73,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(
@@ -81,14 +81,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);

app/Module/AdminTasks/Http/RequestHandlers/TaskEditPage.php

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
             throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
         }
 
-        $task_sched_id = (int) $request->getAttribute('task');
+        $task_sched_id = (int)$request->getAttribute('task');
         $task_schedule = $this->taskschedules_service->find($task_sched_id);
 
         if ($task_schedule === null) {
@@ -75,9 +75,9 @@ 
         $has_task_config = $task instanceof ConfigurableTaskInterface;
         /** @var \MyArtJaub\Webtrees\Contracts\Tasks\TaskInterface&\MyArtJaub\Webtrees\Contracts\Tasks\ConfigurableTaskInterface $task */
 
-        return $this->viewResponse($this->module->name() . '::admin/tasks-edit', [
+        return $this->viewResponse($this->module->name().'::admin/tasks-edit', [
             'module'            =>  $this->module,
-            'title'             =>  I18N::translate('Edit the administrative task') . ' - ' . $task->name(),
+            'title'             =>  I18N::translate('Edit the administrative task').' - '.$task->name(),
             'task_schedule'     =>  $task_schedule,
             'task'              =>  $task,
             'has_task_config'   =>  $has_task_config,

app/Module/AdminTasks/Http/RequestHandlers/TokenGenerate.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 
         $token = $this->token_service->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]);
     }

app/Module/AdminTasks/Services/TaskScheduleService.php

Spacing +11 added lines, -11 removed lines

@@ -99,7 +99,7 @@ 
      */
     public function available(): Collection
     {
-        return Registry::cache()->array()->remember('maj-available-admintasks', function () {
+        return Registry::cache()->array()->remember('maj-available-admintasks', function() {
             return $this->module_service
                 ->findByInterface(ModuleTasksProviderInterface::class)
                 ->flatMap(fn(ModuleTasksProviderInterface $module) => $module->listTasks());
@@ -201,14 +201,14 @@ 
         $query = DB::table('maj_admintasks')
             ->select()
             ->where('majat_status', '=', 'enabled')
-            ->where(function (Builder $query): void {
+            ->where(function(Builder $query): void {
 
                 $query->where('majat_running', '=', 0)
                 ->orWhere('majat_last_run', '<=', Carbon::now()->subSeconds(self::TASK_TIME_OUT));
             });
 
         if (!$force) {
-            $query->where(function (Builder $query): void {
+            $query->where(function(Builder $query): void {
 
                 $query->where('majat_running', '=', 0)
                     ->orWhereRaw('DATE_ADD(majat_last_run, INTERVAL majat_frequency MINUTE) <= NOW()');
@@ -256,9 +256,9 @@ 
                     $task_schedule->setLastResult($task->run($task_schedule));
                 } catch (Throwable $ex) {
                     if ($first_error) { // Only record the first error, as this could fill the log.
-                        Log::addErrorLog(I18N::translate('Error while running task %s:', $task->name()) . ' ' .
-                            '[' . get_class($ex) . '] ' . $ex->getMessage() . ' ' . $ex->getFile() . ':'
-                            . $ex->getLine() . PHP_EOL . $ex->getTraceAsString());
+                        Log::addErrorLog(I18N::translate('Error while running task %s:', $task->name()).' '.
+                            '['.get_class($ex).'] '.$ex->getMessage().' '.$ex->getFile().':'
+                            . $ex->getLine().PHP_EOL.$ex->getTraceAsString());
                     }
                 }
 
@@ -279,17 +279,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
             );
         };
     }

app/Module/AdminTasks/AdminTasksModule.php

Spacing +6 added lines, -6 removed lines

@@ -55,7 +55,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}
@@ -95,12 +95,12 @@ 
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
-            $router->attach('', '/module-maj/admintasks', static function (Map $router): void {
+            $router->attach('', '/module-maj/admintasks', static function(Map $router): void {
                 $router->tokens(['enable' => '[01]']);
 
-                $router->attach('', '/admin', static function (Map $router): void {
+                $router->attach('', '/admin', static function(Map $router): void {
 
                     $router->extras([
                         'middleware' => [
@@ -109,7 +109,7 @@ 
                     ]);
                     $router->get(AdminConfigPage::class, '/config', AdminConfigPage::class);
 
-                    $router->attach('', '/tasks', static function (Map $router): void {
+                    $router->attach('', '/tasks', static function(Map $router): void {
 
                         $router->get(TasksList::class, '', TasksList::class);
                         $router->get(TaskEditPage::class, '/{task}', TaskEditPage::class);
@@ -151,7 +151,7 @@ 
      */
     public function bodyContent(): string
     {
-        return view($this->name() . '::snippet', [ 'url' => route(TaskTrigger::class) ]);
+        return view($this->name().'::snippet', ['url' => route(TaskTrigger::class)]);
     }
 
     /**

app/Common/Hooks/AbstractHookCollector.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
      */
     public function name(): string
     {
-        return $this->module->name() . '-' .
+        return $this->module->name().'-'.
             mb_substr(str_replace('collector', '', mb_strtolower((new ReflectionClass($this))->getShortName())), 0, 64);
     }
 

app/Common/GeoDispersion/GeoAnalysis/GeoAnalysisResult.php

Spacing +4 added lines, -4 removed lines

@@ -134,7 +134,7 @@ 
      */
     public function merge(GeoAnalysisResult $other): self
     {
-        $this->places->each(function (GeoAnalysisResultItem $item) use ($other): void {
+        $this->places->each(function(GeoAnalysisResultItem $item) use ($other): void {
             if ($other->places->has($item->key())) {
                 $item->place()->exclude(
                     $item->place()->isExcluded()
@@ -143,7 +143,7 @@ 
             }
         });
 
-        $other->places->each(function (GeoAnalysisResultItem $item): void {
+        $other->places->each(function(GeoAnalysisResultItem $item): void {
             if (!$this->places->has($item->key())) {
                 $this->addPlace($item->place());
             }
@@ -230,8 +230,8 @@ 
     public function sortedKnownPlaces(bool $exclude_other = false): Collection
     {
         return $this->knownPlaces($exclude_other)->sortBy([
-            fn (GeoAnalysisResultItem $a, GeoAnalysisResultItem $b): int => $b->count() <=> $a->count(),
-            fn (GeoAnalysisResultItem $a, GeoAnalysisResultItem $b): int =>
+            fn(GeoAnalysisResultItem $a, GeoAnalysisResultItem $b): int => $b->count() <=> $a->count(),
+            fn(GeoAnalysisResultItem $a, GeoAnalysisResultItem $b): int =>
                 I18N::comparator()($a->place()->place()->gedcomName(), $b->place()->place()->gedcomName())
         ]);
     }