@@ -58,7 +58,7 @@ |
||
58 | 58 | throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
59 | 59 | } |
60 | 60 | |
61 | - return $this->viewResponse($this->module->name() . '::admin/config', [ |
|
61 | + return $this->viewResponse($this->module->name().'::admin/config', [ |
|
62 | 62 | 'title' => $this->module->title(), |
63 | 63 | 'hook_interfaces_list' => $this->hook_service->all(true) |
64 | 64 | ]); |
@@ -34,7 +34,7 @@ |
||
34 | 34 | DB::schema()->drop('maj_hooks'); |
35 | 35 | } |
36 | 36 | |
37 | - DB::schema()->create('maj_hook_order', static function (Blueprint $table): void { |
|
37 | + DB::schema()->create('maj_hook_order', static function(Blueprint $table): void { |
|
38 | 38 | $table->string('majho_module_name', 32); |
39 | 39 | $table->string('majho_hook_name', 64); |
40 | 40 | $table->integer('majho_hook_order')->nullable(); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | */ |
75 | 75 | public function all(bool $include_disabled = false): Collection |
76 | 76 | { |
77 | - return Registry::cache()->array()->remember('all-hooks', function () use ($include_disabled): Collection { |
|
77 | + return Registry::cache()->array()->remember('all-hooks', function() use ($include_disabled): Collection { |
|
78 | 78 | $hooks_info = DB::table('maj_hook_order') |
79 | 79 | ->get() |
80 | 80 | ->groupBy(['majho_hook_name', 'majho_module_name']); |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | ) as $hook_instance |
105 | 105 | ) { |
106 | 106 | $hook_module_info = $hook_info->get($hook_instance->module()->name(), collect())->first(); |
107 | - $hook_order = $hook_module_info instanceof stdClass ? (int) $hook_module_info->majho_hook_order : 0; |
|
107 | + $hook_order = $hook_module_info instanceof stdClass ? (int)$hook_module_info->majho_hook_order : 0; |
|
108 | 108 | $hook_collector->register($hook_instance, $hook_order); |
109 | 109 | } |
110 | 110 | } |
@@ -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 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | /** @var SosaStatisticsService $sosa_stats_service */ |
72 | 72 | $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]); |
73 | 73 | |
74 | - return $this->viewResponse($this->module->name() . '::statistics-page', [ |
|
74 | + return $this->viewResponse($this->module->name().'::statistics-page', [ |
|
75 | 75 | 'module_name' => $this->module->name(), |
76 | 76 | 'title' => I18N::translate('Sosa Statistics'), |
77 | 77 | 'tree' => $tree, |
@@ -126,37 +126,34 @@ discard block |
||
126 | 126 | |
127 | 127 | foreach ($stats_by_gen as $gen => $stats_gen) { |
128 | 128 | $gen_diff = $gen > 1 ? |
129 | - (int) $stats_gen['diffSosaTotalCount'] - (int) $stats_by_gen[$gen - 1]['diffSosaTotalCount'] : |
|
130 | - 1; |
|
129 | + (int)$stats_gen['diffSosaTotalCount'] - (int)$stats_by_gen[$gen - 1]['diffSosaTotalCount'] : 1; |
|
131 | 130 | $generation_stats[$gen] = array( |
132 | - 'gen_min_birth' => $stats_gen['firstBirth'] ?? (int) $stats_gen['firstEstimatedBirth'], |
|
133 | - 'gen_max_birth' => $stats_gen['lastBirth'] ?? (int) $stats_gen['lastEstimatedBirth'], |
|
131 | + 'gen_min_birth' => $stats_gen['firstBirth'] ?? (int)$stats_gen['firstEstimatedBirth'], |
|
132 | + 'gen_max_birth' => $stats_gen['lastBirth'] ?? (int)$stats_gen['lastEstimatedBirth'], |
|
134 | 133 | 'theoretical' => BigInteger::of(2)->power($gen - 1)->toInt(), |
135 | - 'known' => (int) $stats_gen['sosaCount'], |
|
134 | + 'known' => (int)$stats_gen['sosaCount'], |
|
136 | 135 | 'perc_known' => $this->safeDivision( |
137 | - BigInteger::of((int) $stats_gen['sosaCount']), |
|
136 | + BigInteger::of((int)$stats_gen['sosaCount']), |
|
138 | 137 | BigInteger::of(2)->power($gen - 1) |
139 | 138 | ), |
140 | 139 | 'missing' => $gen > 1 ? |
141 | - 2 * (int) $stats_by_gen[$gen - 1]['sosaCount'] - (int) $stats_gen['sosaCount'] : |
|
142 | - 0, |
|
140 | + 2 * (int)$stats_by_gen[$gen - 1]['sosaCount'] - (int)$stats_gen['sosaCount'] : 0, |
|
143 | 141 | 'perc_missing' => $gen > 1 ? |
144 | 142 | 1 - $this->safeDivision( |
145 | - BigInteger::of((int) $stats_gen['sosaCount']), |
|
146 | - BigInteger::of(2 * (int) $stats_by_gen[$gen - 1]['sosaCount']) |
|
147 | - ) : |
|
148 | - 0, |
|
149 | - 'total_known' => (int) $stats_gen['sosaTotalCount'], |
|
143 | + BigInteger::of((int)$stats_gen['sosaCount']), |
|
144 | + BigInteger::of(2 * (int)$stats_by_gen[$gen - 1]['sosaCount']) |
|
145 | + ) : 0, |
|
146 | + 'total_known' => (int)$stats_gen['sosaTotalCount'], |
|
150 | 147 | 'perc_total_known' => $this->safeDivision( |
151 | - BigInteger::of((int) $stats_gen['sosaTotalCount']), |
|
148 | + BigInteger::of((int)$stats_gen['sosaTotalCount']), |
|
152 | 149 | BigInteger::of(2)->power($gen)->minus(1) |
153 | 150 | ), |
154 | 151 | 'different' => $gen_diff, |
155 | 152 | 'perc_different' => $this->safeDivision( |
156 | 153 | BigInteger::of($gen_diff), |
157 | - BigInteger::of((int) $stats_gen['sosaCount']) |
|
154 | + BigInteger::of((int)$stats_gen['sosaCount']) |
|
158 | 155 | ), |
159 | - 'total_different' => (int) $stats_gen['diffSosaTotalCount'] |
|
156 | + 'total_different' => (int)$stats_gen['diffSosaTotalCount'] |
|
160 | 157 | ); |
161 | 158 | } |
162 | 159 |
@@ -67,10 +67,10 @@ |
||
67 | 67 | $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]); |
68 | 68 | $pedi_collapse_data = $sosa_stats_service->pedigreeCollapseByGenerationData(); |
69 | 69 | |
70 | - $response = [ 'cells' => [] ]; |
|
70 | + $response = ['cells' => []]; |
|
71 | 71 | $last_pedi_collapse = 0; |
72 | 72 | foreach ($pedi_collapse_data as $gen => $rec) { |
73 | - $response['cells'][$gen] = view($this->module->name() . '::components/pedigree-collapse-cell', [ |
|
73 | + $response['cells'][$gen] = view($this->module->name().'::components/pedigree-collapse-cell', [ |
|
74 | 74 | 'pedi_collapse_roots' => $rec['pedi_collapse_roots'], |
75 | 75 | 'pedi_collapse_xgen' => $rec['pedi_collapse_xgen'] |
76 | 76 | ]); |
@@ -34,7 +34,7 @@ |
||
34 | 34 | // Clean up previous sosa table if it exists |
35 | 35 | DB::schema()->dropIfExists('maj_sosa'); |
36 | 36 | |
37 | - DB::schema()->create('maj_sosa', static function (Blueprint $table): void { |
|
37 | + DB::schema()->create('maj_sosa', static function(Blueprint $table): void { |
|
38 | 38 | |
39 | 39 | $table->integer('majs_gedcom_id'); |
40 | 40 | $table->integer('majs_user_id')->default(-1); |