jon48 / webtrees-lib

src/Webtrees/Module/WelcomeBlock/Services/MatomoStatsService.php

Spacing +6 added lines, -6 removed lines

@@ -43,13 +43,13 @@ 
         $cache = Registry::cache()->file();
 
         return $cache->remember(
-            $module->name() . '-matomovisits-yearly-' . $block_id,
-            function () use ($module, $block_id): ?int {
+            $module->name().'-matomovisits-yearly-'.$block_id,
+            function() use ($module, $block_id): ?int {
                 $visits_year = $this->visits($module, $block_id, 'year');
                 if ($visits_year === null) {
                     return null;
                 }
-                $visits_today = (int) $this->visits($module, $block_id, 'day');
+                $visits_today = (int)$this->visits($module, $block_id, 'day');
 
                 return $visits_year - $visits_today;
             },
@@ -67,8 +67,8 @@ 
     public function visitsToday(WelcomeBlockModule $module, int $block_id): ?int
     {
         return app('cache.array')->remember(
-            $module->name() . '-matomovisits-daily-' . $block_id,
-            function () use ($module, $block_id): ?int {
+            $module->name().'-matomovisits-daily-'.$block_id,
+            function() use ($module, $block_id) : ?int {
                 return $this->visits($module, $block_id, 'day');
             }
         );
@@ -110,7 +110,7 @@ 
                 ]);
 
                 if ($response->getStatusCode() === StatusCodeInterface::STATUS_OK) {
-                    $result = json_decode((string) $response->getBody(), true)['value'] ?? null;
+                    $result = json_decode((string)$response->getBody(), true)['value'] ?? null;
                     if ($result !== null) {
                         return (int)$result;
                     }

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): 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->attach('', '/admin', static function (Map $router): void {
+                $router->attach('', '/admin', static function(Map $router): void {
 
                     $router->extras([
                         'middleware' => [
@@ -104,7 +104,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);
@@ -146,7 +146,7 @@ 
      */
     public function bodyContent(): string
     {
-        return view($this->name() . '::snippet', [ 'url' => route(TaskTrigger::class) ]);
+        return view($this->name().'::snippet', ['url' => route(TaskTrigger::class)]);
     }
 
     /**

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): array {
+            ->map(function(TaskSchedule $value): array {
 
                 $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/Schema/Migration1.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         // Clean up previous admin tasks table if it exists
         DB::schema()->dropIfExists('maj_admintasks');
 
-        DB::schema()->create('maj_admintasks', static function (Blueprint $table): void {
+        DB::schema()->create('maj_admintasks', static function(Blueprint $table): void {
 
             $table->increments('majat_id');
             $table->string('majat_task_id', 32)->unique();

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

Spacing +7 added lines, -7 removed lines

@@ -195,14 +195,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()');
@@ -268,17 +268,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): void {
+            ->joinSub($this->allGedcomRecords($tree), 'gedrecords', function(JoinClause $join) use ($tree): void {
 
                 $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): void {
+            ->where(function(Builder $query) use ($tree): void {
                 $query->where('gedcom_id', '=', $tree->id())
                     ->orWhereNull('gedcom_id');
             })

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

Spacing +3 added lines, -3 removed lines

@@ -58,12 +58,12 @@
         assert($tree instanceof Tree);
         
         $params = $request->getParsedBody();
-        $user_id = (int) $params['sosa-userid'];
+        $user_id = (int)$params['sosa-userid'];
         $root_id = $params['sosa-rootid'] ?? '';
         
-        if(Auth::id() == $user_id || ($user_id == -1 && Auth::isManager($tree))) {
+        if (Auth::id() == $user_id || ($user_id == -1 && Auth::isManager($tree))) {
             $user = $user_id == -1 ? new DefaultUser() : $this->user_service->find($user_id);
-            if($user !== null && $root_indi = Registry::individualFactory()->make($root_id, $tree)) {
+            if ($user !== null && $root_indi = Registry::individualFactory()->make($root_id, $tree)) {
                 $tree->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $root_indi->xref());
                 FlashMessages::addMessage(I18N::translate('The root individual has been updated.'));
                 return redirect(route(SosaConfig::class, [

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

Spacing +4 added lines, -4 removed lines

@@ -70,7 +70,7 @@ 
         /** @var SosaStatisticsService $sosa_stats_service */
         $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
         
-        return $this->viewResponse($this->module->name() . '::statistics-page', [
+        return $this->viewResponse($this->module->name().'::statistics-page', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Statistics'),
             'tree'              =>  $tree,
@@ -121,8 +121,8 @@ 
         
         $generation_stats = array();
         
-        foreach($stats_by_gen as $gen => $stats_gen){
-            $gen_diff = $gen > 1 ?$stats_gen['diffSosaTotalCount'] - $stats_by_gen[$gen - 1]['diffSosaTotalCount'] : 1;
+        foreach ($stats_by_gen as $gen => $stats_gen) {
+            $gen_diff = $gen > 1 ? $stats_gen['diffSosaTotalCount'] - $stats_by_gen[$gen - 1]['diffSosaTotalCount'] : 1;
             $generation_stats[$gen] = array(
                 'gen_min_birth' => $stats_gen['firstBirth'] ?? $stats_gen['firstEstimatedBirth'],
                 'gen_max_birth' => $stats_gen['lastBirth'] ?? $stats_gen['lastEstimatedBirth'],
@@ -130,7 +130,7 @@ 
                 'known' => $stats_gen['sosaCount'],
                 'perc_known' => $this->safeDivision($stats_gen['sosaCount'], pow(2, $gen - 1)),
                 'missing' => $gen > 1 ? 2 * $stats_by_gen[$gen - 1]['sosaCount'] - $stats_gen['sosaCount'] : 0,
-                'perc_missing' => $gen > 1 ? 1 - $this->safeDivision($stats_gen['sosaCount'],  2 * $stats_by_gen[$gen - 1]['sosaCount']) : 0,
+                'perc_missing' => $gen > 1 ? 1 - $this->safeDivision($stats_gen['sosaCount'], 2 * $stats_by_gen[$gen - 1]['sosaCount']) : 0,
                 'total_known' => $stats_gen['sosaTotalCount'],
                 'perc_total_known' => $this->safeDivision($stats_gen['sosaTotalCount'], pow(2, $gen) - 1),
                 'different' => $gen_diff,

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

Spacing +4 added lines, -4 removed lines

@@ -56,16 +56,16 @@
         $tree = $request->getAttribute('tree');
         assert($tree instanceof Tree);
         
-        $user_id = (int) ($request->getParsedBody()['user_id'] ?? 0);
+        $user_id = (int)($request->getParsedBody()['user_id'] ?? 0);
         $partial_from = $request->getParsedBody()['partial_from'] ?? null;
         
-        if(($user_id == -1 && Auth::isManager($tree)) || Auth::id() == $user_id) {
+        if (($user_id == -1 && Auth::isManager($tree)) || Auth::id() == $user_id) {
             $user = $user_id == -1 ? new DefaultUser() : $this->user_service->find($user_id);
             
             /** @var SosaCalculatorService $sosa_calc_service */
-            $sosa_calc_service = app()->makeWith(SosaCalculatorService::class, [ 'tree' => $tree, 'user' => $user]);
+            $sosa_calc_service = app()->makeWith(SosaCalculatorService::class, ['tree' => $tree, 'user' => $user]);
             
-            if($partial_from !== null && $sosa_from = Registry::individualFactory()->make($partial_from, $tree)) {
+            if ($partial_from !== null && $sosa_from = Registry::individualFactory()->make($partial_from, $tree)) {
                 $res = $sosa_calc_service->computeFromIndividual($sosa_from);
             } else {
                 $res = $sosa_calc_service->computeAll();