@@ -13,7 +13,8 @@ |
||
13 | 13 | /** |
14 | 14 | * Example module |
15 | 15 | */ |
16 | -return new class extends AbstractModule implements ModuleCustomInterface { |
|
16 | +return new class extends AbstractModule implements ModuleCustomInterface |
|
17 | +{ |
|
17 | 18 | use ModuleCustomTrait; |
18 | 19 | |
19 | 20 | /** |
@@ -20,7 +20,8 @@ |
||
20 | 20 | * Example theme. Here we are extending an existing theme. |
21 | 21 | * Instead, you could extend AbstractModule and implement ModuleThemeInterface directly. |
22 | 22 | */ |
23 | -return new class extends MinimalTheme implements ModuleCustomInterface { |
|
23 | +return new class extends MinimalTheme implements ModuleCustomInterface |
|
24 | +{ |
|
24 | 25 | use ModuleCustomTrait; |
25 | 26 | |
26 | 27 | /** |
@@ -344,7 +344,7 @@ |
||
344 | 344 | $html .= '<div id="' . $person->xref() . '" class="fan_chart_menu">'; |
345 | 345 | $html .= '<div class="person_box"><div class="details1">'; |
346 | 346 | $html .= '<div class="charts">'; |
347 | - $html .= '<a href="' . e($person->url()) . '" class="dropdown-item">' . $name. '</a>'; |
|
347 | + $html .= '<a href="' . e($person->url()) . '" class="dropdown-item">' . $name . '</a>'; |
|
348 | 348 | foreach ($theme->individualBoxMenu($person) as $menu) { |
349 | 349 | $html .= '<a href="' . e($menu->getLink()) . '" class="dropdown-item p-1 ' . e($menu->getClass()) . '">' . $menu->getLabel() . '</a>'; |
350 | 350 | } |
@@ -575,7 +575,7 @@ |
||
575 | 575 | $html .= view('components/select', ['id' => $id, 'name' => $name, 'selected' => $value, 'options' => GedcomCodeName::getValues()]); |
576 | 576 | } elseif ($fact === 'TYPE' && $level === '3') { |
577 | 577 | //-- Build the selector for the Media 'TYPE' Fact |
578 | - $html .= '<select name="text[]"><option selected value="" ></option>'; |
|
578 | + $html .= '<select name="text[]"><option selected value="" ></option>'; |
|
579 | 579 | $selectedValue = strtolower($value); |
580 | 580 | if (!array_key_exists($selectedValue, GedcomTag::getFileFormTypes())) { |
581 | 581 | $html .= '<option selected value="' . e($value) . '" >' . e($value) . '</option>'; |
@@ -42,7 +42,7 @@ |
||
42 | 42 | */ |
43 | 43 | public function find($user_id): ?User |
44 | 44 | { |
45 | - return app('cache.array')->rememberForever(__CLASS__ . $user_id, static function () use ($user_id): ?User { |
|
45 | + return app('cache.array')->rememberForever(__CLASS__ . $user_id, static function () use ($user_id) : ?User { |
|
46 | 46 | return DB::table('user') |
47 | 47 | ->where('user_id', '=', $user_id) |
48 | 48 | ->get() |
@@ -321,14 +321,14 @@ discard block |
||
321 | 321 | case 'sis': |
322 | 322 | case 'sib': |
323 | 323 | $table[$x + 1][$y] = '<div style="background:url(' . e(asset('css/images/hline.png')) . ') repeat-x center; width: 94px; text-align: center"><div class="hline-text" style="height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px;">' . view('icons/arrow-right') . '</div></div>'; |
324 | - $x += 2; |
|
324 | + $x += 2; |
|
325 | 325 | break; |
326 | 326 | case 'son': |
327 | 327 | case 'dau': |
328 | 328 | case 'chi': |
329 | 329 | if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) { |
330 | 330 | $table[$x + 1][$y - 1] = '<div style="background:url(' . $diagonal2 . '); width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: end;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: start;">' . view('icons/arrow-down') . '</div></div>'; |
331 | - $x += 2; |
|
331 | + $x += 2; |
|
332 | 332 | } else { |
333 | 333 | $table[$x][$y - 1] = '<div style="background:url(' . e('"' . asset('css/images/vline.png') . '"') . ') repeat-y center; height: 64px; text-align: center;"><div class="vline-text" style="display: inline-block; width:50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . view('icons/arrow-down') . '</div></div>'; |
334 | 334 | } |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | case 'par': |
340 | 340 | if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) { |
341 | 341 | $table[$x + 1][$y + 1] = '<div style="background:url(' . $diagonal1 . '); background-position: top right; width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: start;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: end;">' . view('icons/arrow-down') . '</div></div>'; |
342 | - $x += 2; |
|
342 | + $x += 2; |
|
343 | 343 | } else { |
344 | 344 | $table[$x][$y + 1] = '<div style="background:url(' . e('"' . asset('css/images/vline.png') . '"') . ') repeat-y center; height: 64px; text-align:center; "><div class="vline-text" style="display: inline-block; width: 50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . view('icons/arrow-up') . '</div></div>'; |
345 | 345 | } |
@@ -550,17 +550,17 @@ discard block |
||
550 | 550 | */ |
551 | 551 | private function oldStyleRelationshipPath(Tree $tree, array $path): array |
552 | 552 | { |
553 | - $spouse_codes = [ |
|
553 | + $spouse_codes = [ |
|
554 | 554 | 'M' => 'hus', |
555 | 555 | 'F' => 'wif', |
556 | 556 | 'U' => 'spo', |
557 | 557 | ]; |
558 | - $parent_codes = [ |
|
558 | + $parent_codes = [ |
|
559 | 559 | 'M' => 'fat', |
560 | 560 | 'F' => 'mot', |
561 | 561 | 'U' => 'par', |
562 | 562 | ]; |
563 | - $child_codes = [ |
|
563 | + $child_codes = [ |
|
564 | 564 | 'M' => 'son', |
565 | 565 | 'F' => 'dau', |
566 | 566 | 'U' => 'chi', |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | $create_form = ''; |
336 | 336 | foreach ($media_trees as $media_tree => $media_directory) { |
337 | 337 | if (Str::startsWith($media_folder . $unused_file, $media_directory)) { |
338 | - $tmp = substr($media_folder . $unused_file, strlen($media_directory)); |
|
338 | + $tmp = substr($media_folder . $unused_file, strlen($media_directory)); |
|
339 | 339 | $create_form .= |
340 | 340 | '<p><a href="#" data-toggle="modal" data-target="#modal-create-media-from-file" data-file="' . e($tmp) . '" data-tree="' . e($media_tree) . '" onclick="document.getElementById(\'file\').value=this.dataset.file; document.getElementById(\'ged\').value=this.dataset.tree;">' . I18N::translate('Create') . '</a> — ' . e($media_tree) . '<p>'; |
341 | 341 | } |
@@ -461,7 +461,7 @@ discard block |
||
461 | 461 | |
462 | 462 | try { |
463 | 463 | $imgsize = getimagesize($full_path); |
464 | - $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; |
|
464 | + $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; |
|
465 | 465 | /* I18N: image dimensions, width × height */ |
466 | 466 | $html .= '<dd>' . I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1'])) . '</dd>'; |
467 | 467 | } catch (Throwable $ex) { |