jon48 / webtrees-lib

src/Webtrees/Module/GeoDispersion/Http/RequestHandlers/GeoAnalysisViewListData.php

Spacing +4 added lines, -4 removed lines

@@ -70,7 +70,7 @@ 
         $module_name = $this->module->name();
         return response(['data' => $this->geoview_data_service->all($tree, true)
             ->map(fn(AbstractGeoAnalysisView $view) => [
-                "edit" => view($module_name . '::admin/view-table-options', [
+                "edit" => view($module_name.'::admin/view-table-options', [
                     'view_id' => $view->id(),
                     'view_enabled' => $view->isEnabled(),
                     'view_edit_route' => route(GeoAnalysisViewEditPage::class, [
@@ -88,16 +88,16 @@ 
                     ]),
                 ]),
                 "enabled" =>  [
-                    'display' => view($module_name . '::components/yes-no-icons', ['yes' => $view->isEnabled()]),
+                    'display' => view($module_name.'::components/yes-no-icons', ['yes' => $view->isEnabled()]),
                     'raw' => $view->isEnabled() ? 0 : 1
                 ],
                 "type" =>  $view->icon($module),
                 "description" => [
-                    'display' => '<span dir="auto">' . e($view->description()) . '</span>',
+                    'display' => '<span dir="auto">'.e($view->description()).'</span>',
                     'raw' => e($view->description())
                 ],
                 "analysis" => [
-                    'display' => '<span dir="auto">' . e($view->analysis()->title()) . '</span>',
+                    'display' => '<span dir="auto">'.e($view->analysis()->title()).'</span>',
                     'raw' => e($view->analysis()->title())
                 ],
                 "place_depth" => [

src/Webtrees/Module/GeoDispersion/Http/RequestHandlers/MapFeaturePropertyData.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
     {
         $map_id = $request->getQueryParams()['map_id'] ?? $request->getAttribute('map_id') ?? '';
 
-        return response(Registry::cache()->file()->remember('map-properties-' . $map_id, function () use ($map_id) {
+        return response(Registry::cache()->file()->remember('map-properties-'.$map_id, function() use ($map_id) {
             $map = $this->map_definition_service->find($map_id);
             if ($map === null) {
                 throw new HttpNotFoundException(I18N::translate('The map could not be found.'));
@@ -61,7 +61,7 @@ 
                 ->map(fn(Feature $feature): ?stdClass => $feature->getProperties())
                 ->filter()
                 ->map(fn(stdClass $properties) => array_keys(get_object_vars($properties)))
-                ->each(function (array $properties) use (&$features) {
+                ->each(function(array $properties) use (&$features) {
                     $features = count($features) === 0 ? $properties : array_intersect($features, $properties);
                 });
 

src/Webtrees/Module/GeoDispersion/Http/RequestHandlers/MapAdapterEditAction.php

Spacing +5 added lines, -5 removed lines

@@ -73,13 +73,13 @@ 
             return redirect(route(AdminConfigPage::class, ['tree' => $tree]));
         }
 
-        $adapter_id = (int) $request->getAttribute('adapter_id');
+        $adapter_id = (int)$request->getAttribute('adapter_id');
         $map_adapter = $this->mapadapter_data_service->find($adapter_id);
 
-        $params = (array) $request->getParsedBody();
+        $params = (array)$request->getParsedBody();
 
         $map = $this->map_definition_service->find($params['map_adapter_map'] ?? '');
-        $mapping_property   = $params['map_adapter_property_selected'] ?? '';
+        $mapping_property = $params['map_adapter_property_selected'] ?? '';
 
         $mapper = null;
         try {
@@ -103,14 +103,14 @@ 
                 'success'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Map Adapter “' . $map_adapter->id() . '” has been updated.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : Map Adapter “'.$map_adapter->id().'” has been updated.');
         } else {
             FlashMessages::addMessage(
                 I18N::translate('An error occured while updating the map configuration'),
                 'danger'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Map Adapter “' . $map_adapter->id() . '” could not be updated. See error log.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : Map Adapter “'.$map_adapter->id().'” could not be updated. See error log.');
         }
 
         return redirect(route(GeoAnalysisViewEditPage::class, [

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

src/Webtrees/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(),

src/Webtrees/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();
         };
     }

src/Webtrees/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();

src/Webtrees/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))

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

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         return $this->module_service
             ->findByInterface(ModuleGeoAnalysisProviderInterface::class, $include_disabled)
             ->flatMap(fn(ModuleGeoAnalysisProviderInterface $module) => $module->listGeoAnalyses())
-            ->map(static function (string $analysis_class): ?GeoAnalysisInterface {
+            ->map(static function(string $analysis_class): ?GeoAnalysisInterface {
                 try {
                     $analysis = app($analysis_class);
                     return $analysis instanceof GeoAnalysisInterface ? $analysis : null;