@@ -57,7 +57,7 @@ |
||
57 | 57 | */ |
58 | 58 | public function name(): string |
59 | 59 | { |
60 | - return $this->module->name() . '-' . |
|
60 | + return $this->module->name().'-'. |
|
61 | 61 | mb_substr(str_replace('collector', '', mb_strtolower((new ReflectionClass($this))->getShortName())), 0, 64); |
62 | 62 | } |
63 | 63 |
@@ -105,10 +105,10 @@ |
||
105 | 105 | public function jsonSerialize() |
106 | 106 | { |
107 | 107 | return [ |
108 | - 'default' => (string) $this->defaultColor()->toHex(), |
|
109 | - 'stroke' => (string) $this->strokeColor()->toHex(), |
|
110 | - 'maxvalue' => (string) $this->maxValueColor()->toHex(), |
|
111 | - 'hover' => (string) $this->hoverColor()->toHex(), |
|
108 | + 'default' => (string)$this->defaultColor()->toHex(), |
|
109 | + 'stroke' => (string)$this->strokeColor()->toHex(), |
|
110 | + 'maxvalue' => (string)$this->maxValueColor()->toHex(), |
|
111 | + 'hover' => (string)$this->hoverColor()->toHex(), |
|
112 | 112 | ]; |
113 | 113 | } |
114 | 114 | } |
@@ -51,7 +51,7 @@ |
||
51 | 51 | $geoanalyses = $this->module_service |
52 | 52 | ->findByInterface(ModuleGeoAnalysisProviderInterface::class, $include_disabled) |
53 | 53 | ->flatMap(fn(ModuleGeoAnalysisProviderInterface $module) => $module->listGeoAnalyses()) |
54 | - ->map(static function (string $analysis_class): ?GeoAnalysisInterface { |
|
54 | + ->map(static function(string $analysis_class): ?GeoAnalysisInterface { |
|
55 | 55 | try { |
56 | 56 | $analysis = app($analysis_class); |
57 | 57 | return $analysis instanceof GeoAnalysisInterface ? $analysis : null; |
@@ -48,10 +48,10 @@ |
||
48 | 48 | public function all(bool $include_disabled = false): Collection |
49 | 49 | { |
50 | 50 | /** @var Collection<PlaceMapperInterface> $place_mappers */ |
51 | - $place_mappers = $this->module_service |
|
51 | + $place_mappers = $this->module_service |
|
52 | 52 | ->findByInterface(ModulePlaceMapperProviderInterface::class, $include_disabled) |
53 | 53 | ->flatMap(fn(ModulePlaceMapperProviderInterface $module) => $module->listPlaceMappers()) |
54 | - ->map(static function (string $mapper_class): ?PlaceMapperInterface { |
|
54 | + ->map(static function(string $mapper_class): ?PlaceMapperInterface { |
|
55 | 55 | try { |
56 | 56 | $mapper = app($mapper_class); |
57 | 57 | return $mapper instanceof PlaceMapperInterface ? $mapper : null; |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | */ |
38 | 38 | public function icon(ModuleInterface $module): string |
39 | 39 | { |
40 | - return view($module->name() . '::icons/view-table', ['type' => $this->type()]); |
|
40 | + return view($module->name().'::icons/view-table', ['type' => $this->type()]); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | */ |
66 | 66 | public function globalTabContent(GeoDispersionModule $module, GeoAnalysisResult $result, array $params): string |
67 | 67 | { |
68 | - return view($module->name() . '::geoanalysisview-tab-glb-table', $params + [ |
|
68 | + return view($module->name().'::geoanalysisview-tab-glb-table', $params + [ |
|
69 | 69 | 'result' => $result |
70 | 70 | ]); |
71 | 71 | } |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | // How to update the database schema for this module |
74 | 74 | private const SCHEMA_TARGET_VERSION = 3; |
75 | 75 | private const SCHEMA_SETTING_NAME = 'MAJ_SOSA_SCHEMA_VERSION'; |
76 | - private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema'; |
|
76 | + private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__.'\Schema'; |
|
77 | 77 | /** |
78 | 78 | * {@inheritDoc} |
79 | 79 | * @see \Fisharebest\Webtrees\Module\AbstractModule::title() |
@@ -113,25 +113,25 @@ discard block |
||
113 | 113 | */ |
114 | 114 | public function loadRoutes(Map $router): void |
115 | 115 | { |
116 | - $router->attach('', '', static function (Map $router): void { |
|
116 | + $router->attach('', '', static function(Map $router): void { |
|
117 | 117 | |
118 | - $router->attach('', '/module-maj/sosa', static function (Map $router): void { |
|
118 | + $router->attach('', '/module-maj/sosa', static function(Map $router): void { |
|
119 | 119 | |
120 | - $router->attach('', '/list', static function (Map $router): void { |
|
120 | + $router->attach('', '/list', static function(Map $router): void { |
|
121 | 121 | $router->tokens(['gen' => '\d+']); |
122 | 122 | $router->get(AncestorsList::class, '/ancestors/{tree}{/gen}', AncestorsList::class); |
123 | - $router->get(AncestorsListIndividual::class, '/ancestors/{tree}/{gen}/tab/individuals', AncestorsListIndividual::class); //phpcs:ignore Generic.Files.LineLength.TooLong |
|
124 | - $router->get(AncestorsListFamily::class, '/ancestors/{tree}/{gen}/tab/families', AncestorsListFamily::class); //phpcs:ignore Generic.Files.LineLength.TooLong |
|
123 | + $router->get(AncestorsListIndividual::class, '/ancestors/{tree}/{gen}/tab/individuals', AncestorsListIndividual::class); //phpcs:ignore Generic.Files.LineLength.TooLong |
|
124 | + $router->get(AncestorsListFamily::class, '/ancestors/{tree}/{gen}/tab/families', AncestorsListFamily::class); //phpcs:ignore Generic.Files.LineLength.TooLong |
|
125 | 125 | $router->get(MissingAncestorsList::class, '/missing/{tree}{/gen}', MissingAncestorsList::class); |
126 | 126 | }); |
127 | 127 | |
128 | - $router->attach('', '/statistics/{tree}', static function (Map $router): void { |
|
128 | + $router->attach('', '/statistics/{tree}', static function(Map $router): void { |
|
129 | 129 | |
130 | 130 | $router->get(SosaStatistics::class, '', SosaStatistics::class); |
131 | 131 | $router->get(PedigreeCollapseData::class, '/pedigreecollapse', PedigreeCollapseData::class); |
132 | 132 | }); |
133 | 133 | |
134 | - $router->attach('', '/config/{tree}', static function (Map $router): void { |
|
134 | + $router->attach('', '/config/{tree}', static function(Map $router): void { |
|
135 | 135 | |
136 | 136 | $router->get(SosaConfig::class, '', SosaConfig::class); |
137 | 137 | $router->post(SosaConfigAction::class, '', SosaConfigAction::class); |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | */ |
231 | 231 | public function headContent(): string |
232 | 232 | { |
233 | - return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">'; |
|
233 | + return '<link rel="stylesheet" href="'.e($this->moduleCssUrl()).'">'; |
|
234 | 234 | } |
235 | 235 | |
236 | 236 | /** |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | */ |
240 | 240 | public function bodyContent(): string |
241 | 241 | { |
242 | - return '<script src="' . $this->assetUrl('js/sosa.min.js') . '"></script>'; |
|
242 | + return '<script src="'.$this->assetUrl('js/sosa.min.js').'"></script>'; |
|
243 | 243 | } |
244 | 244 | |
245 | 245 | /** |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | { |
251 | 251 | $user = Auth::check() ? Auth::user() : new DefaultUser(); |
252 | 252 | |
253 | - return view($this->name() . '::sidebar/title', [ |
|
253 | + return view($this->name().'::sidebar/title', [ |
|
254 | 254 | 'module_name' => $this->name(), |
255 | 255 | 'sosa_numbers' => app(SosaRecordsService::class)->sosaNumbers($individual->tree(), $user, $individual) |
256 | 256 | ]); |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | $sosa_root = Registry::individualFactory()->make($sosa_root_xref, $individual->tree()); |
267 | 267 | $user = Auth::check() ? Auth::user() : new DefaultUser(); |
268 | 268 | |
269 | - return view($this->name() . '::sidebar/content', [ |
|
269 | + return view($this->name().'::sidebar/content', [ |
|
270 | 270 | 'sosa_ancestor' => $individual, |
271 | 271 | 'sosa_root' => $sosa_root, |
272 | 272 | 'sosa_numbers' => app(SosaRecordsService::class)->sosaNumbers($individual->tree(), $user, $individual) |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | public function listSubscribedHooks(): array |
313 | 313 | { |
314 | 314 | return [ |
315 | - app()->makeWith(SosaIconHook::class, [ 'module' => $this ]) |
|
315 | + app()->makeWith(SosaIconHook::class, ['module' => $this]) |
|
316 | 316 | ]; |
317 | 317 | } |
318 | 318 | } |
@@ -69,7 +69,7 @@ |
||
69 | 69 | Validator::attributes($request)->integer('gen', 0) |
70 | 70 | ); |
71 | 71 | |
72 | - return $this->viewResponse($this->module->name() . '::list-ancestors-page', [ |
|
72 | + return $this->viewResponse($this->module->name().'::list-ancestors-page', [ |
|
73 | 73 | 'module_name' => $this->module->name(), |
74 | 74 | 'title' => I18N::translate('Sosa Ancestors'), |
75 | 75 | 'tree' => $tree, |
@@ -86,11 +86,10 @@ |
||
86 | 86 | $max_gen_system = app(SosaRecordsService::class)->maxSystemGenerations(); |
87 | 87 | foreach ($users_root as $key => $user_root) { |
88 | 88 | $users_root[$key]['max_gen'] = is_numeric($user_root['max_gen']) ? |
89 | - (int) $user_root['max_gen'] : |
|
90 | - $max_gen_system; |
|
89 | + (int)$user_root['max_gen'] : $max_gen_system; |
|
91 | 90 | }; |
92 | 91 | |
93 | - return $this->viewResponse($this->module->name() . '::config-page', [ |
|
92 | + return $this->viewResponse($this->module->name().'::config-page', [ |
|
94 | 93 | 'module_name' => $this->module->name(), |
95 | 94 | 'title' => I18N::translate('Sosa Configuration'), |
96 | 95 | 'tree' => $tree, |
@@ -79,22 +79,22 @@ discard block |
||
79 | 79 | /** @var SosaStatisticsService $sosa_stats_service */ |
80 | 80 | $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]); |
81 | 81 | |
82 | - $current_gen = Validator::queryParams($request)->integer( |
|
82 | + $current_gen = Validator::queryParams($request)->integer( |
|
83 | 83 | 'gen', |
84 | 84 | Validator::attributes($request)->integer('gen', 0) |
85 | 85 | ); |
86 | 86 | |
87 | 87 | $list_missing = $this->sosa_record_service->listMissingAncestorsAtGeneration($tree, $user, $current_gen); |
88 | - $nb_missing_diff = $list_missing->sum(function (stdClass $value): int { |
|
88 | + $nb_missing_diff = $list_missing->sum(function(stdClass $value): int { |
|
89 | 89 | return ($value->majs_fat_id === null ? 1 : 0) + ($value->majs_mot_id === null ? 1 : 0); |
90 | 90 | }); |
91 | 91 | |
92 | - $list_missing = $list_missing->map(function (stdClass $value) use ($tree): ?MissingAncestor { |
|
92 | + $list_missing = $list_missing->map(function(stdClass $value) use ($tree): ?MissingAncestor { |
|
93 | 93 | $indi = Registry::individualFactory()->make($value->majs_i_id, $tree); |
94 | 94 | if ($indi !== null && $indi->canShowName()) { |
95 | 95 | return new MissingAncestor( |
96 | 96 | $indi, |
97 | - (int) $value->majs_sosa, |
|
97 | + (int)$value->majs_sosa, |
|
98 | 98 | $value->majs_fat_id === null, |
99 | 99 | $value->majs_mot_id === null |
100 | 100 | ); |
@@ -102,11 +102,11 @@ discard block |
||
102 | 102 | return null; |
103 | 103 | })->filter(); |
104 | 104 | |
105 | - $nb_missing_shown = $list_missing->sum(function (MissingAncestor $value): int { |
|
105 | + $nb_missing_shown = $list_missing->sum(function(MissingAncestor $value): int { |
|
106 | 106 | return ($value->isFatherMissing() ? 1 : 0) + ($value->isMotherMissing() ? 1 : 0); |
107 | 107 | }); |
108 | 108 | |
109 | - return $this->viewResponse($this->module->name() . '::list-missing-page', [ |
|
109 | + return $this->viewResponse($this->module->name().'::list-missing-page', [ |
|
110 | 110 | 'module_name' => $this->module->name(), |
111 | 111 | 'title' => I18N::translate('Missing Ancestors'), |
112 | 112 | 'tree' => $tree, |