@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | // Ambiguous dates - don't override calendar escape |
| 157 | 157 | if ($cal === '') { |
| 158 | 158 | if (preg_match('/^(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)$/', $m)) { |
| 159 | - $cal = GregorianDate::ESCAPE; |
|
| 159 | + $cal = GregorianDate::ESCAPE; |
|
| 160 | 160 | } elseif (preg_match('/^[345]\d\d\d$/', $y)) { |
| 161 | 161 | // Year 3000-5999 |
| 162 | 162 | $cal = JewishDate::ESCAPE; |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | public function addYears(int $years, string $qualifier = ''): Date |
| 452 | 452 | { |
| 453 | 453 | $tmp = clone $this; |
| 454 | - $tmp->date1->year += $years; |
|
| 454 | + $tmp->date1->year += $years; |
|
| 455 | 455 | $tmp->date1->month = 0; |
| 456 | 456 | $tmp->date1->day = 0; |
| 457 | 457 | $tmp->date1->setJdFromYmd(); |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | public function getMenu(Tree $tree): ?Menu |
| 88 | 88 | { |
| 89 | 89 | $submenus = $this->module_service->findByComponent(ModuleListInterface::class, $tree, Auth::user()) |
| 90 | - ->map(static function (ModuleListInterface $module) use ($tree): ?Menu { |
|
| 90 | + ->map(static function (ModuleListInterface $module) use ($tree) : ?Menu { |
|
| 91 | 91 | return $module->listMenu($tree); |
| 92 | 92 | }) |
| 93 | 93 | ->filter() |
@@ -721,7 +721,7 @@ |
||
| 721 | 721 | public function findByName(string $module_name, bool $include_disabled = false): ?ModuleInterface |
| 722 | 722 | { |
| 723 | 723 | return $this->all($include_disabled) |
| 724 | - ->first(static function (ModuleInterface $module) use ($module_name): bool { |
|
| 724 | + ->first(static function (ModuleInterface $module) use ($module_name) : bool { |
|
| 725 | 725 | return $module->name() === $module_name; |
| 726 | 726 | }); |
| 727 | 727 | } |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | } else { |
| 63 | 63 | $ip_address = '127.0.0.1'; |
| 64 | 64 | } |
| 65 | - $tree_id = $tree ? $tree->id() : null; |
|
| 65 | + $tree_id = $tree ? $tree->id() : null; |
|
| 66 | 66 | |
| 67 | 67 | DB::table('log')->insert([ |
| 68 | 68 | 'log_type' => $log_type, |
@@ -2618,7 +2618,7 @@ |
||
| 2618 | 2618 | /** @var ModuleBlockInterface|null $module */ |
| 2619 | 2619 | $module = $this->module_service |
| 2620 | 2620 | ->findByComponent(ModuleBlockInterface::class, $this->tree, Auth::user()) |
| 2621 | - ->first(static function (ModuleInterface $module) use ($block): bool { |
|
| 2621 | + ->first(static function (ModuleInterface $module) use ($block) : bool { |
|
| 2622 | 2622 | return $module->name() === $block && $module->name() !== 'html'; |
| 2623 | 2623 | }); |
| 2624 | 2624 | |
@@ -13,7 +13,8 @@ |
||
| 13 | 13 | use Fisharebest\Webtrees\Module\ModuleCustomTrait; |
| 14 | 14 | use Fisharebest\Webtrees\View; |
| 15 | 15 | |
| 16 | -return new class extends MinimalTheme implements ModuleCustomInterface { |
|
| 16 | +return new class extends MinimalTheme implements ModuleCustomInterface |
|
| 17 | +{ |
|
| 17 | 18 | use ModuleCustomTrait; |
| 18 | 19 | |
| 19 | 20 | /** |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | $currentLen = $endPos + 2; |
| 184 | 184 | $directive = substr($workingText, 0, $currentLen); |
| 185 | 185 | $workingText = substr($workingText, $currentLen); |
| 186 | - $result .= self::$waitingText . $directive; |
|
| 186 | + $result .= self::$waitingText . $directive; |
|
| 187 | 187 | self::$waitingText = ''; |
| 188 | 188 | break; |
| 189 | 189 | } |
@@ -1125,7 +1125,7 @@ discard block |
||
| 1125 | 1125 | |
| 1126 | 1126 | // We're done: finish the span |
| 1127 | 1127 | $textSpan = self::starredName($textSpan, 'RTL'); // Wrap starred name in <u> and </u> tags |
| 1128 | - $result .= $textSpan . self::END_RTL; |
|
| 1128 | + $result .= $textSpan . self::END_RTL; |
|
| 1129 | 1129 | } |
| 1130 | 1130 | |
| 1131 | 1131 | if (self::$currentState !== 'LTR' && self::$currentState !== 'RTL') { |
@@ -828,7 +828,7 @@ |
||
| 828 | 828 | // Until this can be re-designed, we need this assertion to help static analysis tools. |
| 829 | 829 | assert($this->current_element instanceof ReportBaseElement, new LogicException()); |
| 830 | 830 | |
| 831 | - $this->wt_report = array_pop($this->wt_report_stack); |
|
| 831 | + $this->wt_report = array_pop($this->wt_report_stack); |
|
| 832 | 832 | $this->wt_report->addElement($this->current_element); |
| 833 | 833 | } |
| 834 | 834 | |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | public function getIndividuals(Tree $tree, string $request): string |
| 79 | 79 | { |
| 80 | 80 | $json_requests = explode(';', $request); |
| 81 | - $r = []; |
|
| 81 | + $r = []; |
|
| 82 | 82 | foreach ($json_requests as $json_request) { |
| 83 | 83 | $firstLetter = substr($json_request, 0, 1); |
| 84 | 84 | $json_request = substr($json_request, 1); |