| @@ -112,7 +112,7 @@ | ||
| 112 | 112 | '<div class="gedcom-data" dir="ltr">' . | 
| 113 | 113 | preg_replace_callback( | 
| 114 | 114 |                      '/@(' . Gedcom::REGEX_XREF . ')@/', | 
| 115 | -                    static function (array $match) use ($tree): string { | |
| 115 | +                    static function (array $match) use ($tree) : string { | |
| 116 | 116 | $record = Registry::gedcomRecordFactory()->make($match[1], $tree); | 
| 117 | 117 | |
| 118 | 118 | return $record ? '<a href="' . e($record->url()) . '">' . $match[0] . '</a>' : $match[0]; | 
| @@ -117,7 +117,7 @@ discard block | ||
| 117 | 117 | 'generations' => 3, | 
| 118 | 118 | 'layout' => PedigreeChartModule::STYLE_RIGHT, | 
| 119 | 119 | ]); | 
| 120 | -                        $content   = view('modules/charts/chart', [ | |
| 120 | +                        $content = view('modules/charts/chart', [ | |
| 121 | 121 | 'block_id' => $block_id, | 
| 122 | 122 | 'chart_url' => $chart_url, | 
| 123 | 123 | ]); | 
| @@ -137,7 +137,7 @@ discard block | ||
| 137 | 137 | 'generations' => 2, | 
| 138 | 138 | 'chart_style' => DescendancyChartModule::CHART_STYLE_TREE, | 
| 139 | 139 | ]); | 
| 140 | -                        $content   = view('modules/charts/chart', [ | |
| 140 | +                        $content = view('modules/charts/chart', [ | |
| 141 | 141 | 'block_id' => $block_id, | 
| 142 | 142 | 'chart_url' => $chart_url, | 
| 143 | 143 | ]); | 
| @@ -157,7 +157,7 @@ discard block | ||
| 157 | 157 | 'ajax' => true, | 
| 158 | 158 | 'generations' => 2, | 
| 159 | 159 | ]); | 
| 160 | -                        $content   = view('modules/charts/chart', [ | |
| 160 | +                        $content = view('modules/charts/chart', [ | |
| 161 | 161 | 'block_id' => $block_id, | 
| 162 | 162 | 'chart_url' => $chart_url, | 
| 163 | 163 | ]); | 
| @@ -828,7 +828,7 @@ | ||
| 828 | 828 | public static function chr(int $code): string | 
| 829 | 829 |      { | 
| 830 | 830 |          if ($code < 0 || $code > 0x1FFFFF) { | 
| 831 | - throw new InvalidArgumentException((string)$code); | |
| 831 | + throw new InvalidArgumentException((string) $code); | |
| 832 | 832 | } | 
| 833 | 833 | |
| 834 | 834 |          if ($code <= 0x7F) { | 
| @@ -126,7 +126,7 @@ | ||
| 126 | 126 |              } else { | 
| 127 | 127 | $match = []; | 
| 128 | 128 |                  if (preg_match('/NOW([+\-]\d+)/', $attrs['default'], $match) > 0) { | 
| 129 | - $date = Registry::timestampFactory()->now()->addDays((int)$match[1]); | |
| 129 | + $date = Registry::timestampFactory()->now()->addDays((int) $match[1]); | |
| 130 | 130 |                      $this->input['default'] = strtoupper($date->format('d M Y')); | 
| 131 | 131 |                  } else { | 
| 132 | 132 | $this->input['default'] = $attrs['default']; | 
| @@ -154,7 +154,7 @@ | ||
| 154 | 154 |      { | 
| 155 | 155 | $tree = Validator::attributes($request)->treeOptional(); | 
| 156 | 156 |          $default = Site::getPreference('DEFAULT_GEDCOM'); | 
| 157 | - $tree ??= $this->tree_service->all()[$default] ?? $this->tree_service->all()->first(); | |
| 157 | + $tree ??= $this->tree_service->all()[$default] ?? $this->tree_service->all()->first(); | |
| 158 | 158 | |
| 159 | 159 | $status_code = $exception->getCode(); | 
| 160 | 160 | |
| @@ -146,8 +146,8 @@ discard block | ||
| 146 | 146 |      { | 
| 147 | 147 |          $default_events = implode(',', self::DEFAULT_EVENTS); | 
| 148 | 148 | |
| 149 | - $days = (int)$this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS); | |
| 150 | - $filter = (bool)$this->getBlockSetting($block_id, 'filter', self::DEFAULT_FILTER); | |
| 149 | + $days = (int) $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS); | |
| 150 | + $filter = (bool) $this->getBlockSetting($block_id, 'filter', self::DEFAULT_FILTER); | |
| 151 | 151 | $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE); | 
| 152 | 152 | $sortStyle = $this->getBlockSetting($block_id, 'sortStyle', self::DEFAULT_SORT); | 
| 153 | 153 | $events = $this->getBlockSetting($block_id, 'events', $default_events); | 
| @@ -256,8 +256,8 @@ discard block | ||
| 256 | 256 |          $sort_style = Validator::parsedBody($request)->isInArrayKeys($this->sortStyles())->string('sortStyle'); | 
| 257 | 257 |          $events     = Validator::parsedBody($request)->array('events'); | 
| 258 | 258 | |
| 259 | - $this->setBlockSetting($block_id, 'days', (string)$days); | |
| 260 | - $this->setBlockSetting($block_id, 'filter', (string)$filter); | |
| 259 | + $this->setBlockSetting($block_id, 'days', (string) $days); | |
| 260 | + $this->setBlockSetting($block_id, 'filter', (string) $filter); | |
| 261 | 261 | $this->setBlockSetting($block_id, 'infoStyle', $info_style); | 
| 262 | 262 | $this->setBlockSetting($block_id, 'sortStyle', $sort_style); | 
| 263 | 263 |          $this->setBlockSetting($block_id, 'events', implode(',', $events)); | 
| @@ -144,8 +144,7 @@ | ||
| 144 | 144 | } | 
| 145 | 145 | return $genitive( | 
| 146 | 146 | $sex === 'F' ? | 
| 147 | - 'cousine du ' . $down . '<sup>e</sup> au ' . $up . '<sup>e</sup> degré' : | |
| 148 | - 'cousin du ' . $down . '<sup>e</sup> au ' . $up . '<sup>e</sup> degré', | |
| 147 | + 'cousine du ' . $down . '<sup>e</sup> au ' . $up . '<sup>e</sup> degré' : 'cousin du ' . $down . '<sup>e</sup> au ' . $up . '<sup>e</sup> degré', | |
| 149 | 148 | $sex === 'F' ? 'de la ' : 'du ' | 
| 150 | 149 | ); | 
| 151 | 150 | }; | 
| @@ -58,7 +58,7 @@ | ||
| 58 | 58 | |
| 59 | 59 | // Force a ".ged" suffix | 
| 60 | 60 |          if (strtolower(pathinfo($filename, PATHINFO_EXTENSION)) === 'ged') { | 
| 61 | - $download_filename = substr($filename, 0, -4); | |
| 61 | + $download_filename = substr($filename, 0, -4); | |
| 62 | 62 |          } else { | 
| 63 | 63 | $download_filename = $filename; | 
| 64 | 64 | } | 
| @@ -199,7 +199,7 @@ discard block | ||
| 199 | 199 | $currentLen = $endPos + 2; | 
| 200 | 200 | $directive = substr($workingText, 0, $currentLen); | 
| 201 | 201 | $workingText = substr($workingText, $currentLen); | 
| 202 | - $result .= self::$waitingText . $directive; | |
| 202 | + $result .= self::$waitingText . $directive; | |
| 203 | 203 | self::$waitingText = ''; | 
| 204 | 204 | break; | 
| 205 | 205 | } | 
| @@ -308,7 +308,7 @@ discard block | ||
| 308 | 308 | break; | 
| 309 | 309 | } | 
| 310 | 310 | self::$waitingText .= $currentLetter; | 
| 311 | - $workingText = substr($workingText, $currentLen); | |
| 311 | + $workingText = substr($workingText, $currentLen); | |
| 312 | 312 |                          if ($openParIndex !== false) { | 
| 313 | 313 | // Opening parentheses always inherit the following directionality | 
| 314 | 314 |                              while (true) { | 
| @@ -318,13 +318,13 @@ discard block | ||
| 318 | 318 |                                  if (str_starts_with($workingText, ' ')) { | 
| 319 | 319 | // Spaces following this left parenthesis inherit the following directionality too | 
| 320 | 320 | self::$waitingText .= ' '; | 
| 321 | - $workingText = substr($workingText, 1); | |
| 321 | + $workingText = substr($workingText, 1); | |
| 322 | 322 | continue; | 
| 323 | 323 | } | 
| 324 | 324 |                                  if (str_starts_with($workingText, ' ')) { | 
| 325 | 325 | // Spaces following this left parenthesis inherit the following directionality too | 
| 326 | 326 | self::$waitingText .= ' '; | 
| 327 | - $workingText = substr($workingText, 6); | |
| 327 | + $workingText = substr($workingText, 6); | |
| 328 | 328 | continue; | 
| 329 | 329 | } | 
| 330 | 330 | break; | 
| @@ -341,7 +341,7 @@ discard block | ||
| 341 | 341 | // Exceptions to this rule will be handled later during final clean-up. | 
| 342 | 342 | // | 
| 343 | 343 |                          if (self::$currentState !== '') { | 
| 344 | - $result .= self::$waitingText; | |
| 344 | + $result .= self::$waitingText; | |
| 345 | 345 | self::$waitingText = ''; | 
| 346 | 346 | } | 
| 347 | 347 | break 2; // double break because we're waiting for more information | 
| @@ -470,7 +470,7 @@ discard block | ||
| 470 | 470 | } | 
| 471 | 471 |                  if (substr($result . "\n", 0, self::LENGTH_START) !== self::START_LTR && substr($result . "\n", 0, self::LENGTH_START) !== self::START_RTL) { | 
| 472 | 472 | $leadingText .= substr($result, 0, 1); | 
| 473 | - $result = substr($result, 1); | |
| 473 | + $result = substr($result, 1); | |
| 474 | 474 | continue; | 
| 475 | 475 | } | 
| 476 | 476 | $result = substr($result, 0, self::LENGTH_START) . $leadingText . substr($result, self::LENGTH_START); | 
| @@ -612,11 +612,11 @@ discard block | ||
| 612 | 612 | private static function breakCurrentSpan(string &$result): void | 
| 613 | 613 |      { | 
| 614 | 614 | // Interrupt the current span, insert that <br>, and then continue the current span | 
| 615 | - $result .= self::$waitingText; | |
| 615 | + $result .= self::$waitingText; | |
| 616 | 616 | self::$waitingText = ''; | 
| 617 | 617 | |
| 618 | 618 | $breakString = '<' . self::$currentState . 'br>'; | 
| 619 | - $result .= $breakString; | |
| 619 | + $result .= $breakString; | |
| 620 | 620 | } | 
| 621 | 621 | |
| 622 | 622 | /** | 
| @@ -673,7 +673,7 @@ discard block | ||
| 673 | 673 | break; | 
| 674 | 674 | } // No more numeric strings | 
| 675 | 675 | |
| 676 | - $tempResult .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string | |
| 676 | + $tempResult .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string | |
| 677 | 677 | $numericString = substr($textSpan, $posLRE + 3, $posPDF - $posLRE); // Separate the entire numeric string | 
| 678 | 678 | $textSpan = substr($textSpan, $posPDF + 3); | 
| 679 | 679 | $posColon = strpos($numericString, ':'); | 
| @@ -1140,7 +1140,7 @@ discard block | ||
| 1140 | 1140 | |
| 1141 | 1141 | // We're done: finish the span | 
| 1142 | 1142 | $textSpan = self::starredName($textSpan, 'RTL'); // Wrap starred name in <u> and </u> tags | 
| 1143 | - $result .= $textSpan . self::END_RTL; | |
| 1143 | + $result .= $textSpan . self::END_RTL; | |
| 1144 | 1144 | } | 
| 1145 | 1145 | |
| 1146 | 1146 |          if (self::$currentState !== 'LTR' && self::$currentState !== 'RTL') { |