fisharebest / webtrees

app/Module/ListsMenuModule.php

Spacing +2 added lines, -2 removed lines

@@ -81,10 +81,10 @@
      *
      * @return Menu|null
      */
-    public function getMenu(Tree $tree): Menu|null
+    public function getMenu(Tree $tree): Menu | null
     {
         $submenus = $this->module_service->findByComponent(ModuleListInterface::class, $tree, Auth::user())
-            ->map(static fn (ModuleListInterface $module): Menu|null => $module->listMenu($tree))
+            ->map(static fn (ModuleListInterface $module): Menu | null => $module->listMenu($tree))
             ->filter()
             ->sort(static fn (Menu $x, Menu $y): int => I18N::comparator()($x->getLabel(), $y->getLabel()));
 

app/Module/TimelineChartModule.php

Spacing +5 added lines, -5 removed lines

@@ -160,7 +160,7 @@ 
         // Find the requested individuals.
         $individuals = (new Collection($xrefs))
             ->uniqueStrict()
-            ->map(static fn (string $xref): Individual|null => Registry::individualFactory()->make($xref, $tree))
+            ->map(static fn (string $xref): Individual | null => Registry::individualFactory()->make($xref, $tree))
             ->filter()
             ->filter(GedcomRecord::accessFilter());
 
@@ -179,9 +179,9 @@ 
             ]);
         }
 
-        $individuals = array_map(static fn (string $xref): Individual|null => Registry::individualFactory()->make($xref, $tree), $xrefs);
+        $individuals = array_map(static fn (string $xref): Individual | null => Registry::individualFactory()->make($xref, $tree), $xrefs);
 
-        $individuals = array_filter($individuals, static fn (Individual|null $individual): bool => $individual instanceof Individual && $individual->canShow());
+        $individuals = array_filter($individuals, static fn (Individual | null $individual): bool => $individual instanceof Individual && $individual->canShow());
 
         if ($ajax) {
             $this->layout = 'layouts/ajax';
@@ -237,9 +237,9 @@ 
     protected function chart(Tree $tree, array $xrefs, int $scale): ResponseInterface
     {
         /** @var Individual[] $individuals */
-        $individuals = array_map(static fn (string $xref): Individual|null => Registry::individualFactory()->make($xref, $tree), $xrefs);
+        $individuals = array_map(static fn (string $xref): Individual | null => Registry::individualFactory()->make($xref, $tree), $xrefs);
 
-        $individuals = array_filter($individuals, static fn (Individual|null $individual): bool => $individual instanceof Individual && $individual->canShow());
+        $individuals = array_filter($individuals, static fn (Individual | null $individual): bool => $individual instanceof Individual && $individual->canShow());
 
         $baseyear    = (int) date('Y');
         $topyear     = 0;

app/Module/InteractiveTree/TreeView.php

Spacing +3 added lines, -3 removed lines

@@ -93,7 +93,7 @@ 
             switch ($firstLetter) {
                 case 'c':
                     $families = Collection::make(explode(',', $json_request))
-                        ->map(static fn (string $xref): Family|null => Registry::familyFactory()->make($xref, $tree))
+                        ->map(static fn (string $xref): Family | null => Registry::familyFactory()->make($xref, $tree))
                         ->filter();
 
                     $r[] = $this->drawChildren($families, 1, true);
@@ -147,7 +147,7 @@ 
      *
      * @return string
      */
-    private function getPersonDetails(Individual $individual, Family|null $family = null): string
+    private function getPersonDetails(Individual $individual, Family | null $family = null): string
     {
         $chart_url = route('module', [
             'module' => 'tree',
@@ -235,7 +235,7 @@ 
      *
      * @return string
      */
-    private function drawPerson(Individual $person, int $gen, int $state, Family|null $pfamily, string $line, bool $isRoot): string
+    private function drawPerson(Individual $person, int $gen, int $state, Family | null $pfamily, string $line, bool $isRoot): string
     {
         if ($gen < 0) {
             return '';

app/Module/LifespansChartModule.php

Spacing +2 added lines, -2 removed lines

@@ -248,9 +248,9 @@
     protected function chart(Tree $tree, array $xrefs): ResponseInterface
     {
         /** @var Individual[] $individuals */
-        $individuals = array_map(static fn (string $xref): Individual|null => Registry::individualFactory()->make($xref, $tree), $xrefs);
+        $individuals = array_map(static fn (string $xref): Individual | null => Registry::individualFactory()->make($xref, $tree), $xrefs);
 
-        $individuals = array_filter($individuals, static fn (Individual|null $individual): bool => $individual instanceof Individual && $individual->canShow());
+        $individuals = array_filter($individuals, static fn (Individual | null $individual): bool => $individual instanceof Individual && $individual->canShow());
 
         // Sort the array in order of birth year
         usort($individuals, Individual::birthDateComparator());

app/Media.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
     /**
      * Get the first media file that contains an image.
      */
-    public function firstImageFile(): MediaFile|null
+    public function firstImageFile(): MediaFile | null
     {
         return $this->mediaFiles()
             ->first(static fn (MediaFile $media_file): bool => $media_file->isImage() && !$media_file->isExternal());

app/Webtrees.php

Spacing +1 added lines, -1 removed lines

@@ -240,7 +240,7 @@
     /**
      * Run the application.
      */
-    public function run(string $php_sapi): int|ResponseInterface
+    public function run(string $php_sapi): int | ResponseInterface
     {
         if ($php_sapi === 'cli') {
             return $this->bootstrap()->cliRequest();

app/Factories/ImageFactory.php

Spacing +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
                 $mime_type = Mime::DEFAULT_TYPE;
             }
 
-            $filename = $download ? addcslashes(string: basename(path: $path), characters: '"') : '';
+            $filename = $download ? addcslashes(string : basename(path : $path), characters : '"') : '';
 
             return $this->imageResponse(data: $filesystem->read(location: $path), mime_type: $mime_type, filename: $filename);
         } catch (UnableToReadFile | FilesystemException $ex) {
@@ -147,7 +147,7 @@ 
             $image     = $this->imageManager()->read(input: $filesystem->readStream($path));
             $watermark = $this->createWatermark(width: $image->width(), height: $image->height(), media_file: $media_file);
             $image     = $this->addWatermark(image: $image, watermark: $watermark);
-            $filename  = $download ? basename(path: $path) : '';
+            $filename  = $download ? basename(path : $path) : '';
             $quality   = $this->extractImageQuality(image: $image, default: static::GD_DEFAULT_IMAGE_QUALITY);
             $data      = $image->encodeByMediaType(type: $mime_type, quality:  $quality)->toString();
 

app/Census/AbstractCensusColumn.php

Spacing +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
     /**
      * Find the father of an individual
      */
-    public function father(Individual $individual): Individual|null
+    public function father(Individual $individual): Individual | null
     {
         $family = $individual->childFamilies()->first();
 
@@ -79,7 +79,7 @@ 
     /**
      * Find the mother of an individual
      */
-    public function mother(Individual $individual): Individual|null
+    public function mother(Individual $individual): Individual | null
     {
         $family = $individual->childFamilies()->first();
 
@@ -93,7 +93,7 @@ 
     /**
      * Find the current spouse family of an individual
      */
-    public function spouseFamily(Individual $individual): Family|null
+    public function spouseFamily(Individual $individual): Family | null
     {
         return $individual->spouseFamilies()
                 // Exclude families that were created after this census date

app/Module/ClippingsCartModule.php

Spacing +2 added lines, -2 removed lines

@@ -130,7 +130,7 @@ 
         return 6;
     }
 
-    public function getMenu(Tree $tree): Menu|null
+    public function getMenu(Tree $tree): Menu | null
     {
         $request = Registry::container()->get(ServerRequestInterface::class);
         $route   = Validator::attributes($request)->route();
@@ -353,7 +353,7 @@ 
         $xrefs = array_map('strval', $xrefs); // PHP converts numeric keys to integers.
 
         // Fetch all the records in the cart.
-        $records = array_map(static fn (string $xref): GedcomRecord|null => Registry::gedcomRecordFactory()->make($xref, $tree), $xrefs);
+        $records = array_map(static fn (string $xref): GedcomRecord | null => Registry::gedcomRecordFactory()->make($xref, $tree), $xrefs);
 
         // Some records may have been deleted after they were added to the cart.
         $records = array_filter($records);