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/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 +3 added lines, -3 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;
         }
@@ -832,7 +832,7 @@ 
      *
      * @return Expression
      */
-    private function binaryColumn(string $column, string|null $alias = null): Expression
+    private function binaryColumn(string $column, string | null $alias = null): Expression
     {
         if (DB::connection()->getDriverName() === 'mysql') {
             $sql = 'CAST(' . $column . ' AS binary)';

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/Contracts/MarkdownFactoryInterface.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
      *
      * @return string
      */
-    public function autolink(string $markdown, Tree|null $tree = null): string;
+    public function autolink(string $markdown, Tree | null $tree = null): string;
 
     /**
      * @param string    $markdown
@@ -40,5 +40,5 @@ 
      *
      * @return string
      */
-    public function markdown(string $markdown, Tree|null $tree = null): string;
+    public function markdown(string $markdown, Tree | null $tree = null): string;
 }

app/Elements/AbstractElement.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
      * @param string             $label
      * @param array<string>|null $subtags
      */
-    public function __construct(string $label, array|null $subtags = null)
+    public function __construct(string $label, array | null $subtags = null)
     {
         $this->label   = $label;
         $this->subtags = $subtags ?? static::SUBTAGS;

app/Elements/NamePersonal.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
      * @param string             $label
      * @param array<string>|null $subtags
      */
-    public function __construct(string $label, array|null $subtags = null)
+    public function __construct(string $label, array | null $subtags = null)
     {
         if ($subtags === null && in_array(I18N::languageTag(), static::SURNAME_FIRST_LANGUAGES, true)) {
             $subtags = static::SUBTAGS_SURNAME_FIRST;