fisharebest / webtrees

app/Http/RequestHandlers/MapDataList.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
         }
 
         // Request for a non-existent location?
-        if ($parent_id !== null &&  $parent->id() === null) {
+        if ($parent_id !== null && $parent->id() === null) {
             return redirect(route(__CLASS__));
         }
 

app/Services/UserService.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
      */
     public function find(?int $user_id): ?User
     {
-        return Registry::cache()->array()->remember('user-' . $user_id, static function () use ($user_id): ?User {
+        return Registry::cache()->array()->remember('user-' . $user_id, static function () use ($user_id) : ?User {
             return DB::table('user')
                 ->where('user_id', '=', $user_id)
                 ->get()

app/Module/ChartsBlockModule.php

Spacing +5 added lines, -5 removed lines

@@ -117,7 +117,7 @@ 
                             'generations' => 3,
                             'layout'      => PedigreeChartModule::STYLE_RIGHT,
                         ]);
-                        $content   = view('modules/charts/chart', [
+                        $content = view('modules/charts/chart', [
                             'block_id'  => $block_id,
                             'chart_url' => $chart_url,
                         ]);
@@ -137,7 +137,7 @@ 
                             'generations' => 2,
                             'chart_style' => DescendancyChartModule::CHART_STYLE_TREE,
                         ]);
-                        $content   = view('modules/charts/chart', [
+                        $content = view('modules/charts/chart', [
                             'block_id'  => $block_id,
                             'chart_url' => $chart_url,
                         ]);
@@ -149,7 +149,7 @@ 
                     break;
 
                 case 'hourglass':
-                    $module    = $this->module_service->findByInterface(HourglassChartModule::class)->first();
+                    $module = $this->module_service->findByInterface(HourglassChartModule::class)->first();
 
                     if ($module instanceof HourglassChartModule) {
                         $title     = $module->chartTitle($individual);
@@ -157,7 +157,7 @@ 
                             'ajax'        => true,
                             'generations' => 2,
                         ]);
-                        $content   = view('modules/charts/chart', [
+                        $content = view('modules/charts/chart', [
                             'block_id'  => $block_id,
                             'chart_url' => $chart_url,
                         ]);
@@ -262,7 +262,7 @@ 
         $default_xref     = $gedcomid ?: $PEDIGREE_ROOT_ID;
 
         $type = $this->getBlockSetting($block_id, 'type', 'pedigree');
-        $xref  = $this->getBlockSetting($block_id, 'pid', $default_xref);
+        $xref = $this->getBlockSetting($block_id, 'pid', $default_xref);
 
         $charts = [
             'pedigree'    => I18N::translate('Pedigree'),

app/Module/TimelineChartModule.php

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
 {
     use ModuleChartTrait;
 
-    protected const ROUTE_URL  = '/tree/{tree}/timeline-{scale}';
+    protected const ROUTE_URL = '/tree/{tree}/timeline-{scale}';
 
     // Defaults
     protected const DEFAULT_SCALE      = 10;
@@ -153,7 +153,7 @@ 
 
         $params = (array) $request->getParsedBody();
 
-        $add  = $params['add'] ?? '';
+        $add = $params['add'] ?? '';
 
         Auth::checkComponentAccess($this, ModuleChartInterface::class, $tree, $user);
 

app/Http/RequestHandlers/ImportThumbnailsData.php

Spacing +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
         // The original filename was generated from the thumbnail filename.
         // It may not actually exist.
         try {
-            $file_exists =  $data_filesystem->fileExists($original);
+            $file_exists = $data_filesystem->fileExists($original);
         } catch (FilesystemException | UnableToRetrieveMetadata $ex) {
             $file_exists = false;
         }

app/Http/RequestHandlers/ManageMediaData.php

Spacing +2 added lines, -2 removed lines

@@ -233,7 +233,7 @@ 
                     $create_form = '';
                     foreach ($media_trees as $media_tree => $media_directory) {
                         if (str_starts_with($row[0], $media_directory)) {
-                            $tmp         = substr($row[0], strlen($media_directory));
+                            $tmp = substr($row[0], strlen($media_directory));
                             $create_form .=
                                 '<p><a href="#" data-toggle="modal" data-backdrop="static" data-target="#modal-create-media-from-file" data-file="' . e($tmp) . '" data-url="' . e(route(CreateMediaObjectFromFile::class, ['tree' => $media_tree])) . '" onclick="document.getElementById(\'modal-create-media-from-file-form\').action=this.dataset.url; document.getElementById(\'file\').value=this.dataset.file;">' . I18N::translate('Create') . '</a> — ' . e($media_tree) . '<p>';
                         }
@@ -338,7 +338,7 @@ 
                 // This will work for local filesystems.  For remote filesystems, we will
                 // need to copy the file locally to work out the image size.
                 $imgsize = getimagesizefromstring($data_filesystem->read($file));
-                $html    .= '<dt>' . I18N::translate('Image dimensions') . '</dt>';
+                $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>';
                 /* I18N: image dimensions, width × height */
                 $html .= '<dd>' . I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1'])) . '</dd>';
             } catch (FilesystemException | UnableToReadFile | Throwable $ex) {

app/Module/RelationshipsChartModule.php

Spacing +1 added lines, -1 removed lines

@@ -330,7 +330,7 @@
 
             $language = app(ModuleService::class)
                 ->findByInterface(ModuleLanguageInterface::class, true)
-                ->first(fn (ModuleLanguageInterface $language): bool => $language->locale()->languageTag() === I18N::languageTag());
+                ->first(fn(ModuleLanguageInterface $language): bool => $language->locale()->languageTag() === I18N::languageTag());
 
 
 

app/Module/LanguageSlovakian.php

Spacing +15 added lines, -15 removed lines

@@ -86,12 +86,12 @@ 
      */
     public function relationships(): array
     {
-        $pra = fn (int $n, string $nominative, string $genitive): array => [
+        $pra = fn(int $n, string $nominative, string $genitive): array => [
             ($n > 3 ? 'pra ×' . $n . ' ' : str_repeat('pra-', $n)) . $nominative,
             ($n > 3 ? 'pra ×' . $n . ' ' : str_repeat('pra-', $n)) . $genitive,
         ];
 
-        $cousin = fn (int $n, array $cousins, string $nominative, string $genitive): array => $cousins[$n] ?? [
+        $cousin = fn(int $n, array $cousins, string $nominative, string $genitive): array => $cousins[$n] ?? [
             $nominative . ' z ' . $n . '. kolena',
             $genitive . '%s z ' . $n . '. kolena',
         ];
@@ -147,9 +147,9 @@ 
             Relationship::fixed('prastarý otec', '%s prastarého otca')->parent()->parent()->mother(),
             Relationship::fixed('prastarý otec', '%s prastarého otca')->parent()->parent()->parent(),
             // Ancestors
-            Relationship::dynamic(fn (int $n) => $pra($n - 1, 'prastarý otec', '%s prastarého otca'))->ancestor()->male(),
-            Relationship::dynamic(fn (int $n) => $pra($n - 1, 'prastará matka', '%s prastarej matky'))->ancestor()->female(),
-            Relationship::dynamic(fn (int $n) => $pra($n - 1, 'prastarý rodič', '%s prastarého rodiča'))->ancestor(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 1, 'prastarý otec', '%s prastarého otca'))->ancestor()->male(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 1, 'prastará matka', '%s prastarej matky'))->ancestor()->female(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 1, 'prastarý rodič', '%s prastarého rodiča'))->ancestor(),
             // Grandchildren
             Relationship::fixed('vnuk', '%s vnuka')->child()->son(),
             Relationship::fixed('vnučka', '%s vnučky')->child()->daughter(),
@@ -159,9 +159,9 @@ 
             Relationship::fixed('pravnučka', '%s pravnučky')->child()->child()->daughter(),
             Relationship::fixed('pravnúča', '%s pravnúčaťa')->child()->child()->child(),
             // Descendants
-            Relationship::dynamic(fn (int $n) => $pra($n - 1, 'pravnuk', '%s pravnuka'))->ancestor()->male(),
-            Relationship::dynamic(fn (int $n) => $pra($n - 1, 'pravnučka', '%s pravnučky'))->ancestor()->female(),
-            Relationship::dynamic(fn (int $n) => $pra($n - 1, 'pravnúča', '%s pravnúčaťa'))->ancestor(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 1, 'pravnuk', '%s pravnuka'))->ancestor()->male(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 1, 'pravnučka', '%s pravnučky'))->ancestor()->female(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 1, 'pravnúča', '%s pravnúčaťa'))->ancestor(),
             // Aunts and uncles
             Relationship::fixed('ujo', '%s uja')->mother()->brother(),
             Relationship::fixed('ujčiná', '%s ujčinej')->mother()->brother()->wife(),
@@ -169,20 +169,20 @@ 
             Relationship::fixed('strýko', '%s strýka')->parent()->brother(),
             Relationship::fixed('teta', '%s tety')->parent()->sister(),
             // Great-aunts and great-uncles
-            Relationship::dynamic(fn (int $n) => $pra($n - 2, 'prastrýko', '%s prastrýka'))->ancestor()->brother(),
-            Relationship::dynamic(fn (int $n) => $pra($n - 2, 'prateta', '%s pratety'))->ancestor()->sister(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 2, 'prastrýko', '%s prastrýka'))->ancestor()->brother(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 2, 'prateta', '%s pratety'))->ancestor()->sister(),
             // Nieces and nephews
             Relationship::fixed('synovec', '%s synovca')->sibling()->son(),
             Relationship::fixed('neter', '%s netere')->sibling()->daughter(),
             // Great-nieces and great-nephews
             Relationship::fixed('prasynovec', '%s prasynovca')->sibling()->child()->son(),
             Relationship::fixed('praneter', '%s pranetere')->sibling()->child()->daughter(),
-            Relationship::dynamic(fn (int $n) => $pra($n - 2, 'prasynovec', '%s prasynovca'))->sibling()->descendant()->son(),
-            Relationship::dynamic(fn (int $n) => $pra($n - 2, 'praneter', '%s pranetere'))->sibling()->descendant()->daughter(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 2, 'prasynovec', '%s prasynovca'))->sibling()->descendant()->son(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 2, 'praneter', '%s pranetere'))->sibling()->descendant()->daughter(),
             // Cousins
-            Relationship::dynamic(fn (int $n): array => $cousin($n, static::FEMALE_COUSINS, '', ''))->symmetricCousin()->female(),
-            Relationship::dynamic(fn (int $n): array => $cousin($n, static::MALE_COUSINS, '', ''))->symmetricCousin()->male(),
-            Relationship::dynamic(fn (int $n): array => $cousin($n, static::MALE_COUSINS, '', ''))->symmetricCousin(),
+            Relationship::dynamic(fn(int $n): array => $cousin($n, static::FEMALE_COUSINS, '', ''))->symmetricCousin()->female(),
+            Relationship::dynamic(fn(int $n): array => $cousin($n, static::MALE_COUSINS, '', ''))->symmetricCousin()->male(),
+            Relationship::dynamic(fn(int $n): array => $cousin($n, static::MALE_COUSINS, '', ''))->symmetricCousin(),
         ];
     }
 }

app/Module/LanguageEnglishUnitedStates.php

Spacing +19 added lines, -19 removed lines

@@ -118,15 +118,15 @@ 
     public function relationships(): array
     {
         // Genitive forms in English are simple/regular, as no relationship name ends in "s".
-        $genitive = fn (string $s): array => [$s, $s . '’s %s'];
+        $genitive = fn(string $s): array => [$s, $s . '’s %s'];
 
-        $cousin = fn (int $up, int $down): array => $genitive(
+        $cousin = fn(int $up, int $down): array => $genitive(
             (static::COUSIN[min($up, $down)] ?? 'distant cousin') .
             (static::REMOVED[abs($up - $down)] ?? ' many times removed') .
             static::DIRECTION[$up <=> $down]
         );
 
-        $great = fn (int $n, string $prefix, string $suffix): array => $genitive(
+        $great = fn(int $n, string $prefix, string $suffix): array => $genitive(
             $prefix . ($n > 3 ? 'great ×' . $n . ' ' : str_repeat('great-', $n)) . $suffix
         );
 
@@ -221,22 +221,22 @@ 
             Relationship::fixed('grandson', 'grandson’s %s')->child()->son(),
             Relationship::fixed('grandchild', 'grandchild’s %s')->child()->child(),
             // Relationships with dynamically generated names
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'aunt'))->ancestor()->sister(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'aunt'))->ancestor()->sibling()->wife(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'uncle'))->ancestor()->brother(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'uncle'))->ancestor()->sibling()->husband(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'niece'))->sibling()->descendant()->female(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'niece'))->married()->spouse()->sibling()->descendant()->female(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'nephew'))->sibling()->descendant()->male(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'nephew'))->married()->spouse()->sibling()->descendant()->male(),
-            Relationship::dynamic(fn (int $n) => $great($n - 2, 'maternal ', 'grandmother'))->mother()->ancestor()->female(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, 'maternal ', 'grandfather'))->mother()->ancestor()->male(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, 'paternal ', 'grandmother'))->father()->ancestor()->female(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, 'paternal ', 'grandfather'))->father()->ancestor()->male(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'grandparent'))->ancestor(),
-            Relationship::dynamic(fn (int $n) => $great($n - 2, '', 'granddaughter'))->descendant()->female(),
-            Relationship::dynamic(fn (int $n) => $great($n - 2, '', 'grandson'))->descendant()->male(),
-            Relationship::dynamic(fn (int $n) => $great($n - 2, '', 'grandchild'))->descendant(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'aunt'))->ancestor()->sister(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'aunt'))->ancestor()->sibling()->wife(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'uncle'))->ancestor()->brother(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'uncle'))->ancestor()->sibling()->husband(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'niece'))->sibling()->descendant()->female(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'niece'))->married()->spouse()->sibling()->descendant()->female(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'nephew'))->sibling()->descendant()->male(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'nephew'))->married()->spouse()->sibling()->descendant()->male(),
+            Relationship::dynamic(fn(int $n) => $great($n - 2, 'maternal ', 'grandmother'))->mother()->ancestor()->female(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, 'maternal ', 'grandfather'))->mother()->ancestor()->male(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, 'paternal ', 'grandmother'))->father()->ancestor()->female(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, 'paternal ', 'grandfather'))->father()->ancestor()->male(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'grandparent'))->ancestor(),
+            Relationship::dynamic(fn(int $n) => $great($n - 2, '', 'granddaughter'))->descendant()->female(),
+            Relationship::dynamic(fn(int $n) => $great($n - 2, '', 'grandson'))->descendant()->male(),
+            Relationship::dynamic(fn(int $n) => $great($n - 2, '', 'grandchild'))->descendant(),
             Relationship::dynamic($cousin)->ancestor()->sibling()->descendant(),
         ];
     }