jon48 / webtrees-lib

src/Webtrees/Module/GeoDispersion/PlaceMappers/Config/FilteredTopPlaceMapperConfig.php

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
                 ->filter(
                     /** @psalm-suppress MissingClosureParamType */
                     fn($item): bool => $item instanceof Place
-                )->map(fn(Place $place): array => [ $place->tree()->id(), $place->gedcomName() ])
+                )->map(fn(Place $place): array => [$place->tree()->id(), $place->gedcomName()])
                 ->toArray()
         ];
     }
@@ -67,7 +67,7 @@ 
                     ->filter(
                         /** @psalm-suppress MissingClosureParamType */
                         fn($item): bool => is_array($item) && count($item) == 2
-                    )->map(function (array $item): ?Place {
+                    )->map(function(array $item): ?Place {
                         try {
                             return new Place($item[1], $this->tree_service->find($item[0]));
                         } catch (RuntimeException $ex) {

src/Webtrees/Module/GeoDispersion/Schema/Migration1.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
      */
     public function upgrade(): void
     {
-        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);
@@ -44,7 +44,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);

src/Webtrees/Module/GeoDispersion/Services/MapDefinitionsService.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
             fn() => $this->module_service
                 ->findByInterface(ModuleMapDefinitionProviderInterface::class, $include_disabled)
                 ->flatMap(fn(ModuleMapDefinitionProviderInterface $module) => $module->listMapDefinition())
-                ->mapWithKeys(fn(MapDefinitionInterface $map) => [ $map->id() => $map ])
+                ->mapWithKeys(fn(MapDefinitionInterface $map) => [$map->id() => $map])
         );
     }
 }

src/Webtrees/Module/GeoDispersion/Services/PlacesReferenceTableService.php

Spacing +5 added lines, -5 removed lines

@@ -49,14 +49,14 @@ 
         if ($source_parts === false) {
             return null;
         }
-        $source_parts = array_map(function (string $part): string {
+        $source_parts = array_map(function(string $part): string {
             if (preg_match('/^#([^#]+)#$/i', $part, $column_id) === 1) {
                 return $this->columnName($column_id[1]);
             }
             return $this->sanitizeString(str_replace(['?', '*'], ['_', '%'], $part));
         }, array_filter($source_parts));
         $source_parts[] = "'%'";
-        $concat_statement = 'CONCAT(' . implode(', ', $source_parts) . ')';
+        $concat_statement = 'CONCAT('.implode(', ', $source_parts).')';
 
         // Extract columns used in target
         $columns = [];
@@ -67,7 +67,7 @@ 
         // Get the mapping
         $rows = DB::table('maj_geodata_ref')  //DB::table('maj_geodata_ref')
             ->select($columns)
-            ->whereRaw($this->sanitizeString($source) . " LIKE " . $concat_statement)
+            ->whereRaw($this->sanitizeString($source)." LIKE ".$concat_statement)
             ->get();
 
         // Format the output ID
@@ -75,13 +75,13 @@ 
             return null;
         }
 
-        $mapping = (array) $rows->first();
+        $mapping = (array)$rows->first();
         if (count($columns_select) === 0) {
             return $target_format;
         }
 
         return str_replace(
-            array_map(fn($tag) => '{' . $tag . '}', $columns_select[1]),
+            array_map(fn($tag) => '{'.$tag.'}', $columns_select[1]),
             array_map(fn($tag) => $mapping[$this->columnName($tag)] ?? '', $columns_select[1]),
             $target_format
         );

src/Webtrees/Module/GeoDispersion/Services/GeoAnalysisViewDataService.php

Spacing +9 added lines, -9 removed lines

@@ -57,7 +57,7 @@ 
      */
     public function find(Tree $tree, int $id): ?AbstractGeoAnalysisView
     {
-        return $this->all($tree)->first(fn(AbstractGeoAnalysisView $view): bool => $view->id() === $id);
+        return $this->all($tree)->first(fn(AbstractGeoAnalysisView $view) : bool => $view->id() === $id);
     }
 
     /**
@@ -73,7 +73,7 @@ 
     {
         return Registry::cache()->array()->remember(
             'all-geodispersion-views',
-            function () use ($tree, $include_disabled): Collection {
+            function() use ($tree, $include_disabled): Collection {
                 return DB::table('maj_geodisp_views')
                     ->select('maj_geodisp_views.*')
                     ->where('majgv_gedcom_id', '=', $tree->id())
@@ -111,7 +111,7 @@ 
      */
     private function viewMapper(Tree $tree): Closure
     {
-        return function (stdClass $row) use ($tree): ?AbstractGeoAnalysisView {
+        return function(stdClass $row) use ($tree): ?AbstractGeoAnalysisView {
             try {
                 $geoanalysis = app($row->majgv_analysis);
                 if (!($geoanalysis instanceof GeoAnalysisInterface)) {
@@ -119,13 +119,13 @@ 
                 }
 
                 $view = app()->makeWith($row->majgv_view_class, [
-                    'id'                    =>  (int) $row->majgv_id,
+                    'id'                    =>  (int)$row->majgv_id,
                     'tree'                  =>  $tree,
                     'enabled'               =>  $row->majgv_status === 'enabled',
                     'description'           =>  $row->majgv_descr,
                     'geoanalysis'           =>  $geoanalysis,
-                    'depth'                 =>  (int) $row->majgv_place_depth,
-                    'detailed_top_places'   =>  (int) $row->majgv_top_places
+                    'depth'                 =>  (int)$row->majgv_place_depth,
+                    'detailed_top_places'   =>  (int)$row->majgv_top_places
                 ]);
 
                 if ($row->majgv_colors !== null && $view instanceof GeoAnalysisMap) {
@@ -148,7 +148,7 @@ 
      */
     private function mapAdapterMapper(): Closure
     {
-        return function (stdClass $row): ?GeoAnalysisMapAdapter {
+        return function(stdClass $row): ?GeoAnalysisMapAdapter {
             if (null === $map = $this->mapdefinition_service->find($row->majgm_map_id)) {
                 return null;
             }
@@ -159,7 +159,7 @@ 
                 }
 
                 return new GeoAnalysisMapAdapter(
-                    (int) $row->majgm_id,
+                    (int)$row->majgm_id,
                     $map,
                     app($row->majgm_mapper),
                     new MapViewConfig($row->majgm_feature_prop, $this->mapperConfigDecoder($row->majgm_config))
@@ -231,7 +231,7 @@ 
      */
     private function enabledFilter(bool $include_disabled): Closure
     {
-        return function (AbstractGeoAnalysisView $view) use ($include_disabled): bool {
+        return function(AbstractGeoAnalysisView $view) use ($include_disabled): bool {
             return $include_disabled || $view->isEnabled();
         };
     }

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisTable.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
      */
     public function icon(ModuleInterface $module): string
     {
-        return view($module->name() . '::icons/view-table');
+        return view($module->name().'::icons/view-table');
     }
 
     /**
@@ -39,7 +39,7 @@ 
         GeoAnalysisViewDataService $geoview_data_service,
         array $params
     ): string {
-        return view($module->name() . '::geoanalysisview-tab-glb-table', $params + [
+        return view($module->name().'::geoanalysisview-tab-glb-table', $params + [
             'result'    =>  $result
         ]);
     }

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisMap.php

Spacing +4 added lines, -5 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function icon(ModuleInterface $module): string
     {
-        return view($module->name() . '::icons/view-map');
+        return view($module->name().'::icons/view-map');
     }
 
     /**
@@ -53,12 +53,11 @@ 
         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.'),
             ]);
         }
@@ -73,7 +72,7 @@ 
         ];
         //phpcs:enable
 
-        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(),

src/Webtrees/Module/GeoDispersion/Views/AbstractGeoAnalysisView.php

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
      */
     public function detailedTabContent(ModuleInterface $module, Collection $results, array $params): string
     {
-        return view($module->name() . '::geoanalysisview-tab-detailed', $params + [ 'results'   =>  $results ]);
+        return view($module->name().'::geoanalysisview-tab-detailed', $params + ['results'   =>  $results]);
     }
 
     /**

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']);
@@ -85,7 +85,7 @@ 
         $search_columns = ['task_name'];
         $sort_columns   = ['task_name', 'enabled', 'last_run'];
 
-        $callback = function (array $row): array {
+        $callback = function(array $row): array {
             if ($this->module === null) {
                 return [];
             }
@@ -112,21 +112,20 @@ 
 
             $module_name = $this->module->name();
             $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;