@@ -54,7 +54,7 @@ |
||
54 | 54 | throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
55 | 55 | } |
56 | 56 | |
57 | - return $this->viewResponse($this->module->name() . '::admin/config', [ |
|
57 | + return $this->viewResponse($this->module->name().'::admin/config', [ |
|
58 | 58 | 'module' => $this->module, |
59 | 59 | 'title' => $this->module->title() |
60 | 60 | ]); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | public function boot(): void |
68 | 68 | { |
69 | 69 | $this->traitBoot(); |
70 | - View::registerCustomView('::modules/privacy-policy/page', $this->name() . '::privacy-policy'); |
|
70 | + View::registerCustomView('::modules/privacy-policy/page', $this->name().'::privacy-policy'); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | /** |
@@ -76,11 +76,11 @@ discard block |
||
76 | 76 | */ |
77 | 77 | public function loadRoutes(Map $router): void |
78 | 78 | { |
79 | - $router->attach('', '', static function (Map $router): void { |
|
79 | + $router->attach('', '', static function(Map $router): void { |
|
80 | 80 | |
81 | - $router->attach('', '/module-maj/misc', static function (Map $router): void { |
|
81 | + $router->attach('', '/module-maj/misc', static function(Map $router): void { |
|
82 | 82 | |
83 | - $router->attach('', '/config/admin', static function (Map $router): void { |
|
83 | + $router->attach('', '/config/admin', static function(Map $router): void { |
|
84 | 84 | |
85 | 85 | $router->get(AdminConfigPage::class, '', AdminConfigPage::class); |
86 | 86 | $router->post(AdminConfigAction::class, '', AdminConfigAction::class); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | public function listSubscribedHooks(): array |
115 | 115 | { |
116 | 116 | return [ |
117 | - app()->makeWith(TitlesCardHook::class, [ 'module' => $this ]) |
|
117 | + app()->makeWith(TitlesCardHook::class, ['module' => $this]) |
|
118 | 118 | ]; |
119 | 119 | } |
120 | 120 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | */ |
34 | 34 | public function boot(): void |
35 | 35 | { |
36 | - View::registerNamespace($this->name(), $this->resourcesFolder() . 'views/'); |
|
36 | + View::registerNamespace($this->name(), $this->resourcesFolder().'views/'); |
|
37 | 37 | |
38 | 38 | $this->loadRoutes(app(RouterContainer::class)->getMap()); |
39 | 39 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | */ |
44 | 44 | public function resourcesFolder(): string |
45 | 45 | { |
46 | - return Webtrees::MODULES_DIR . trim($this->name(), '_') . '/resources/'; |
|
46 | + return Webtrees::MODULES_DIR.trim($this->name(), '_').'/resources/'; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function customTranslations(string $language): array |
71 | 71 | { |
72 | - $translation_file = $this->resourcesFolder() . 'lang/' . $language . '/messages.php'; |
|
72 | + $translation_file = $this->resourcesFolder().'lang/'.$language.'/messages.php'; |
|
73 | 73 | |
74 | 74 | try { |
75 | 75 | $translation = new Translation($translation_file); |
@@ -94,10 +94,10 @@ discard block |
||
94 | 94 | { |
95 | 95 | /** @var ModuleThemeInterface $theme */ |
96 | 96 | $theme = app(ModuleThemeInterface::class); |
97 | - $css_file = $this->resourcesFolder() . 'css/' . $theme->name() . '.min.css'; |
|
97 | + $css_file = $this->resourcesFolder().'css/'.$theme->name().'.min.css'; |
|
98 | 98 | |
99 | 99 | if (file_exists($css_file)) { |
100 | - return $this->assetUrl('css/' . $theme->name() . '.min.css'); |
|
100 | + return $this->assetUrl('css/'.$theme->name().'.min.css'); |
|
101 | 101 | } else { |
102 | 102 | return $this->assetUrl('css/default.min.css'); |
103 | 103 | } |
@@ -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 | /** |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | |
256 | 256 | $individual = Registry::individualFactory()->make($xref, $tree); |
257 | 257 | |
258 | - return view($this->name() . '::sidebar/title', [ |
|
258 | + return view($this->name().'::sidebar/title', [ |
|
259 | 259 | 'module_name' => $this->name(), |
260 | 260 | 'sosa_numbers' => app(SosaRecordsService::class)->sosaNumbers($tree, $user, $individual) |
261 | 261 | ]); |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | $sosa_root = Registry::individualFactory()->make($sosa_root_xref, $individual->tree()); |
272 | 272 | $user = Auth::check() ? Auth::user() : new DefaultUser(); |
273 | 273 | |
274 | - return view($this->name() . '::sidebar/content', [ |
|
274 | + return view($this->name().'::sidebar/content', [ |
|
275 | 275 | 'sosa_ancestor' => $individual, |
276 | 276 | 'sosa_root' => $sosa_root, |
277 | 277 | 'sosa_numbers' => app(SosaRecordsService::class)->sosaNumbers($individual->tree(), $user, $individual) |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | public function listSubscribedHooks(): array |
318 | 318 | { |
319 | 319 | return [ |
320 | - app()->makeWith(SosaIconHook::class, [ 'module' => $this ]) |
|
320 | + app()->makeWith(SosaIconHook::class, ['module' => $this]) |
|
321 | 321 | ]; |
322 | 322 | } |
323 | 323 | } |
@@ -69,7 +69,7 @@ |
||
69 | 69 | $record instanceof Individual && |
70 | 70 | $this->sosa_records_service->isSosa($record->tree(), Auth::user(), $record) |
71 | 71 | ) { |
72 | - return view($this->module->name() . '::icons/sosa', [ 'size_style' => $size ]); |
|
72 | + return view($this->module->name().'::icons/sosa', ['size_style' => $size]); |
|
73 | 73 | } |
74 | 74 | return ''; |
75 | 75 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | |
79 | 79 | $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser(); |
80 | 80 | |
81 | - $current_gen = (int) ($request->getAttribute('gen') ?? 0); |
|
81 | + $current_gen = (int)($request->getAttribute('gen') ?? 0); |
|
82 | 82 | |
83 | 83 | if ($current_gen <= 0) { |
84 | 84 | return response('Invalid generation', StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY); |
@@ -88,14 +88,14 @@ discard block |
||
88 | 88 | $nb_ancestors_all = $list_ancestors->count(); |
89 | 89 | |
90 | 90 | /** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Individual> $list_ancestors */ |
91 | - $list_ancestors = $list_ancestors->mapWithKeys(function (stdClass $value) use ($tree): ?array { |
|
91 | + $list_ancestors = $list_ancestors->mapWithKeys(function(stdClass $value) use ($tree): ?array { |
|
92 | 92 | $indi = Registry::individualFactory()->make($value->majs_i_id, $tree); |
93 | - return ($indi !== null && $indi->canShowName()) ? [(int) $value->majs_sosa => $indi] : null; |
|
93 | + return ($indi !== null && $indi->canShowName()) ? [(int)$value->majs_sosa => $indi] : null; |
|
94 | 94 | })->filter(); |
95 | 95 | |
96 | 96 | $nb_ancestors_shown = $list_ancestors->count(); |
97 | 97 | |
98 | - return $this->viewResponse($this->module->name() . '::list-ancestors-indi-tab', [ |
|
98 | + return $this->viewResponse($this->module->name().'::list-ancestors-indi-tab', [ |
|
99 | 99 | 'module_name' => $this->module->name(), |
100 | 100 | 'title' => I18N::translate('Sosa Ancestors'), |
101 | 101 | 'tree' => $tree, |
@@ -80,19 +80,19 @@ discard block |
||
80 | 80 | /** @var SosaStatisticsService $sosa_stats_service */ |
81 | 81 | $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]); |
82 | 82 | |
83 | - $current_gen = (int) ($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0); |
|
83 | + $current_gen = (int)($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0); |
|
84 | 84 | |
85 | 85 | $list_missing = $this->sosa_record_service->listMissingAncestorsAtGeneration($tree, $user, $current_gen); |
86 | - $nb_missing_diff = $list_missing->sum(function (stdClass $value): int { |
|
86 | + $nb_missing_diff = $list_missing->sum(function(stdClass $value): int { |
|
87 | 87 | return ($value->majs_fat_id === null ? 1 : 0) + ($value->majs_mot_id === null ? 1 : 0); |
88 | 88 | }); |
89 | 89 | |
90 | - $list_missing = $list_missing->map(function (stdClass $value) use ($tree): ?MissingAncestor { |
|
90 | + $list_missing = $list_missing->map(function(stdClass $value) use ($tree): ?MissingAncestor { |
|
91 | 91 | $indi = Registry::individualFactory()->make($value->majs_i_id, $tree); |
92 | 92 | if ($indi !== null && $indi->canShowName()) { |
93 | 93 | return new MissingAncestor( |
94 | 94 | $indi, |
95 | - (int) $value->majs_sosa, |
|
95 | + (int)$value->majs_sosa, |
|
96 | 96 | $value->majs_fat_id === null, |
97 | 97 | $value->majs_mot_id === null |
98 | 98 | ); |
@@ -100,11 +100,11 @@ discard block |
||
100 | 100 | return null; |
101 | 101 | })->filter(); |
102 | 102 | |
103 | - $nb_missing_shown = $list_missing->sum(function (MissingAncestor $value): int { |
|
103 | + $nb_missing_shown = $list_missing->sum(function(MissingAncestor $value): int { |
|
104 | 104 | return ($value->isFatherMissing() ? 1 : 0) + ($value->isMotherMissing() ? 1 : 0); |
105 | 105 | }); |
106 | 106 | |
107 | - return $this->viewResponse($this->module->name() . '::list-missing-page', [ |
|
107 | + return $this->viewResponse($this->module->name().'::list-missing-page', [ |
|
108 | 108 | 'module_name' => $this->module->name(), |
109 | 109 | 'title' => I18N::translate('Missing Ancestors'), |
110 | 110 | 'tree' => $tree, |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | |
79 | 79 | $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser(); |
80 | 80 | |
81 | - $current_gen = (int) ($request->getAttribute('gen') ?? 0); |
|
81 | + $current_gen = (int)($request->getAttribute('gen') ?? 0); |
|
82 | 82 | |
83 | 83 | if ($current_gen <= 0) { |
84 | 84 | return response('Invalid generation', StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY); |
@@ -88,14 +88,14 @@ discard block |
||
88 | 88 | $nb_families_all = $list_families->count(); |
89 | 89 | |
90 | 90 | /** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Family> $list_families */ |
91 | - $list_families = $list_families->mapWithKeys(function (stdClass $value) use ($tree): ?array { |
|
91 | + $list_families = $list_families->mapWithKeys(function(stdClass $value) use ($tree): ?array { |
|
92 | 92 | $fam = Registry::familyFactory()->make($value->f_id, $tree); |
93 | - return ($fam !== null && $fam->canShow()) ? [(int) $value->majs_sosa => $fam] : null; |
|
93 | + return ($fam !== null && $fam->canShow()) ? [(int)$value->majs_sosa => $fam] : null; |
|
94 | 94 | })->filter(); |
95 | 95 | |
96 | 96 | $nb_families_shown = $list_families->count(); |
97 | 97 | |
98 | - return $this->viewResponse($this->module->name() . '::list-ancestors-fam-tab', [ |
|
98 | + return $this->viewResponse($this->module->name().'::list-ancestors-fam-tab', [ |
|
99 | 99 | 'module_name' => $this->module->name(), |
100 | 100 | 'title' => I18N::translate('Sosa Ancestors'), |
101 | 101 | 'tree' => $tree, |
@@ -77,9 +77,9 @@ |
||
77 | 77 | /** @var SosaStatisticsService $sosa_stats_service */ |
78 | 78 | $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]); |
79 | 79 | |
80 | - $current_gen = (int) ($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0); |
|
80 | + $current_gen = (int)($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0); |
|
81 | 81 | |
82 | - return $this->viewResponse($this->module->name() . '::list-ancestors-page', [ |
|
82 | + return $this->viewResponse($this->module->name().'::list-ancestors-page', [ |
|
83 | 83 | 'module_name' => $this->module->name(), |
84 | 84 | 'title' => I18N::translate('Sosa Ancestors'), |
85 | 85 | 'tree' => $tree, |