@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | public function find(Tree $tree, int $id, bool $include_disabled = false): ?AbstractGeoAnalysisView |
| 43 | 43 | { |
| 44 | 44 | return $this->all($tree, $include_disabled) |
| 45 | - ->first(fn(AbstractGeoAnalysisView $view): bool => $view->id() === $id); |
|
| 45 | + ->first(fn(AbstractGeoAnalysisView $view) : bool => $view->id() === $id); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | /** |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | { |
| 59 | 59 | return Registry::cache()->array()->remember( |
| 60 | 60 | 'all-geodispersion-views', |
| 61 | - function () use ($tree, $include_disabled): Collection { |
|
| 61 | + function() use ($tree, $include_disabled): Collection { |
|
| 62 | 62 | return DB::table('maj_geodisp_views') |
| 63 | 63 | ->select('maj_geodisp_views.*') |
| 64 | 64 | ->where('majgv_gedcom_id', '=', $tree->id()) |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | */ |
| 149 | 149 | private function viewMapper(Tree $tree): Closure |
| 150 | 150 | { |
| 151 | - return function (stdClass $row) use ($tree): ?AbstractGeoAnalysisView { |
|
| 151 | + return function(stdClass $row) use ($tree): ?AbstractGeoAnalysisView { |
|
| 152 | 152 | try { |
| 153 | 153 | $geoanalysis = app($row->majgv_analysis); |
| 154 | 154 | if (!($geoanalysis instanceof GeoAnalysisInterface)) { |
@@ -156,13 +156,13 @@ discard block |
||
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | $view = app()->makeWith($row->majgv_view_class, [ |
| 159 | - 'id' => (int) $row->majgv_id, |
|
| 159 | + 'id' => (int)$row->majgv_id, |
|
| 160 | 160 | 'tree' => $tree, |
| 161 | 161 | 'enabled' => $row->majgv_status === 'enabled', |
| 162 | 162 | 'description' => $row->majgv_descr, |
| 163 | 163 | 'geoanalysis' => $geoanalysis, |
| 164 | - 'depth' => (int) $row->majgv_place_depth, |
|
| 165 | - 'detailed_top_places' => (int) $row->majgv_top_places |
|
| 164 | + 'depth' => (int)$row->majgv_place_depth, |
|
| 165 | + 'detailed_top_places' => (int)$row->majgv_top_places |
|
| 166 | 166 | ]); |
| 167 | 167 | |
| 168 | 168 | if ($row->majgv_colors !== null && $view instanceof GeoAnalysisMap) { |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | */ |
| 211 | 211 | private function enabledFilter(bool $include_disabled): Closure |
| 212 | 212 | { |
| 213 | - return function (AbstractGeoAnalysisView $view) use ($include_disabled): bool { |
|
| 213 | + return function(AbstractGeoAnalysisView $view) use ($include_disabled): bool { |
|
| 214 | 214 | return $include_disabled || $view->isEnabled(); |
| 215 | 215 | }; |
| 216 | 216 | } |
@@ -74,14 +74,14 @@ |
||
| 74 | 74 | |
| 75 | 75 | return $query_individuals->unionAll($query_families) |
| 76 | 76 | ->get()->pluck('g_gedcom') |
| 77 | - ->flatMap(static function (string $gedcom): array { |
|
| 77 | + ->flatMap(static function(string $gedcom): array { |
|
| 78 | 78 | preg_match_all('/\n2 PLAC (.+)/', $gedcom, $matches); |
| 79 | 79 | return $matches[1] ?? []; |
| 80 | 80 | }) |
| 81 | 81 | ->sort(I18N::comparator())->reverse() |
| 82 | - ->mapWithKeys(static function (string $place): array { |
|
| 82 | + ->mapWithKeys(static function(string $place): array { |
|
| 83 | 83 | $place_array = array_reverse(array_filter(array_map('trim', explode(",", $place)))); |
| 84 | - return [ count($place_array) => $place_array ]; |
|
| 84 | + return [count($place_array) => $place_array]; |
|
| 85 | 85 | }) |
| 86 | 86 | ->sortKeys() |
| 87 | 87 | ->last(); |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | */ |
| 133 | 133 | private function mapAdapterMapper(): Closure |
| 134 | 134 | { |
| 135 | - return function (stdClass $row): ?GeoAnalysisMapAdapter { |
|
| 135 | + return function(stdClass $row): ?GeoAnalysisMapAdapter { |
|
| 136 | 136 | if (null === $map = $this->mapdefinition_service->find($row->majgm_map_id)) { |
| 137 | 137 | return null; |
| 138 | 138 | } |
@@ -143,8 +143,8 @@ discard block |
||
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | return new GeoAnalysisMapAdapter( |
| 146 | - (int) $row->majgm_id, |
|
| 147 | - (int) $row->majgm_majgv_id, |
|
| 146 | + (int)$row->majgm_id, |
|
| 147 | + (int)$row->majgm_majgv_id, |
|
| 148 | 148 | $map, |
| 149 | 149 | app($row->majgm_mapper), |
| 150 | 150 | new MapViewConfig($row->majgm_feature_prop, $this->mapperConfigDecoder($row->majgm_config)) |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | return $this->module_service |
| 51 | 51 | ->findByInterface(ModuleGeoAnalysisProviderInterface::class, $include_disabled) |
| 52 | 52 | ->flatMap(fn(ModuleGeoAnalysisProviderInterface $module) => $module->listGeoAnalyses()) |
| 53 | - ->map(static function (string $analysis_class): ?GeoAnalysisInterface { |
|
| 53 | + ->map(static function(string $analysis_class): ?GeoAnalysisInterface { |
|
| 54 | 54 | try { |
| 55 | 55 | $analysis = app($analysis_class); |
| 56 | 56 | return $analysis instanceof GeoAnalysisInterface ? $analysis : null; |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | return $this->module_service |
| 51 | 51 | ->findByInterface(ModulePlaceMapperProviderInterface::class, $include_disabled) |
| 52 | 52 | ->flatMap(fn(ModulePlaceMapperProviderInterface $module) => $module->listPlaceMappers()) |
| 53 | - ->map(static function (string $mapper_class): ?PlaceMapperInterface { |
|
| 53 | + ->map(static function(string $mapper_class): ?PlaceMapperInterface { |
|
| 54 | 54 | try { |
| 55 | 55 | $mapper = app($mapper_class); |
| 56 | 56 | return $mapper instanceof PlaceMapperInterface ? $mapper : null; |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | { |
| 63 | 63 | return [ |
| 64 | 64 | 'topPlaces' => $this->topPlaces() |
| 65 | - ->map(fn(Place $place): array => [ $place->tree()->id(), $place->gedcomName() ]) |
|
| 65 | + ->map(fn(Place $place): array => [$place->tree()->id(), $place->gedcomName()]) |
|
| 66 | 66 | ->toArray() |
| 67 | 67 | ]; |
| 68 | 68 | } |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | ->filter( |
| 83 | 83 | /** @psalm-suppress MissingClosureParamType */ |
| 84 | 84 | fn($item): bool => is_array($item) && count($item) == 2 |
| 85 | - )->map(function (array $item): ?Place { |
|
| 85 | + )->map(function(array $item): ?Place { |
|
| 86 | 86 | try { |
| 87 | 87 | return new Place($item[1], $this->tree_service->find($item[0])); |
| 88 | 88 | } catch (RuntimeException $ex) { |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | */ |
| 103 | 103 | public function configContent(ModuleInterface $module, Tree $tree): string |
| 104 | 104 | { |
| 105 | - return view($module->name() . '::mappers/filtered-top-config', [ |
|
| 105 | + return view($module->name().'::mappers/filtered-top-config', [ |
|
| 106 | 106 | 'tree' => $tree, |
| 107 | 107 | 'top_places' => $this->topPlaces() |
| 108 | 108 | ]); |
@@ -119,13 +119,13 @@ discard block |
||
| 119 | 119 | return $this; |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | - $params = (array) $request->getParsedBody(); |
|
| 122 | + $params = (array)$request->getParsedBody(); |
|
| 123 | 123 | |
| 124 | 124 | $top_places = $params['mapper_filt_top_places'] ?? []; |
| 125 | 125 | if (is_array($top_places)) { |
| 126 | 126 | $config = ['topPlaces' => []]; |
| 127 | 127 | foreach ($top_places as $top_place_id) { |
| 128 | - $place = Place::find((int) $top_place_id, $tree); |
|
| 128 | + $place = Place::find((int)$top_place_id, $tree); |
|
| 129 | 129 | if (mb_strlen($place->gedcomName()) > 0) { |
| 130 | 130 | $config['topPlaces'][] = $place; |
| 131 | 131 | } |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | //How to update the database schema for this module |
| 56 | 56 | private const SCHEMA_TARGET_VERSION = 2; |
| 57 | 57 | private const SCHEMA_SETTING_NAME = 'MAJ_ADMTASKS_SCHEMA_VERSION'; |
| 58 | - private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema'; |
|
| 58 | + private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__.'\Schema'; |
|
| 59 | 59 | |
| 60 | 60 | /** |
| 61 | 61 | * {@inheritDoc} |
@@ -95,12 +95,12 @@ discard block |
||
| 95 | 95 | */ |
| 96 | 96 | public function loadRoutes(Map $router): void |
| 97 | 97 | { |
| 98 | - $router->attach('', '', static function (Map $router): void { |
|
| 98 | + $router->attach('', '', static function(Map $router): void { |
|
| 99 | 99 | |
| 100 | - $router->attach('', '/module-maj/admintasks', static function (Map $router): void { |
|
| 100 | + $router->attach('', '/module-maj/admintasks', static function(Map $router): void { |
|
| 101 | 101 | $router->tokens(['task' => '\d+', 'enable' => '[01]']); |
| 102 | 102 | |
| 103 | - $router->attach('', '/admin', static function (Map $router): void { |
|
| 103 | + $router->attach('', '/admin', static function(Map $router): void { |
|
| 104 | 104 | |
| 105 | 105 | $router->extras([ |
| 106 | 106 | 'middleware' => [ |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | ]); |
| 110 | 110 | $router->get(AdminConfigPage::class, '/config', AdminConfigPage::class); |
| 111 | 111 | |
| 112 | - $router->attach('', '/tasks', static function (Map $router): void { |
|
| 112 | + $router->attach('', '/tasks', static function(Map $router): void { |
|
| 113 | 113 | |
| 114 | 114 | $router->get(TasksList::class, '', TasksList::class); |
| 115 | 115 | $router->get(TaskEditPage::class, '/{task}', TaskEditPage::class); |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | */ |
| 152 | 152 | public function bodyContent(): string |
| 153 | 153 | { |
| 154 | - return view($this->name() . '::snippet', [ 'url' => route(TaskTrigger::class) ]); |
|
| 154 | + return view($this->name().'::snippet', ['url' => route(TaskTrigger::class)]); |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | /** |