@@ -62,9 +62,9 @@ discard block |
||
62 | 62 | */ |
63 | 63 | public function loadRoutes(Map $router): void |
64 | 64 | { |
65 | - $router->attach('', '', static function (Map $router): void { |
|
65 | + $router->attach('', '', static function(Map $router): void { |
|
66 | 66 | |
67 | - $router->attach('', '/module-maj/welcomeblock/{block_id}', static function (Map $router): void { |
|
67 | + $router->attach('', '/module-maj/welcomeblock/{block_id}', static function(Map $router): void { |
|
68 | 68 | $router->tokens(['block_id' => '\d+']); |
69 | 69 | $router->get(MatomoStats::class, '/matomostats', MatomoStats::class); |
70 | 70 | }); |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | $fab_login_block_view = app(\Fisharebest\Webtrees\Module\LoginBlockModule::class) |
95 | 95 | ->getBlock($tree, $block_id, ModuleBlockInterface::CONTEXT_EMBED); |
96 | 96 | |
97 | - $content = view($this->name() . '::block-embed', [ |
|
97 | + $content = view($this->name().'::block-embed', [ |
|
98 | 98 | 'block_id' => $block_id, |
99 | 99 | 'fab_welcome_block_view' => $fab_welcome_block_view, |
100 | 100 | 'fab_login_block_view' => $fab_login_block_view, |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | */ |
131 | 131 | public function editBlockConfiguration(Tree $tree, int $block_id): string |
132 | 132 | { |
133 | - return view($this->name() . '::config', $this->matomoSettings($block_id)); |
|
133 | + return view($this->name().'::config', $this->matomoSettings($block_id)); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | /** |
@@ -162,9 +162,9 @@ discard block |
||
162 | 162 | $this |
163 | 163 | ->setBlockSetting($block_id, 'matomo_url', $matomo_url) |
164 | 164 | ->setBlockSetting($block_id, 'matomo_token', $matomo_token) |
165 | - ->setBlockSetting($block_id, 'matomo_siteid', (string) $matomo_siteid); |
|
165 | + ->setBlockSetting($block_id, 'matomo_siteid', (string)$matomo_siteid); |
|
166 | 166 | |
167 | - Registry::cache()->file()->forget($this->name() . '-matomovisits-yearly-' . $block_id); |
|
167 | + Registry::cache()->file()->forget($this->name().'-matomovisits-yearly-'.$block_id); |
|
168 | 168 | } |
169 | 169 | |
170 | 170 | /** |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | 'matomo_enabled' => $this->isMatomoEnabled($block_id), |
191 | 191 | 'matomo_url' => $this->getBlockSetting($block_id, 'matomo_url'), |
192 | 192 | 'matomo_token' => $this->getBlockSetting($block_id, 'matomo_token'), |
193 | - 'matomo_siteid' => (int) $this->getBlockSetting($block_id, 'matomo_siteid', '0') |
|
193 | + 'matomo_siteid' => (int)$this->getBlockSetting($block_id, 'matomo_siteid', '0') |
|
194 | 194 | ]; |
195 | 195 | } |
196 | 196 | } |
@@ -69,11 +69,11 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function loadRoutes(Map $router): void |
71 | 71 | { |
72 | - $router->attach('', '', static function (Map $router): void { |
|
72 | + $router->attach('', '', static function(Map $router): void { |
|
73 | 73 | |
74 | - $router->attach('', '/module-maj/lineages', static function (Map $router): void { |
|
74 | + $router->attach('', '/module-maj/lineages', static function(Map $router): void { |
|
75 | 75 | |
76 | - $router->attach('', '/Page', static function (Map $router): void { |
|
76 | + $router->attach('', '/Page', static function(Map $router): void { |
|
77 | 77 | |
78 | 78 | $router->get(SurnamesList::class, '/{tree}/list{/alpha}', SurnamesList::class); |
79 | 79 | $router->get(LineagesPage::class, '/{tree}/lineage/{surname}', LineagesPage::class); |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | */ |
133 | 133 | public function headContent(): string |
134 | 134 | { |
135 | - return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">'; |
|
135 | + return '<link rel="stylesheet" href="'.e($this->moduleCssUrl()).'">'; |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | /** |
@@ -76,9 +76,9 @@ |
||
76 | 76 | $has_task_config = $task instanceof ConfigurableTaskInterface; |
77 | 77 | /** @var \MyArtJaub\Webtrees\Contracts\Tasks\TaskInterface&\MyArtJaub\Webtrees\Contracts\Tasks\ConfigurableTaskInterface $task */ |
78 | 78 | |
79 | - return $this->viewResponse($this->module->name() . '::admin/tasks-edit', [ |
|
79 | + return $this->viewResponse($this->module->name().'::admin/tasks-edit', [ |
|
80 | 80 | 'module' => $this->module, |
81 | - 'title' => I18N::translate('Edit the administrative task') . ' - ' . $task->name(), |
|
81 | + 'title' => I18N::translate('Edit the administrative task').' - '.$task->name(), |
|
82 | 82 | 'task_schedule' => $task_schedule, |
83 | 83 | 'task' => $task, |
84 | 84 | 'has_task_config' => $has_task_config, |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function icon(ModuleInterface $module): string |
47 | 47 | { |
48 | - return view($module->name() . '::icons/view-map', ['type' => $this->type()]); |
|
48 | + return view($module->name().'::icons/view-map', ['type' => $this->type()]); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | */ |
55 | 55 | public function globalSettingsContent(ModuleInterface $module): string |
56 | 56 | { |
57 | - return view($module->name() . '::admin/view-edit-map', [ |
|
57 | + return view($module->name().'::admin/view-edit-map', [ |
|
58 | 58 | 'module_name' => $module->name(), |
59 | 59 | 'view' => $this, |
60 | 60 | 'colors' => $this->colors(), |
@@ -71,8 +71,8 @@ discard block |
||
71 | 71 | { |
72 | 72 | $default_color = Validator::parsedBody($request)->string('view_map_color_default', ''); |
73 | 73 | $stroke_color = Validator::parsedBody($request)->string('view_map_color_stroke', ''); |
74 | - $maxvalue_color = Validator::parsedBody($request)->string('view_map_color_maxvalue', ''); |
|
75 | - $hover_color = Validator::parsedBody($request)->string('view_map_color_hover', ''); |
|
74 | + $maxvalue_color = Validator::parsedBody($request)->string('view_map_color_maxvalue', ''); |
|
75 | + $hover_color = Validator::parsedBody($request)->string('view_map_color_hover', ''); |
|
76 | 76 | |
77 | 77 | try { |
78 | 78 | return $this->withColors(new MapColorsConfig( |
@@ -99,17 +99,16 @@ discard block |
||
99 | 99 | foreach ($map_adapters as $map_adapter) { |
100 | 100 | $adapter_result_tmp = $map_adapter->convert($result); |
101 | 101 | $adapter_result = $adapter_result === null ? |
102 | - $adapter_result_tmp : |
|
103 | - $adapter_result->merge($adapter_result_tmp); |
|
102 | + $adapter_result_tmp : $adapter_result->merge($adapter_result_tmp); |
|
104 | 103 | } |
105 | 104 | |
106 | 105 | if ($adapter_result === null) { |
107 | - return view($module->name() . '::errors/tab-error', [ |
|
106 | + return view($module->name().'::errors/tab-error', [ |
|
108 | 107 | 'message' => I18N::translate('The map could not be loaded.'), |
109 | 108 | ]); |
110 | 109 | } |
111 | 110 | |
112 | - return view($module->name() . '::geoanalysisview-tab-glb-map', $params + [ |
|
111 | + return view($module->name().'::geoanalysisview-tab-glb-map', $params + [ |
|
113 | 112 | 'result' => $adapter_result->geoAnalysisResult(), |
114 | 113 | 'features' => $adapter_result->features(), |
115 | 114 | 'colors' => $this->colors(), |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | { |
32 | 32 | $in_transaction = DB::connection()->getPdo()->inTransaction(); |
33 | 33 | |
34 | - DB::schema()->create('maj_geodisp_views', static function (Blueprint $table): void { |
|
34 | + DB::schema()->create('maj_geodisp_views', static function(Blueprint $table): void { |
|
35 | 35 | $table->integer('majgv_id')->autoIncrement(); |
36 | 36 | $table->integer('majgv_gedcom_id')->index(); |
37 | 37 | $table->string('majgv_view_class', 255); |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $table->foreign('majgv_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade'); |
46 | 46 | }); |
47 | 47 | |
48 | - DB::schema()->create('maj_geodisp_mapviews', static function (Blueprint $table): void { |
|
48 | + DB::schema()->create('maj_geodisp_mapviews', static function(Blueprint $table): void { |
|
49 | 49 | $table->integer('majgm_id')->autoIncrement(); |
50 | 50 | $table->integer('majgm_majgv_id')->index(); |
51 | 51 | $table->string('majgm_map_id', 127); |
@@ -68,7 +68,7 @@ |
||
68 | 68 | } |
69 | 69 | $tree = Validator::attributes($request)->tree(); |
70 | 70 | |
71 | - return $this->viewResponse($this->module->name() . '::admin/view-add', [ |
|
71 | + return $this->viewResponse($this->module->name().'::admin/view-add', [ |
|
72 | 72 | 'module' => $this->module, |
73 | 73 | 'title' => I18N::translate('Add a geographical dispersion analysis view'), |
74 | 74 | 'tree' => $tree, |
@@ -83,7 +83,7 @@ |
||
83 | 83 | ); |
84 | 84 | } |
85 | 85 | |
86 | - return $this->viewResponse($this->module->name() . '::admin/map-adapter-edit', [ |
|
86 | + return $this->viewResponse($this->module->name().'::admin/map-adapter-edit', [ |
|
87 | 87 | 'module' => $this->module, |
88 | 88 | 'title' => I18N::translate('Edit the map configuration'), |
89 | 89 | 'tree' => $tree, |
@@ -83,7 +83,7 @@ |
||
83 | 83 | ); |
84 | 84 | } |
85 | 85 | |
86 | - return $this->viewResponse($this->module->name() . '::admin/map-adapter-edit', [ |
|
86 | + return $this->viewResponse($this->module->name().'::admin/map-adapter-edit', [ |
|
87 | 87 | 'module' => $this->module, |
88 | 88 | 'title' => I18N::translate('Add a map configuration'), |
89 | 89 | 'tree' => $tree, |
@@ -63,7 +63,7 @@ |
||
63 | 63 | $tree = Validator::attributes($request)->tree(); |
64 | 64 | $view_id = Validator::attributes($request)->integer('view_id', 0); |
65 | 65 | |
66 | - return $this->viewResponse($this->module->name() . '::geoanalysisview-page', [ |
|
66 | + return $this->viewResponse($this->module->name().'::geoanalysisview-page', [ |
|
67 | 67 | 'module_name' => $this->module->name(), |
68 | 68 | 'title' => I18N::translate('Geographical dispersion'), |
69 | 69 | 'tree' => $tree, |