fisharebest / webtrees

app/Report/RightToLeftSupport.php

Spacing +10 added lines, -10 removed lines

@@ -199,7 +199,7 @@ 
                         $currentLen        = $endPos + 2;
                         $directive         = substr($workingText, 0, $currentLen);
                         $workingText       = substr($workingText, $currentLen);
-                        $result            .= self::$waitingText . $directive;
+                        $result .= self::$waitingText . $directive;
                         self::$waitingText = '';
                         break;
                     }
@@ -308,7 +308,7 @@ 
                             break;
                         }
                         self::$waitingText .= $currentLetter;
-                        $workingText       = substr($workingText, $currentLen);
+                        $workingText = substr($workingText, $currentLen);
                         if ($openParIndex !== false) {
                             // Opening parentheses always inherit the following directionality
                             while (true) {
@@ -318,13 +318,13 @@ 
                                 if (str_starts_with($workingText, ' ')) {
                                     // Spaces following this left parenthesis inherit the following directionality too
                                     self::$waitingText .= ' ';
-                                    $workingText       = substr($workingText, 1);
+                                    $workingText = substr($workingText, 1);
                                     continue;
                                 }
                                 if (str_starts_with($workingText, ' ')) {
                                     // Spaces following this left parenthesis inherit the following directionality too
                                     self::$waitingText .= ' ';
-                                    $workingText       = substr($workingText, 6);
+                                    $workingText = substr($workingText, 6);
                                     continue;
                                 }
                                 break;
@@ -341,7 +341,7 @@ 
                         // Exceptions to this rule will be handled later during final clean-up.
                         //
                         if (self::$currentState !== '') {
-                            $result            .= self::$waitingText;
+                            $result .= self::$waitingText;
                             self::$waitingText = '';
                         }
                         break 2; // double break because we're waiting for more information
@@ -470,7 +470,7 @@ 
                 }
                 if (substr($result . "\n", 0, self::LENGTH_START) !== self::START_LTR && substr($result . "\n", 0, self::LENGTH_START) !== self::START_RTL) {
                     $leadingText .= substr($result, 0, 1);
-                    $result      = substr($result, 1);
+                    $result = substr($result, 1);
                     continue;
                 }
                 $result = substr($result, 0, self::LENGTH_START) . $leadingText . substr($result, self::LENGTH_START);
@@ -612,11 +612,11 @@ 
     private static function breakCurrentSpan(string &$result): void
     {
         // Interrupt the current span, insert that <br>, and then continue the current span
-        $result            .= self::$waitingText;
+        $result .= self::$waitingText;
         self::$waitingText = '';
 
         $breakString = '<' . self::$currentState . 'br>';
-        $result      .= $breakString;
+        $result .= $breakString;
     }
 
     /**
@@ -673,7 +673,7 @@ 
                 break;
             } // No more numeric strings
 
-            $tempResult    .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string
+            $tempResult .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string
             $numericString = substr($textSpan, $posLRE + 3, $posPDF - $posLRE); // Separate the entire numeric string
             $textSpan      = substr($textSpan, $posPDF + 3);
             $posColon      = strpos($numericString, ':');
@@ -1140,7 +1140,7 @@ 
 
             // We're done: finish the span
             $textSpan = self::starredName($textSpan, 'RTL'); // Wrap starred name in <u> and </u> tags
-            $result   .= $textSpan . self::END_RTL;
+            $result .= $textSpan . self::END_RTL;
         }
 
         if (self::$currentState !== 'LTR' && self::$currentState !== 'RTL') {

app/Services/UpgradeService.php

Spacing +1 added lines, -1 removed lines

@@ -301,7 +301,7 @@
     {
         $latest_version = $this->fetchLatestVersion(false);
 
-        [, , $url] = explode('|', $latest_version . '||');
+        [,, $url] = explode('|', $latest_version . '||');
 
         return $url;
     }

app/Validator.php

Spacing +8 added lines, -8 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;
             }
@@ -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));

resources/lang/en-US/messages.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return array (
+return array(
   '%H:%i:%s' => '%g:%i:%s %a',
   '%j %F %Y' => '%F %j, %Y',
   'Asunción, Paraguay' => 'Asuncion, Paraguay',

Indentation +15 added lines, -15 removed lines

@@ -1,19 +1,19 @@
 <?php
 
 return array (
-  '%H:%i:%s' => '%g:%i:%s %a',
-  '%j %F %Y' => '%F %j, %Y',
-  'Asunción, Paraguay' => 'Asuncion, Paraguay',
-  'Bogotá, Colombia' => 'Bogota, Colombia',
-  'Ciudad Juárez, Mexico' => 'Ciudad Juarez, Mexico',
-  'Colonia Juárez, Mexico' => 'Colonia Juarez, Mexico',
-  'Curaçao' => 'Curacao',
-  'Córdoba, Argentina' => 'Cordoba, Argentina',
-  'Côte d’Ivoire' => 'Cote d’Ivoire',
-  'Réunion' => 'Reunion',
-  'Saint Barthélemy' => 'Saint Barthelemy',
-  'San José, Costa Rica' => 'San Jose, Costa Rica',
-  'São Paulo, Brazil' => 'Sao Paulo, Brazil',
-  'Tuxtla Gutiérrez, Mexico' => 'Tuxtla Gutierrez, Mexico',
-  'Åland Islands' => 'Aland Islands',
+    '%H:%i:%s' => '%g:%i:%s %a',
+    '%j %F %Y' => '%F %j, %Y',
+    'Asunción, Paraguay' => 'Asuncion, Paraguay',
+    'Bogotá, Colombia' => 'Bogota, Colombia',
+    'Ciudad Juárez, Mexico' => 'Ciudad Juarez, Mexico',
+    'Colonia Juárez, Mexico' => 'Colonia Juarez, Mexico',
+    'Curaçao' => 'Curacao',
+    'Córdoba, Argentina' => 'Cordoba, Argentina',
+    'Côte d’Ivoire' => 'Cote d’Ivoire',
+    'Réunion' => 'Reunion',
+    'Saint Barthélemy' => 'Saint Barthelemy',
+    'San José, Costa Rica' => 'San Jose, Costa Rica',
+    'São Paulo, Brazil' => 'Sao Paulo, Brazil',
+    'Tuxtla Gutiérrez, Mexico' => 'Tuxtla Gutierrez, Mexico',
+    'Åland Islands' => 'Aland Islands',
 );

app/Factories/TimestampFactory.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function make(int $timestamp, ?UserInterface $user = null): TimestampInterface
     {
-        $user     ??= Auth::user();
+        $user ??= Auth::user();
         $timezone = $user->getPreference(UserInterface::PREF_TIME_ZONE, Site::getPreference('TIMEZONE'));
         $locale   = I18N::locale()->code();
 
@@ -61,7 +61,7 @@ 
      */
     public function fromString(?string $string, string $format = 'Y-m-d H:i:s', ?UserInterface $user = null): TimestampInterface
     {
-        $string    ??= date($format);
+        $string ??= date($format);
         $timestamp = date_create_from_format($format, $string);
 
         if ($timestamp === false) {

app/Module/AbstractIndividualListModule.php

Braces +3 added lines, -1 removed lines

@@ -304,7 +304,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 ?>
@@ -359,6 +360,7 @@ 
                 switch ($alpha) {
                     case '@':
                         $filter = static fn (string $x): bool => $x === Individual::NOMEN_NESCIO;
+}
                         break;
                     case ',':
                         $filter = static fn (string $x): bool => $x === '';

app/GedcomRecord.php

Spacing +1 added lines, -1 removed lines

@@ -321,7 +321,7 @@
         }
 
         // Remove links to missing and private records
-        $pattern =  '/\n(\d) ' . Gedcom::REGEX_TAG . ' @(' . Gedcom::REGEX_XREF . ')@/';
+        $pattern = '/\n(\d) ' . Gedcom::REGEX_TAG . ' @(' . Gedcom::REGEX_XREF . ')@/';
         preg_match_all($pattern, $gedcom, $matches, PREG_SET_ORDER);
 
         foreach ($matches as $match) {

app/SessionDatabaseHandler.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 
             // Only update session once a minute to reduce contention on the session table.
             if (date('Y-m-d H:i:s', time() - 60) > $this->row->session_time) {
-                $updates['session_time'] =  date('Y-m-d H:i:s');
+                $updates['session_time'] = date('Y-m-d H:i:s');
             }
 
             if ($updates !== []) {

app/Statistics.php

Spacing +2 added lines, -2 removed lines

@@ -1245,7 +1245,7 @@ 
 
     public function latestUserRegDate(?string $format = null): string
     {
-        $format    ??= I18N::dateFormat();
+        $format ??= I18N::dateFormat();
         $user      = $this->user_service->find($this->data->latestUserId()) ?? Auth::user();
         $timestamp = (int) $user->getPreference(UserInterface::PREF_TIMESTAMP_REGISTERED);
 
@@ -1258,7 +1258,7 @@ 
 
     public function latestUserRegTime(?string $format = null): string
     {
-        $format    ??= I18N::timeFormat();
+        $format ??= I18N::timeFormat();
         $user      = $this->user_service->find($this->data->latestUserId()) ?? Auth::user();
         $timestamp = (int) $user->getPreference(UserInterface::PREF_TIMESTAMP_REGISTERED);