jon48 / webtrees-lib

app/Module/Sosa/Http/RequestHandlers/MissingAncestorsList.php

Spacing +6 added lines, -6 removed lines

@@ -79,22 +79,22 @@ 
         /** @var SosaStatisticsService $sosa_stats_service */
         $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
 
-        $current_gen =  Validator::queryParams($request)->integer(
+        $current_gen = Validator::queryParams($request)->integer(
             'gen',
             Validator::attributes($request)->integer('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
                 );
@@ -102,11 +102,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,

app/Module/Sosa/Services/SosaRecordsService.php

Spacing +32 added lines, -32 removed lines

@@ -98,8 +98,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())
@@ -159,14 +159,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')
@@ -175,7 +175,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();
     }
@@ -198,28 +198,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();
     }
 
@@ -271,26 +271,26 @@ 
         $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 += [
-                        '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,
@@ -306,12 +306,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
             );

app/Module/WelcomeBlock/WelcomeBlockModule.php

Spacing +7 added lines, -7 removed lines

@@ -62,9 +62,9 @@ 
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
-            $router->attach('', '/module-maj/welcomeblock/{block_id}', static function (Map $router): void {
+            $router->attach('', '/module-maj/welcomeblock/{block_id}', static function(Map $router): void {
                 $router->tokens(['block_id' => '\d+']);
                 $router->get(MatomoStats::class, '/matomostats', MatomoStats::class);
             });
@@ -94,7 +94,7 @@ 
         $fab_login_block_view = app(\Fisharebest\Webtrees\Module\LoginBlockModule::class)
             ->getBlock($tree, $block_id, ModuleBlockInterface::CONTEXT_EMBED);
 
-        $content = view($this->name() . '::block-embed', [
+        $content = view($this->name().'::block-embed', [
             'block_id'                  =>  $block_id,
             'fab_welcome_block_view'    =>  $fab_welcome_block_view,
             'fab_login_block_view'      =>  $fab_login_block_view,
@@ -130,7 +130,7 @@ 
      */
     public function editBlockConfiguration(Tree $tree, int $block_id): string
     {
-        return view($this->name() . '::config', $this->matomoSettings($block_id));
+        return view($this->name().'::config', $this->matomoSettings($block_id));
     }
 
     /**
@@ -162,9 +162,9 @@ 
         $this
             ->setBlockSetting($block_id, 'matomo_url', $matomo_url)
             ->setBlockSetting($block_id, 'matomo_token', $matomo_token)
-            ->setBlockSetting($block_id, 'matomo_siteid', (string) $matomo_siteid);
+            ->setBlockSetting($block_id, 'matomo_siteid', (string)$matomo_siteid);
 
-        Registry::cache()->file()->forget($this->name() . '-matomovisits-yearly-' . $block_id);
+        Registry::cache()->file()->forget($this->name().'-matomovisits-yearly-'.$block_id);
     }
 
     /**
@@ -190,7 +190,7 @@ 
             'matomo_enabled' => $this->isMatomoEnabled($block_id),
             'matomo_url' => $this->getBlockSetting($block_id, 'matomo_url'),
             'matomo_token' => $this->getBlockSetting($block_id, 'matomo_token'),
-            'matomo_siteid'  => (int) $this->getBlockSetting($block_id, 'matomo_siteid', '0')
+            'matomo_siteid'  => (int)$this->getBlockSetting($block_id, 'matomo_siteid', '0')
         ];
     }
 }

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

Spacing +2 added lines, -2 removed lines

@@ -76,9 +76,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/GeoDispersion/Views/GeoAnalysisMap.php

Spacing +7 added lines, -8 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function icon(ModuleInterface $module): string
     {
-        return view($module->name() . '::icons/view-map', ['type' => $this->type()]);
+        return view($module->name().'::icons/view-map', ['type' => $this->type()]);
     }
 
     /**
@@ -54,7 +54,7 @@ 
      */
     public function globalSettingsContent(ModuleInterface $module): string
     {
-        return view($module->name() . '::admin/view-edit-map', [
+        return view($module->name().'::admin/view-edit-map', [
             'module_name'   =>  $module->name(),
             'view'          =>  $this,
             'colors'        =>  $this->colors(),
@@ -71,8 +71,8 @@ 
     {
         $default_color  = Validator::parsedBody($request)->string('view_map_color_default', '');
         $stroke_color   = Validator::parsedBody($request)->string('view_map_color_stroke', '');
-        $maxvalue_color  = Validator::parsedBody($request)->string('view_map_color_maxvalue', '');
-        $hover_color  = Validator::parsedBody($request)->string('view_map_color_hover', '');
+        $maxvalue_color = Validator::parsedBody($request)->string('view_map_color_maxvalue', '');
+        $hover_color = Validator::parsedBody($request)->string('view_map_color_hover', '');
 
         try {
             return $this->withColors(new MapColorsConfig(
@@ -99,17 +99,16 @@ 
         foreach ($map_adapters as $map_adapter) {
             $adapter_result_tmp = $map_adapter->convert($result);
             $adapter_result = $adapter_result === null ?
-                $adapter_result_tmp :
-                $adapter_result->merge($adapter_result_tmp);
+                $adapter_result_tmp : $adapter_result->merge($adapter_result_tmp);
         }
 
         if ($adapter_result === null) {
-            return view($module->name() . '::errors/tab-error', [
+            return view($module->name().'::errors/tab-error', [
                 'message'   =>  I18N::translate('The map could not be loaded.'),
             ]);
         }
 
-        return view($module->name() . '::geoanalysisview-tab-glb-map', $params + [
+        return view($module->name().'::geoanalysisview-tab-glb-map', $params + [
             'result'            =>  $adapter_result->geoAnalysisResult(),
             'features'          =>  $adapter_result->features(),
             'colors'            =>  $this->colors(),

app/Module/GeoDispersion/Schema/Migration1.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     {
         $in_transaction = DB::connection()->getPdo()->inTransaction();
 
-        DB::schema()->create('maj_geodisp_views', static function (Blueprint $table): void {
+        DB::schema()->create('maj_geodisp_views', static function(Blueprint $table): void {
             $table->integer('majgv_id')->autoIncrement();
             $table->integer('majgv_gedcom_id')->index();
             $table->string('majgv_view_class', 255);
@@ -45,7 +45,7 @@ 
             $table->foreign('majgv_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade');
         });
 
-        DB::schema()->create('maj_geodisp_mapviews', static function (Blueprint $table): void {
+        DB::schema()->create('maj_geodisp_mapviews', static function(Blueprint $table): void {
             $table->integer('majgm_id')->autoIncrement();
             $table->integer('majgm_majgv_id')->index();
             $table->string('majgm_map_id', 127);

app/Module/GeoDispersion/Http/RequestHandlers/GeoAnalysisViewAddPage.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
         }
         $tree = Validator::attributes($request)->tree();
 
-        return $this->viewResponse($this->module->name() . '::admin/view-add', [
+        return $this->viewResponse($this->module->name().'::admin/view-add', [
             'module'        =>  $this->module,
             'title'         =>  I18N::translate('Add a geographical dispersion analysis view'),
             'tree'          =>  $tree,

app/Module/GeoDispersion/Http/RequestHandlers/MapAdapterEditPage.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
             );
         }
 
-        return $this->viewResponse($this->module->name() . '::admin/map-adapter-edit', [
+        return $this->viewResponse($this->module->name().'::admin/map-adapter-edit', [
             'module'            =>  $this->module,
             'title'             =>  I18N::translate('Edit the map configuration'),
             'tree'              =>  $tree,

app/Module/GeoDispersion/Http/RequestHandlers/MapAdapterAddPage.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
             );
         }
 
-        return $this->viewResponse($this->module->name() . '::admin/map-adapter-edit', [
+        return $this->viewResponse($this->module->name().'::admin/map-adapter-edit', [
             'module'            =>  $this->module,
             'title'             =>  I18N::translate('Add a map configuration'),
             'tree'              =>  $tree,