jon48 / webtrees-lib

app/Module/GeoDispersion/Schema/Migration2.php

Spacing +6 added lines, -6 removed lines

@@ -91,7 +91,7 @@ 
 
         foreach ($existing_views as $old_view) {
             try {
-                $tree = $tree_service->find((int) $old_view->majgd_file);
+                $tree = $tree_service->find((int)$old_view->majgd_file);
             } catch (RuntimeException $ex) {
                 continue;
             }
@@ -134,8 +134,8 @@ 
             $old_view->majgd_status === 'enabled',
             $old_view->majgd_descr,
             app(SosaByGenerationGeoAnalysis::class),
-            (int) $old_view->majgd_sublevel,
-            (int) $old_view->majgd_detailsgen
+            (int)$old_view->majgd_sublevel,
+            (int)$old_view->majgd_detailsgen
         );
 
         return $geoview_data_service->insertGetId($new_view) > 0;
@@ -165,8 +165,8 @@ 
             $old_view->majgd_status === 'enabled',
             $old_view->majgd_descr,
             app(SosaByGenerationGeoAnalysis::class),
-            (int) $old_view->majgd_sublevel,
-            (int) $old_view->majgd_detailsgen
+            (int)$old_view->majgd_sublevel,
+            (int)$old_view->majgd_detailsgen
         );
 
         $view_id = $geoview_data_service->insertGetId($new_view);
@@ -203,7 +203,7 @@ 
     private function mapIdsFromOld(string $map_xml): array
     {
         $mapping = self::MAPS_XML_MAPPING[$map_xml] ?? [];
-        return is_array($mapping) ? $mapping : [ $mapping ];
+        return is_array($mapping) ? $mapping : [$mapping];
     }
 
     /**

app/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])
         );
     }
 }

app/Module/GeoDispersion/Services/GeoAnalysisViewDataService.php

Spacing +7 added lines, -7 removed lines

@@ -42,7 +42,7 @@ 
     public function find(Tree $tree, int $id, bool $include_disabled = false): ?AbstractGeoAnalysisView
     {
         return $this->all($tree, $include_disabled)
-            ->first(fn(AbstractGeoAnalysisView $view): bool => $view->id() === $id);
+            ->first(fn(AbstractGeoAnalysisView $view) : bool => $view->id() === $id);
     }
 
     /**
@@ -58,7 +58,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())
@@ -148,7 +148,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)) {
@@ -156,13 +156,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) {
@@ -210,7 +210,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();
         };
     }

app/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
         );

app/Module/GeoDispersion/Services/GeoAnalysisDataService.php

Spacing +3 added lines, -3 removed lines

@@ -74,14 +74,14 @@
 
         return $query_individuals->unionAll($query_families)
             ->get()->pluck('g_gedcom')
-            ->flatMap(static function (string $gedcom): array {
+            ->flatMap(static function(string $gedcom): array {
                 preg_match_all('/\n2 PLAC (.+)/', $gedcom, $matches);
                 return $matches[1] ?? [];
             })
             ->sort(I18N::comparator())->reverse()
-            ->mapWithKeys(static function (string $place): array {
+            ->mapWithKeys(static function(string $place): array {
                 $place_array = array_reverse(array_filter(array_map('trim', explode(",", $place))));
-                return [ count($place_array) => $place_array ];
+                return [count($place_array) => $place_array];
             })
             ->sortKeys()
             ->last();

app/Module/GeoDispersion/Services/MapAdapterDataService.php

Spacing +3 added lines, -3 removed lines

@@ -132,7 +132,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;
             }
@@ -143,8 +143,8 @@ 
                 }
 
                 return new GeoAnalysisMapAdapter(
-                    (int) $row->majgm_id,
-                    (int) $row->majgm_majgv_id,
+                    (int)$row->majgm_id,
+                    (int)$row->majgm_majgv_id,
                     $map,
                     app($row->majgm_mapper),
                     new MapViewConfig($row->majgm_feature_prop, $this->mapperConfigDecoder($row->majgm_config))

app/Module/GeoDispersion/PlaceMappers/Config/FilteredTopPlaceMapperConfig.php

Spacing +5 added lines, -5 removed lines

@@ -62,7 +62,7 @@ 
     {
         return [
             'topPlaces' => $this->topPlaces()
-                ->map(fn(Place $place): array => [ $place->tree()->id(), $place->gedcomName() ])
+                ->map(fn(Place $place): array => [$place->tree()->id(), $place->gedcomName()])
                 ->toArray()
         ];
     }
@@ -82,7 +82,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) {
@@ -102,7 +102,7 @@ 
      */
     public function configContent(ModuleInterface $module, Tree $tree): string
     {
-        return view($module->name() . '::mappers/filtered-top-config', [
+        return view($module->name().'::mappers/filtered-top-config', [
             'tree'          =>  $tree,
             'top_places'    =>  $this->topPlaces()
         ]);
@@ -119,13 +119,13 @@ 
             return $this;
         }
 
-        $params = (array) $request->getParsedBody();
+        $params = (array)$request->getParsedBody();
 
         $top_places = $params['mapper_filt_top_places'] ?? [];
         if (is_array($top_places)) {
             $config = ['topPlaces' => []];
             foreach ($top_places as $top_place_id) {
-                $place = Place::find((int) $top_place_id, $tree);
+                $place = Place::find((int)$top_place_id, $tree);
                 if (mb_strlen($place->gedcomName()) > 0) {
                     $config['topPlaces'][] = $place;
                 }

app/Module/GeoDispersion/PlaceMappers/CoordinatesPlaceMapper.php

Spacing +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
         if ($cacheKey === null) {
             return null;
         }
-        return Registry::cache()->array()->remember($cacheKey, function (): ?array {
+        return Registry::cache()->array()->remember($cacheKey, function(): ?array {
             $map_def = $this->data('map');
             if (
                 !$this->setGeometryEngine()
@@ -201,7 +201,7 @@ 
             if ($map_def === null || !($map_def instanceof MapDefinitionInterface)) {
                 return null;
             }
-            return spl_object_id($this) . '-map-' . $map_def->id();
+            return spl_object_id($this).'-map-'.$map_def->id();
         }
         return $this->cache_key;
     }

app/Module/GeoDispersion/Model/GeoAnalysisMapAdapter.php

Spacing +4 added lines, -4 removed lines

@@ -123,7 +123,7 @@ 
                     ->withProperty(
                         'places',
                         $feature_data->places()
-                            ->map(fn(GeoAnalysisPlace $place): string => $place->place()->firstParts(1)->first())
+                            ->map(fn(GeoAnalysisPlace $place) : string => $place->place()->firstParts(1)->first())
                             ->sort(I18N::comparator())
                             ->toArray()
                     );
@@ -135,7 +135,7 @@ 
         $features_data
             ->filter(fn(MapFeatureAnalysisData $data) => !$data->existsInMap())
             ->each(
-                fn (MapFeatureAnalysisData $data) =>
+                fn(MapFeatureAnalysisData $data) =>
                     $data->places()->each(
                         fn(GeoAnalysisPlace $place) => $result->exclude($place)
                     )
@@ -155,7 +155,7 @@ 
         $features_mapping = new Collection();
 
         $byplaces = $result->knownPlaces();
-        $byplaces->each(function (GeoAnalysisResultItem $item) use ($features_mapping, $result): void {
+        $byplaces->each(function(GeoAnalysisResultItem $item) use ($features_mapping, $result): void {
             $id = $this->place_mapper->map($item->place()->place(), $this->config->mapMappingProperty());
 
             if ($id !== null && mb_strlen($id) > 0) {
@@ -168,7 +168,7 @@ 
             }
         });
 
-        return [ $features_mapping, $result];
+        return [$features_mapping, $result];
     }
 
     /**