jon48 / webtrees-lib

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

Spacing +4 added lines, -4 removed lines

@@ -68,7 +68,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);
@@ -81,7 +81,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(
@@ -89,14 +89,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/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 $this->module === null ? '' : view($this->module->name() . '::tasks/healthcheck/config', [
+        return $this->module === null ? '' : 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/Services/TaskScheduleService.php

Spacing +10 added lines, -10 removed lines

@@ -197,14 +197,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()');
@@ -253,9 +253,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());
                     }
                 }
 
@@ -276,17 +276,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/Sosa/Http/RequestHandlers/AncestorsList.php

Spacing +2 added lines, -2 removed lines

@@ -77,9 +77,9 @@
         /** @var SosaStatisticsService $sosa_stats_service */
         $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
 
-        $current_gen = (int) ($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0);
+        $current_gen = (int)($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0);
 
-        return $this->viewResponse($this->module->name() . '::list-ancestors-page', [
+        return $this->viewResponse($this->module->name().'::list-ancestors-page', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Ancestors'),
             'tree'              =>  $tree,

src/Webtrees/Module/Sosa/Http/RequestHandlers/AncestorsListIndividual.php

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
 
         $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
 
-        $current_gen = (int) ($request->getAttribute('gen') ?? 0);
+        $current_gen = (int)($request->getAttribute('gen') ?? 0);
 
         if ($current_gen <= 0) {
             return response('Invalid generation', StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY);
@@ -88,14 +88,14 @@ 
         $nb_ancestors_all = $list_ancestors->count();
 
         /** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Individual> $list_ancestors */
-        $list_ancestors = $list_ancestors->mapWithKeys(function (stdClass $value) use ($tree): ?array {
+        $list_ancestors = $list_ancestors->mapWithKeys(function(stdClass $value) use ($tree): ?array {
                 $indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
-                return ($indi !== null && $indi->canShowName()) ? [(int) $value->majs_sosa => $indi] : null;
+                return ($indi !== null && $indi->canShowName()) ? [(int)$value->majs_sosa => $indi] : null;
         })->filter();
 
         $nb_ancestors_shown = $list_ancestors->count();
 
-        return $this->viewResponse($this->module->name() . '::list-ancestors-indi-tab', [
+        return $this->viewResponse($this->module->name().'::list-ancestors-indi-tab', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Ancestors'),
             'tree'              =>  $tree,

src/Webtrees/Module/Sosa/Http/RequestHandlers/AncestorsListFamily.php

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
 
         $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
 
-        $current_gen = (int) ($request->getAttribute('gen') ?? 0);
+        $current_gen = (int)($request->getAttribute('gen') ?? 0);
 
         if ($current_gen <= 0) {
             return response('Invalid generation', StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY);
@@ -88,14 +88,14 @@ 
         $nb_families_all = $list_families->count();
 
         /** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Family> $list_families */
-        $list_families = $list_families->mapWithKeys(function (stdClass $value) use ($tree): ?array {
+        $list_families = $list_families->mapWithKeys(function(stdClass $value) use ($tree): ?array {
                 $fam = Registry::familyFactory()->make($value->f_id, $tree);
-                return ($fam !== null && $fam->canShow()) ? [(int) $value->majs_sosa => $fam] : null;
+                return ($fam !== null && $fam->canShow()) ? [(int)$value->majs_sosa => $fam] : null;
         })->filter();
 
         $nb_families_shown = $list_families->count();
 
-        return $this->viewResponse($this->module->name() . '::list-ancestors-fam-tab', [
+        return $this->viewResponse($this->module->name().'::list-ancestors-fam-tab', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Ancestors'),
             'tree'              =>  $tree,

src/Webtrees/Module/Sosa/Http/RequestHandlers/MissingAncestorsList.php

Spacing +6 added lines, -6 removed lines

@@ -80,19 +80,19 @@ 
         /** @var SosaStatisticsService $sosa_stats_service */
         $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
 
-        $current_gen = (int) ($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0);
+        $current_gen = (int)($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0);
 
         $list_missing = $this->sosa_record_service->listMissingAncestorsAtGeneration($tree, $user, $current_gen);
-        $nb_missing_diff = $list_missing->sum(function (stdClass $value): int {
+        $nb_missing_diff = $list_missing->sum(function(stdClass $value): int {
             return ($value->majs_fat_id === null ? 1 : 0) + ($value->majs_mot_id === null ? 1 : 0);
         });
 
-        $list_missing = $list_missing->map(function (stdClass $value) use ($tree): ?MissingAncestor {
+        $list_missing = $list_missing->map(function(stdClass $value) use ($tree): ?MissingAncestor {
             $indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
             if ($indi !== null && $indi->canShowName()) {
                 return new MissingAncestor(
                     $indi,
-                    (int) $value->majs_sosa,
+                    (int)$value->majs_sosa,
                     $value->majs_fat_id === null,
                     $value->majs_mot_id === null
                 );
@@ -100,11 +100,11 @@ 
             return null;
         })->filter();
 
-        $nb_missing_shown = $list_missing->sum(function (MissingAncestor $value): int {
+        $nb_missing_shown = $list_missing->sum(function(MissingAncestor $value): int {
             return ($value->isFatherMissing() ? 1 : 0) + ($value->isMotherMissing() ? 1 : 0);
         });
 
-        return $this->viewResponse($this->module->name() . '::list-missing-page', [
+        return $this->viewResponse($this->module->name().'::list-missing-page', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Missing Ancestors'),
             'tree'              =>  $tree,

src/Webtrees/Module/Sosa/GeoAnalyses/SosaByGenerationGeoAnalysis.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
             if ($ancestor === null || !$ancestor->canShow()) {
                 continue;
             }
-            $generation = $this->records_service->generation((int) $item->majs_sosa);
+            $generation = $this->records_service->generation((int)$item->majs_sosa);
             $significantplace = new GeoAnalysisPlace($tree, null, $depth);
             foreach ($this->significantPlaces($ancestor) as $place) {
                 $significantplace = new GeoAnalysisPlace($tree, $place, $depth, true);

src/Webtrees/Module/Sosa/Services/SosaRecordsService.php

Spacing +32 added lines, -32 removed lines

@@ -88,8 +88,8 @@ 
     public function sosaNumbers(Tree $tree, UserInterface $user, Individual $indi): Collection
     {
         return Registry::cache()->array()->remember(
-            'sosanumbers-' . $indi->xref() . '@' . $tree->id() . '-' . $user->id(),
-            function () use ($tree, $user, $indi): Collection {
+            'sosanumbers-'.$indi->xref().'@'.$tree->id().'-'.$user->id(),
+            function() use ($tree, $user, $indi): Collection {
                 return DB::table('maj_sosa')
                     ->select(['majs_sosa', 'majs_gen'])
                     ->where('majs_gedcom_id', '=', $tree->id())
@@ -149,14 +149,14 @@ 
     {
         $table_prefix = DB::connection()->getTablePrefix();
         return DB::table('families')
-            ->join('maj_sosa AS sosa_husb', function (JoinClause $join) use ($tree, $user): void {
+            ->join('maj_sosa AS sosa_husb', function(JoinClause $join) use ($tree, $user): void {
                 // Link to family husband
                 $join->on('families.f_file', '=', 'sosa_husb.majs_gedcom_id')
                     ->on('families.f_husb', '=', 'sosa_husb.majs_i_id')
                     ->where('sosa_husb.majs_gedcom_id', '=', $tree->id())
                     ->where('sosa_husb.majs_user_id', '=', $user->id());
             })
-            ->join('maj_sosa AS sosa_wife', function (JoinClause $join) use ($tree, $user): void {
+            ->join('maj_sosa AS sosa_wife', function(JoinClause $join) use ($tree, $user): void {
                 // Link to family husband
                 $join->on('families.f_file', '=', 'sosa_wife.majs_gedcom_id')
                 ->on('families.f_wife', '=', 'sosa_wife.majs_i_id')
@@ -165,7 +165,7 @@ 
             })
             ->select(['sosa_husb.majs_sosa', 'families.f_id'])
             ->where('sosa_husb.majs_gen', '=', $gen)
-            ->whereRaw($table_prefix . 'sosa_husb.majs_sosa + 1 = ' . $table_prefix . 'sosa_wife.majs_sosa')
+            ->whereRaw($table_prefix.'sosa_husb.majs_sosa + 1 = '.$table_prefix.'sosa_wife.majs_sosa')
             ->orderBy('sosa_husb.majs_sosa')
             ->get();
     }
@@ -188,28 +188,28 @@ 
         $table_prefix = DB::connection()->getTablePrefix();
         return DB::table('maj_sosa AS sosa')
             ->select(['sosa.majs_i_id', 'sosa_fat.majs_i_id AS majs_fat_id', 'sosa_mot.majs_i_id AS majs_mot_id'])
-            ->selectRaw('MIN(' . $table_prefix . 'sosa.majs_sosa) AS majs_sosa')
-            ->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($tree, $user, $table_prefix): void {
+            ->selectRaw('MIN('.$table_prefix.'sosa.majs_sosa) AS majs_sosa')
+            ->leftJoin('maj_sosa AS sosa_fat', function(JoinClause $join) use ($tree, $user, $table_prefix): void {
                 // Link to sosa's father
-                $join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
+                $join->whereRaw($table_prefix.'sosa_fat.majs_sosa = 2 * '.$table_prefix.'sosa.majs_sosa')
                     ->where('sosa_fat.majs_gedcom_id', '=', $tree->id())
                     ->where('sosa_fat.majs_user_id', '=', $user->id());
             })
-            ->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($tree, $user, $table_prefix): void {
+            ->leftJoin('maj_sosa AS sosa_mot', function(JoinClause $join) use ($tree, $user, $table_prefix): void {
                 // Link to sosa's mother
-                $join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
+                $join->whereRaw($table_prefix.'sosa_mot.majs_sosa = 2 * '.$table_prefix.'sosa.majs_sosa + 1')
                     ->where('sosa_mot.majs_gedcom_id', '=', $tree->id())
                     ->where('sosa_mot.majs_user_id', '=', $user->id());
             })
             ->where('sosa.majs_gedcom_id', '=', $tree->id())
             ->where('sosa.majs_user_id', '=', $user->id())
             ->where('sosa.majs_gen', '=', $gen - 1)
-            ->where(function (Builder $query): void {
+            ->where(function(Builder $query): void {
                 $query->whereNull('sosa_fat.majs_i_id')
                     ->orWhereNull('sosa_mot.majs_i_id');
             })
             ->groupBy('sosa.majs_i_id', 'sosa_fat.majs_i_id', 'sosa_mot.majs_i_id')
-            ->orderByRaw('MIN(' . $table_prefix . 'sosa.majs_sosa)')
+            ->orderByRaw('MIN('.$table_prefix.'sosa.majs_sosa)')
             ->get();
     }
 
@@ -261,29 +261,29 @@ 
         $has_records = false;
         foreach ($sosa_records as $i => $row) {
             $gen = $this->generation($row['sosa']);
-            if ($gen <=  $this->maxSystemGenerations()) {
+            if ($gen <= $this->maxSystemGenerations()) {
                 $has_records = true;
                 if ($mass_update) {
-                    $bindings_placeholders[] = '(:tree_id' . $i . ', :user_id' . $i . ', :sosa' . $i . ',' .
-                        ' :indi_id' . $i . ', :gen' . $i . ',' .
-                        ' :byear' . $i . ', :byearest' . $i . ', :dyear' . $i . ', :dyearest' . $i . ')';
+                    $bindings_placeholders[] = '(:tree_id'.$i.', :user_id'.$i.', :sosa'.$i.','.
+                        ' :indi_id'.$i.', :gen'.$i.','.
+                        ' :byear'.$i.', :byearest'.$i.', :dyear'.$i.', :dyearest'.$i.')';
                     $bindings_values = array_merge(
                         $bindings_values,
                         [
-                            'tree_id' . $i => $tree->id(),
-                            'user_id' . $i => $user->id(),
-                            'sosa' . $i => $row['sosa'],
-                            'indi_id' . $i => $row['indi'],
-                            'gen' . $i => $gen,
-                            'byear' . $i => $row['birth_year'],
-                            'byearest' . $i => $row['birth_year_est'],
-                            'dyear' . $i => $row['death_year'],
-                            'dyearest' . $i => $row['death_year_est']
+                            'tree_id'.$i => $tree->id(),
+                            'user_id'.$i => $user->id(),
+                            'sosa'.$i => $row['sosa'],
+                            'indi_id'.$i => $row['indi'],
+                            'gen'.$i => $gen,
+                            'byear'.$i => $row['birth_year'],
+                            'byearest'.$i => $row['birth_year_est'],
+                            'dyear'.$i => $row['death_year'],
+                            'dyearest'.$i => $row['death_year_est']
                         ]
                     );
                 } else {
                     DB::table('maj_sosa')->updateOrInsert(
-                        [ 'majs_gedcom_id' => $tree->id(), 'majs_user_id' => $user->id(), 'majs_sosa' => $row['sosa']],
+                        ['majs_gedcom_id' => $tree->id(), 'majs_user_id' => $user->id(), 'majs_sosa' => $row['sosa']],
                         [
                             'majs_i_id' => $row['indi'],
                             'majs_gen' => $gen,
@@ -299,12 +299,12 @@ 
 
         if ($has_records && $mass_update) {
             DB::connection()->statement(
-                'INSERT INTO `' . DB::connection()->getTablePrefix() . 'maj_sosa`' .
-                ' (majs_gedcom_id, majs_user_id, majs_sosa,' .
-                '   majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)' .
-                ' VALUES ' . implode(',', $bindings_placeholders) .
-                ' ON DUPLICATE KEY UPDATE majs_i_id = VALUES(majs_i_id), majs_gen = VALUES(majs_gen),' .
-                '   majs_birth_year = VALUES(majs_birth_year), majs_birth_year_est = VALUES(majs_birth_year_est),' .
+                'INSERT INTO `'.DB::connection()->getTablePrefix().'maj_sosa`'.
+                ' (majs_gedcom_id, majs_user_id, majs_sosa,'.
+                '   majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)'.
+                ' VALUES '.implode(',', $bindings_placeholders).
+                ' ON DUPLICATE KEY UPDATE majs_i_id = VALUES(majs_i_id), majs_gen = VALUES(majs_gen),'.
+                '   majs_birth_year = VALUES(majs_birth_year), majs_birth_year_est = VALUES(majs_birth_year_est),'.
                 '   majs_death_year = VALUES(majs_death_year), majs_death_year_est = VALUES(majs_death_year_est)',
                 $bindings_values
             );