fisharebest / webtrees

app/Services/GedcomEditService.php

Spacing +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
                 }
             }
 
-            if ($values[$i] !== '' || $children_with_values  && !$element instanceof AbstractXrefElement) {
+            if ($values[$i] !== '' || $children_with_values && !$element instanceof AbstractXrefElement) {
                 if ($values[$i] === '') {
                     $gedcom_lines[] = $levels[$i] . ' ' . $tags[$i];
                 } else {
@@ -231,7 +231,7 @@ 
      *
      * @return array<string>
      */
-    public function factsToAdd(Family|Individual $record, bool $include_hidden): array
+    public function factsToAdd(Family | Individual $record, bool $include_hidden): array
     {
         $subtags = Registry::elementFactory()->make($record->tag())->subtags();
 

app/Helpers/functions.php

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
  *
  * @return ResponseInterface
  */
-function response(array|object|string $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface
+function response(array | object | string $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface
 {
     return Registry::responseFactory()->response($content, $code, $headers);
 }

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/Statistics/Repository/EventRepository.php

Spacing +1 added lines, -1 removed lines

@@ -232,7 +232,7 @@
             ->orderBy('d_type')
             ->limit(1)
             ->get()
-            ->map(static fn (object $row): object => (object) [
+            ->map(static fn (object $row) : object => (object) [
                 'id'   => $row->id,
                 'year' => (int) $row->year,
                 'fact' => $row->fact,

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/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/Module/IndividualListModule.php

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/Factories/TimestampFactory.php

Spacing +3 added lines, -3 removed lines

@@ -46,7 +46,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();
 
@@ -65,7 +65,7 @@ 
     public function fromString(?string $string, string $format = 'Y-m-d H:i:s', UserInterface $user = null): TimestampInterface
     {
         $string ??= date($format);
-        $utc    = new DateTimeZone('UTC');
+        $utc = new DateTimeZone('UTC');
 
         return $this->fromZoneString($utc, $string, $format, $user);
     }
@@ -81,7 +81,7 @@ 
      */
     public function fromLocalString(string $string, string $format = 'Y-m-d H:i:s', UserInterface $user = null): TimestampInterface
     {
-        $user     ??= Auth::user();
+        $user ??= Auth::user();
         $timezone = new DateTimeZone($user->getPreference(UserInterface::PREF_TIME_ZONE, Site::getPreference('TIMEZONE')));
 
         return $this->fromZoneString($timezone, $string, $format, $user);