jon48 / webtrees-lib

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

app/Module/GeoDispersion/Views/GeoAnalysisTable.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function icon(ModuleInterface $module): string
     {
-        return view($module->name() . '::icons/view-table', ['type' => $this->type()]);
+        return view($module->name().'::icons/view-table', ['type' => $this->type()]);
     }
 
     /**
@@ -63,7 +63,7 @@ 
      */
     public function globalTabContent(ModuleInterface $module, GeoAnalysisResult $result, array $params): string
     {
-        return view($module->name() . '::geoanalysisview-tab-glb-table', $params + [
+        return view($module->name().'::geoanalysisview-tab-glb-table', $params + [
             'result'    =>  $result
         ]);
     }

app/Module/GeoDispersion/Views/GeoAnalysisMap.php

Spacing +8 added lines, -9 removed lines

@@ -42,7 +42,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()]);
     }
 
     /**
@@ -51,7 +51,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(),
@@ -65,12 +65,12 @@ 
      */
     public function withGlobalSettingsUpdate(ServerRequestInterface $request): self
     {
-        $params = (array) $request->getParsedBody();
+        $params = (array)$request->getParsedBody();
 
         $default_color  = $params['view_map_color_default'] ?? '';
         $stroke_color   = $params['view_map_color_stroke'] ?? '';
-        $maxvalue_color  = $params['view_map_color_maxvalue'] ?? '';
-        $hover_color  = $params['view_map_color_hover'] ?? '';
+        $maxvalue_color = $params['view_map_color_maxvalue'] ?? '';
+        $hover_color = $params['view_map_color_hover'] ?? '';
 
         try {
             return $this->withColors(new MapColorsConfig(
@@ -97,12 +97,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.'),
             ]);
         }
@@ -117,7 +116,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(),

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

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();