fisharebest / webtrees

app/Services/SearchService.php

Spacing +1 added lines, -1 removed lines

@@ -1070,7 +1070,7 @@
      * @param Expression|string $column
      * @param array<string>     $search_terms
      */
-    private function whereSearch(Builder $query, Expression|string $column, array $search_terms): void
+    private function whereSearch(Builder $query, Expression | string $column, array $search_terms): void
     {
         foreach ($search_terms as $search_term) {
             $query->where($column, $this->iLike(), '%' . addcslashes($search_term, '\\%_') . '%');

app/Module/IndividualListModule.php

Braces +3 added lines, -1 removed lines

@@ -290,7 +290,8 @@ 
                     <li class="wt-initials-list-item d-flex">
                         <?php if ($count > 0) : ?>
                             <a href="<?= e($this->listUrl($tree, ['alpha' => $letter, 'show_marnm' => $show_marnm, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->displaySurnameInitial((string) $letter) ?></a>
-                        <?php else : ?>
+                        <?php else {
+    : ?>
                             <span class="wt-initial px-1 text-muted"><?= $this->displaySurnameInitial((string) $letter) ?></span>
 
                         <?php endif ?>
@@ -345,6 +346,7 @@ 
                 switch ($alpha) {
                     case '@':
                         $filter = static fn(string $x): bool => $x === Individual::NOMEN_NESCIO;
+}
                         break;
                     case ',':
                         $filter = static fn(string $x): bool => $x === '';

Spacing +2 added lines, -2 removed lines

@@ -216,7 +216,7 @@ 
         $surname_initials = $this->surnameInitials($surname_data);
 
         // We've requested a surname that doesn't currently exist.
-        if ($surname !== ''  && !array_key_exists($surname, $all_surns)) {
+        if ($surname !== '' && !array_key_exists($surname, $all_surns)) {
             $message = I18N::translate('There are no individuals with the surname “%s“', e($surname));
             FlashMessages::addMessage($message);
 
@@ -604,7 +604,7 @@ 
             ->groupBy([$this->binaryColumn('n_givn')]);
 
         foreach ($query->get() as $row) {
-            $initial            = I18N::strtoupper(I18N::language()->initialLetter($row->n_givn));
+            $initial = I18N::strtoupper(I18N::language()->initialLetter($row->n_givn));
             $initials[$initial] ??= 0;
             $initials[$initial] += (int) $row->count;
         }

app/Validator.php

Spacing +9 added lines, -9 removed lines

@@ -125,7 +125,7 @@ 
      */
     public function isBetween(int $minimum, int $maximum): self
     {
-        $this->rules[] = static function (?int $value) use ($minimum, $maximum): ?int {
+        $this->rules[] = static function (?int $value) use ($minimum, $maximum) : ?int {
             if (is_int($value) && $value >= $minimum && $value <= $maximum) {
                 return $value;
             }
@@ -143,7 +143,7 @@ 
      */
     public function isInArray(array $values): self
     {
-        $this->rules[] = static fn (int|string|null $value): int|string|null => in_array($value, $values, true) ? $value : null;
+        $this->rules[] = static fn (int | string | null $value): int | string | null => in_array($value, $values, true) ? $value : null;
 
         return $this;
     }
@@ -163,7 +163,7 @@ 
      */
     public function isNotEmpty(): self
     {
-        $this->rules[] = static fn (?string $value): ?string => $value !== null && $value !== '' ? $value : null;
+        $this->rules[] = static fn (?string $value) : ?string => $value !== null && $value !== '' ? $value : null;
 
         return $this;
     }
@@ -175,7 +175,7 @@ 
     {
         $base_url = $this->request->getAttribute('base_url', '');
 
-        $this->rules[] = static function (?string $value) use ($base_url): ?string {
+        $this->rules[] = static function (?string $value) use ($base_url) : ?string {
             if ($value !== null) {
                 $value_info    = parse_url($value);
                 $base_url_info = parse_url($base_url);
@@ -279,7 +279,7 @@ 
             throw new HttpBadRequestException(I18N::translate('The parameter “%s” is missing.', $parameter));
         }
 
-        $callback = static fn (?array $value, Closure $rule): ?array => $rule($value);
+        $callback = static fn (?array $value, Closure $rule) : ?array => $rule($value);
 
         return array_reduce($this->rules, $callback, $value) ?? [];
     }
@@ -300,7 +300,7 @@ 
             $value = null;
         }
 
-        $callback = static fn (?float $value, Closure $rule): ?float => $rule($value);
+        $callback = static fn (?float $value, Closure $rule) : ?float => $rule($value);
 
         $value = array_reduce($this->rules, $callback, $value) ?? $default;
 
@@ -333,7 +333,7 @@ 
             $value = null;
         }
 
-        $callback = static fn (?int $value, Closure $rule): ?int => $rule($value);
+        $callback = static fn (?int $value, Closure $rule) : ?int => $rule($value);
 
         $value = array_reduce($this->rules, $callback, $value) ?? $default;
 
@@ -374,9 +374,9 @@ 
             $value = null;
         }
 
-        $callback = static fn (?string $value, Closure $rule): ?string => $rule($value);
+        $callback = static fn (?string $value, Closure $rule) : ?string => $rule($value);
 
-        $value =  array_reduce($this->rules, $callback, $value) ?? $default;
+        $value = array_reduce($this->rules, $callback, $value) ?? $default;
 
         if ($value === null) {
             throw new HttpBadRequestException(I18N::translate('The parameter “%s” is missing.', $parameter));

app/SessionDatabaseHandler.php

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
 
             // Only update session once a minute to reduce contention on the session table.
             if ($now->subtractMinutes(1)->timestamp() > Registry::timestampFactory()->fromString($this->row->session_time)->timestamp()) {
-                $updates['session_time'] =  $now->toDateTimeString();
+                $updates['session_time'] = $now->toDateTimeString();
             }
 
             if ($updates !== []) {

app/Report/HtmlRenderer.php

Braces +2 added lines, -1 removed lines

@@ -198,7 +198,8 @@
         //-- footer
         echo '</div>';
         //echo '<script>document.getElementById("bodydiv").style.height="', $this->maxY, 'pt";</script>';
-        if ($this->Y < 200) { //heuristic guess!
+        if ($this->Y < 200) {
+//heuristic guess!
             echo '<div id="bottommargin" style="position: relative; top: auto; height: ', $this->bottom_margin - $this->footer_margin, 'pt;width:', $this->noMarginWidth, 'pt;"></div>';
             echo '<div id="footerdiv" style="position: relative; top: auto; width: ', $this->noMarginWidth, 'pt;height:auto;">';
         } else {

app/Gedcom.php

Spacing +1 added lines, -1 removed lines

@@ -346,7 +346,7 @@
         '_MBON',
         '_NMR',
         '_SEPR',
-    '_SP_DEAT',  // only used internally, not exported to a gedcom file
+    '_SP_DEAT', // only used internally, not exported to a gedcom file
     ];
 
     public const CUSTOM_INDIVIDUAL_TAGS = [

app/Report/ReportParserGenerate.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1138,7 +1138,7 @@
                         $value = str_replace("\n", "<br>", $value);
                         //$value = strip_tags(Registry::markdownFactory()->autolink($value, $this->tree), ['br']);
                     }
-                    $value = strtr($value, [MarkdownFactory::BREAK => ' ']);
+                    $value = strtr($value, [MarkdownFactory::break => ' ']);
                 }
 
                 if (isset($attrs['lcfirst'])) {

Spacing +3 added lines, -3 removed lines

@@ -1021,7 +1021,7 @@ 
                 $this->current_element->addText(I18N::translate('Private'));
             } elseif ($nameselect == 'latest') {
                 $tmp = $record->getAllNames();
-                $name  = strip_tags($tmp[count($tmp) - 1]['full']);
+                $name = strip_tags($tmp[count($tmp) - 1]['full']);
                 $this->current_element->addText(trim($name));
             } elseif ($nameselect == 'combined') {
                 $tmp = $record->getAllNames();
@@ -1102,7 +1102,7 @@ 
                 $value = $this->getGedcomValue($tag, $level, $this->gedrec);
                 switch (end($tags)) {
                     case 'DATE':
-                        $tmp   = new Date($value);
+                        $tmp = new Date($value);
                         $dfmt = "%j %F %Y";
                         if (!empty($attrs['truncate'])) {
                             if ($attrs['truncate'] === "d") {
@@ -1142,7 +1142,7 @@ 
 
                 if (isset($attrs['lcfirst'])) {
                     $value = lcfirst($value);
-                    $value = str_replace(["Å","Ä","Ö"], ["å","ä","ö"], $value);
+                    $value = str_replace(["Å", "Ä", "Ö"], ["å", "ä", "ö"], $value);
                 }
 
                 if (!empty($attrs['truncate'])) {

Braces +6 added lines, -3 removed lines

@@ -1026,7 +1026,8 @@ 
             } elseif ($nameselect == 'combined') {
                 $tmp = $record->getAllNames();
                 $name = $tmp[count($tmp) - 1]['full'];
-                if ($ix1 = strpos($name, '<span class="starredname">')) {   // '«' and '»' mark text for underlining
+                if ($ix1 = strpos($name, '<span class="starredname">')) {
+// '«' and '»' mark text for underlining
                     $name = substr_replace($name, '«', $ix1, 26);
                     $ix1 = strpos($name, '</span>', $ix1);
                     $name = substr_replace($name, '»', $ix1, 7);
@@ -1501,7 +1502,8 @@ 
         // Resort facts in chronological order, if possible
         $m = count($this->repeats) - 1;
         $prevd = 0;
-        for ($i = 0; $i <= $m; $i++) { // keep undated events after previous dated event
+        for ($i = 0; $i <= $m; $i++) {
+// keep undated events after previous dated event
             if ($jdarr[$i] === 0) {
                 $jdarr[$i] = $prevd;
             } else {
@@ -1746,7 +1748,8 @@ 
         } elseif (preg_match('/^I18N::translateContext\(\'(.+)\', *\'(.+)\'\)$/', $value, $match)) {
             $value = I18N::translateContext($match[1], $match[2]);
         }
-        if (isset($attrs['lcfirst'])) { // set 1st char to lower case
+        if (isset($attrs['lcfirst'])) {
+// set 1st char to lower case
             $value = lcfirst($value);
         }
 

app/Report/ReportHtmlTextbox.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
                         $lastelement   = $element;
                     }
                 } elseif ($element instanceof ReportHtmlImage) {
-                    $lastelement   = $element;
+                    $lastelement = $element;
                 } elseif ($element instanceof ReportHtmlFootnote) {
                     // Check if the Footnote has been set with it’s link number
                     $renderer->checkFootnote($element);
@@ -141,7 +141,7 @@ 
             $this->top += 222000;
         }
         if ($this->top < -10000) { // <= -100000: both pdf and html; -100000 -- -90000: only html
-            $this->top += 90000;  //= ReportBaseElement::CURRENT_POSITION;
+            $this->top += 90000; //= ReportBaseElement::CURRENT_POSITION;
             if ($this->top < -9000) {
                 $this->top += 10000;
             }

Braces +4 added lines, -2 removed lines

@@ -137,10 +137,12 @@
         // If current position (top)
         $align_Y = false;
         $topstr = "";
-        if ($this->top < -110000) { // pos='abs'
+        if ($this->top < -110000) {
+// pos='abs'
             $this->top += 222000;
         }
-        if ($this->top < -10000) { // <= -100000: both pdf and html; -100000 -- -90000: only html
+        if ($this->top < -10000) {
+// <= -100000: both pdf and html; -100000 -- -90000: only html
             $this->top += 90000;  //= ReportBaseElement::CURRENT_POSITION;
             if ($this->top < -9000) {
                 $this->top += 10000;

app/Report/ReportPdfTextBox.php

Spacing +1 added lines, -1 removed lines

@@ -356,7 +356,7 @@
         $curr_P = $renderer->tcpdf->getPage();
         // New line and some clean up
         if (!$this->newline) {
-            $renderer->tcpdf->setXY($cX + $cW, $cY);   // $curr_Y);
+            $renderer->tcpdf->setXY($cX + $cW, $cY); // $curr_Y);
             $renderer->lastCellHeight = $cH;
         } else {
             // addMarginX() also updates X

Braces +4 added lines, -2 removed lines

@@ -139,10 +139,12 @@
         // If current position (top)
         $align_Y = false;
         $curr_P = $renderer->tcpdf->getPage();
-        if ($this->top < -95000) { // 90000: only html; 100000: both pdf and html
+        if ($this->top < -95000) {
+// 90000: only html; 100000: both pdf and html
             $align_Y = true;
         }
-        if ($this->top < -200000) {   // pos="abs"
+        if ($this->top < -200000) {
+// pos="abs"
             $this->top += 222000;
         } else {
             $this->top = ReportBaseElement::CURRENT_POSITION;