fisharebest / webtrees

app/Auth.php

Spacing +6 added lines, -6 removed lines

@@ -55,7 +55,7 @@ 
      *
      * @return bool
      */
-    public static function isAdmin(UserInterface|null $user = null): bool
+    public static function isAdmin(UserInterface | null $user = null): bool
     {
         $user ??= self::user();
 
@@ -70,7 +70,7 @@ 
      *
      * @return bool
      */
-    public static function isManager(Tree $tree, UserInterface|null $user = null): bool
+    public static function isManager(Tree $tree, UserInterface | null $user = null): bool
     {
         $user ??= self::user();
 
@@ -85,7 +85,7 @@ 
      *
      * @return bool
      */
-    public static function isModerator(Tree $tree, UserInterface|null $user = null): bool
+    public static function isModerator(Tree $tree, UserInterface | null $user = null): bool
     {
         $user ??= self::user();
 
@@ -102,7 +102,7 @@ 
      *
      * @return bool
      */
-    public static function isEditor(Tree $tree, UserInterface|null $user = null): bool
+    public static function isEditor(Tree $tree, UserInterface | null $user = null): bool
     {
         $user ??= self::user();
 
@@ -119,7 +119,7 @@ 
      *
      * @return bool
      */
-    public static function isMember(Tree $tree, UserInterface|null $user = null): bool
+    public static function isMember(Tree $tree, UserInterface | null $user = null): bool
     {
         $user ??= self::user();
 
@@ -136,7 +136,7 @@ 
      *
      * @return int
      */
-    public static function accessLevel(Tree $tree, UserInterface|null $user = null): int
+    public static function accessLevel(Tree $tree, UserInterface | null $user = null): int
     {
         $user ??= self::user();
 

app/Log.php

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
      *
      * @return void
      */
-    private static function addLog(string $message, string $log_type, Tree|null $tree = null): void
+    private static function addLog(string $message, string $log_type, Tree | null $tree = null): void
     {
         if (Registry::container()->has(ServerRequestInterface::class)) {
             $request    = Registry::container()->get(ServerRequestInterface::class);
@@ -81,7 +81,7 @@ 
      *
      * @return void
      */
-    public static function addConfigurationLog(string $message, Tree|null $tree = null): void
+    public static function addConfigurationLog(string $message, Tree | null $tree = null): void
     {
         self::addLog($message, self::TYPE_CONFIGURATION, $tree);
     }

app/Module/BranchesListModule.php

Spacing +1 added lines, -1 removed lines

@@ -378,7 +378,7 @@
      *
      * @return string
      */
-    private function getDescendantsHtml(Tree $tree, array $individuals, array $ancestors, string $surname, bool $soundex_dm, bool $soundex_std, Individual $individual, Family|null $parents = null): string
+    private function getDescendantsHtml(Tree $tree, array $individuals, array $ancestors, string $surname, bool $soundex_dm, bool $soundex_std, Individual $individual, Family | null $parents = null): string
     {
         $module = $this->module_service->findByComponent(ModuleChartInterface::class, $tree, Auth::user())->first(static function (ModuleInterface $module) {
             return $module instanceof RelationshipsChartModule;

app/Module/FamilyTreeStatisticsModule.php

Spacing +1 added lines, -1 removed lines

@@ -347,7 +347,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/Module/InteractiveTree/TreeView.php

Spacing +1 added lines, -1 removed lines

@@ -149,7 +149,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',

app/Module/IndividualListModule.php

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/Registry.php

Spacing +28 added lines, -28 removed lines

@@ -116,7 +116,7 @@ 
      *
      * @return CacheFactoryInterface
      */
-    public static function cache(CacheFactoryInterface|null $factory = null): CacheFactoryInterface
+    public static function cache(CacheFactoryInterface | null $factory = null): CacheFactoryInterface
     {
         if ($factory instanceof CacheFactoryInterface) {
             self::$cache_factory = $factory;
@@ -132,7 +132,7 @@ 
      *
      * @return CalendarDateFactoryInterface
      */
-    public static function calendarDateFactory(CalendarDateFactoryInterface|null $factory = null): CalendarDateFactoryInterface
+    public static function calendarDateFactory(CalendarDateFactoryInterface | null $factory = null): CalendarDateFactoryInterface
     {
         if ($factory instanceof CalendarDateFactoryInterface) {
             self::$calendar_date_factory = $factory;
@@ -148,7 +148,7 @@ 
      *
      * @return ContainerInterface
      */
-    public static function container(ContainerInterface|null $container = null): ContainerInterface
+    public static function container(ContainerInterface | null $container = null): ContainerInterface
     {
         if ($container instanceof ContainerInterface) {
             self::$container = $container;
@@ -164,7 +164,7 @@ 
      *
      * @return ElementFactoryInterface
      */
-    public static function elementFactory(ElementFactoryInterface|null $factory = null): ElementFactoryInterface
+    public static function elementFactory(ElementFactoryInterface | null $factory = null): ElementFactoryInterface
     {
         if ($factory instanceof ElementFactoryInterface) {
             self::$element_factory = $factory;
@@ -180,7 +180,7 @@ 
      *
      * @return EncodingFactoryInterface
      */
-    public static function encodingFactory(EncodingFactoryInterface|null $factory = null): EncodingFactoryInterface
+    public static function encodingFactory(EncodingFactoryInterface | null $factory = null): EncodingFactoryInterface
     {
         if ($factory instanceof EncodingFactoryInterface) {
             self::$encoding_factory = $factory;
@@ -196,7 +196,7 @@ 
      *
      * @return FamilyFactoryInterface
      */
-    public static function familyFactory(FamilyFactoryInterface|null $factory = null): FamilyFactoryInterface
+    public static function familyFactory(FamilyFactoryInterface | null $factory = null): FamilyFactoryInterface
     {
         if ($factory instanceof FamilyFactoryInterface) {
             self::$family_factory = $factory;
@@ -212,7 +212,7 @@ 
      *
      * @return FilesystemFactoryInterface
      */
-    public static function filesystem(FilesystemFactoryInterface|null $factory = null): FilesystemFactoryInterface
+    public static function filesystem(FilesystemFactoryInterface | null $factory = null): FilesystemFactoryInterface
     {
         if ($factory instanceof FilesystemFactoryInterface) {
             self::$filesystem_factory = $factory;
@@ -228,7 +228,7 @@ 
      *
      * @return GedcomRecordFactoryInterface
      */
-    public static function gedcomRecordFactory(GedcomRecordFactoryInterface|null $factory = null): GedcomRecordFactoryInterface
+    public static function gedcomRecordFactory(GedcomRecordFactoryInterface | null $factory = null): GedcomRecordFactoryInterface
     {
         if ($factory instanceof GedcomRecordFactoryInterface) {
             self::$gedcom_record_factory = $factory;
@@ -244,7 +244,7 @@ 
      *
      * @return HeaderFactoryInterface
      */
-    public static function headerFactory(HeaderFactoryInterface|null $factory = null): HeaderFactoryInterface
+    public static function headerFactory(HeaderFactoryInterface | null $factory = null): HeaderFactoryInterface
     {
         if ($factory instanceof HeaderFactoryInterface) {
             self::$header_factory = $factory;
@@ -260,7 +260,7 @@ 
      *
      * @return IdFactoryInterface
      */
-    public static function idFactory(IdFactoryInterface|null $factory = null): IdFactoryInterface
+    public static function idFactory(IdFactoryInterface | null $factory = null): IdFactoryInterface
     {
         if ($factory instanceof IdFactoryInterface) {
             self::$id_factory = $factory;
@@ -276,7 +276,7 @@ 
      *
      * @return ImageFactoryInterface
      */
-    public static function imageFactory(ImageFactoryInterface|null $factory = null): ImageFactoryInterface
+    public static function imageFactory(ImageFactoryInterface | null $factory = null): ImageFactoryInterface
     {
         if ($factory instanceof ImageFactoryInterface) {
             self::$image_factory = $factory;
@@ -292,7 +292,7 @@ 
      *
      * @return IndividualFactoryInterface
      */
-    public static function individualFactory(IndividualFactoryInterface|null $factory = null): IndividualFactoryInterface
+    public static function individualFactory(IndividualFactoryInterface | null $factory = null): IndividualFactoryInterface
     {
         if ($factory instanceof IndividualFactoryInterface) {
             self::$individual_factory = $factory;
@@ -308,7 +308,7 @@ 
      *
      * @return LocationFactoryInterface
      */
-    public static function locationFactory(LocationFactoryInterface|null $factory = null): LocationFactoryInterface
+    public static function locationFactory(LocationFactoryInterface | null $factory = null): LocationFactoryInterface
     {
         if ($factory instanceof LocationFactoryInterface) {
             self::$location_factory = $factory;
@@ -324,7 +324,7 @@ 
      *
      * @return MarkdownFactoryInterface
      */
-    public static function markdownFactory(MarkdownFactoryInterface|null $factory = null): MarkdownFactoryInterface
+    public static function markdownFactory(MarkdownFactoryInterface | null $factory = null): MarkdownFactoryInterface
     {
         if ($factory instanceof MarkdownFactoryInterface) {
             self::$markdown_factory = $factory;
@@ -340,7 +340,7 @@ 
      *
      * @return MediaFactoryInterface
      */
-    public static function mediaFactory(MediaFactoryInterface|null $factory = null): MediaFactoryInterface
+    public static function mediaFactory(MediaFactoryInterface | null $factory = null): MediaFactoryInterface
     {
         if ($factory instanceof MediaFactoryInterface) {
             self::$media_factory = $factory;
@@ -356,7 +356,7 @@ 
      *
      * @return NoteFactoryInterface
      */
-    public static function noteFactory(NoteFactoryInterface|null $factory = null): NoteFactoryInterface
+    public static function noteFactory(NoteFactoryInterface | null $factory = null): NoteFactoryInterface
     {
         if ($factory instanceof NoteFactoryInterface) {
             self::$note_factory = $factory;
@@ -372,7 +372,7 @@ 
      *
      * @return RepositoryFactoryInterface
      */
-    public static function repositoryFactory(RepositoryFactoryInterface|null $factory = null): RepositoryFactoryInterface
+    public static function repositoryFactory(RepositoryFactoryInterface | null $factory = null): RepositoryFactoryInterface
     {
         if ($factory instanceof RepositoryFactoryInterface) {
             self::$repository_factory = $factory;
@@ -388,7 +388,7 @@ 
      *
      * @return ResponseFactoryInterface
      */
-    public static function responseFactory(ResponseFactoryInterface|null $factory = null): ResponseFactoryInterface
+    public static function responseFactory(ResponseFactoryInterface | null $factory = null): ResponseFactoryInterface
     {
         if ($factory instanceof ResponseFactoryInterface) {
             self::$response_factory = $factory;
@@ -404,7 +404,7 @@ 
      *
      * @return RouteFactoryInterface
      */
-    public static function routeFactory(RouteFactoryInterface|null $factory = null): RouteFactoryInterface
+    public static function routeFactory(RouteFactoryInterface | null $factory = null): RouteFactoryInterface
     {
         if ($factory instanceof RouteFactoryInterface) {
             self::$route_factory = $factory;
@@ -420,7 +420,7 @@ 
      *
      * @return SharedNoteFactoryInterface
      */
-    public static function sharedNoteFactory(SharedNoteFactoryInterface|null $factory = null): SharedNoteFactoryInterface
+    public static function sharedNoteFactory(SharedNoteFactoryInterface | null $factory = null): SharedNoteFactoryInterface
     {
         if ($factory instanceof SharedNoteFactoryInterface) {
             self::$shared_note_factory = $factory;
@@ -436,7 +436,7 @@ 
      *
      * @return SlugFactoryInterface
      */
-    public static function slugFactory(SlugFactoryInterface|null $factory = null): SlugFactoryInterface
+    public static function slugFactory(SlugFactoryInterface | null $factory = null): SlugFactoryInterface
     {
         if ($factory instanceof SlugFactoryInterface) {
             self::$slug_factory = $factory;
@@ -452,7 +452,7 @@ 
      *
      * @return SourceFactoryInterface
      */
-    public static function sourceFactory(SourceFactoryInterface|null $factory = null): SourceFactoryInterface
+    public static function sourceFactory(SourceFactoryInterface | null $factory = null): SourceFactoryInterface
     {
         if ($factory instanceof SourceFactoryInterface) {
             self::$source_factory = $factory;
@@ -468,7 +468,7 @@ 
      *
      * @return SubmissionFactoryInterface
      */
-    public static function submissionFactory(SubmissionFactoryInterface|null $factory = null): SubmissionFactoryInterface
+    public static function submissionFactory(SubmissionFactoryInterface | null $factory = null): SubmissionFactoryInterface
     {
         if ($factory instanceof SubmissionFactoryInterface) {
             self::$submission_factory = $factory;
@@ -484,7 +484,7 @@ 
      *
      * @return SubmitterFactoryInterface
      */
-    public static function submitterFactory(SubmitterFactoryInterface|null $factory = null): SubmitterFactoryInterface
+    public static function submitterFactory(SubmitterFactoryInterface | null $factory = null): SubmitterFactoryInterface
     {
         if ($factory instanceof SubmitterFactoryInterface) {
             self::$submitter_factory = $factory;
@@ -500,7 +500,7 @@ 
      *
      * @return SurnameTraditionFactoryInterface
      */
-    public static function surnameTraditionFactory(SurnameTraditionFactoryInterface|null $factory = null): SurnameTraditionFactoryInterface
+    public static function surnameTraditionFactory(SurnameTraditionFactoryInterface | null $factory = null): SurnameTraditionFactoryInterface
     {
         if ($factory instanceof SurnameTraditionFactoryInterface) {
             self::$surname_tradition_factory = $factory;
@@ -516,7 +516,7 @@ 
      *
      * @return TimeFactoryInterface
      */
-    public static function timeFactory(TimeFactoryInterface|null $factory = null): TimeFactoryInterface
+    public static function timeFactory(TimeFactoryInterface | null $factory = null): TimeFactoryInterface
     {
         if ($factory instanceof TimeFactoryInterface) {
             self::$time_factory = $factory;
@@ -532,7 +532,7 @@ 
      *
      * @return TimestampFactoryInterface
      */
-    public static function timestampFactory(TimestampFactoryInterface|null $factory = null): TimestampFactoryInterface
+    public static function timestampFactory(TimestampFactoryInterface | null $factory = null): TimestampFactoryInterface
     {
         if ($factory instanceof TimestampFactoryInterface) {
             self::$timestamp_factory = $factory;
@@ -548,7 +548,7 @@ 
      *
      * @return XrefFactoryInterface
      */
-    public static function xrefFactory(XrefFactoryInterface|null $factory = null): XrefFactoryInterface
+    public static function xrefFactory(XrefFactoryInterface | null $factory = null): XrefFactoryInterface
     {
         if ($factory instanceof XrefFactoryInterface) {
             self::$xref_factory = $factory;

app/Fact.php

Spacing +1 added lines, -1 removed lines

@@ -313,7 +313,7 @@
      *
      * @return bool
      */
-    public function canShow(int|null $access_level = null): bool
+    public function canShow(int | null $access_level = null): bool
     {
         $access_level ??= Auth::accessLevel($this->record->tree());
 

app/Services/LinkedRecordService.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
      *
      * @return Collection<int,Family>
      */
-    public function linkedFamilies(GedcomRecord $record, string|null $link_type = null): Collection
+    public function linkedFamilies(GedcomRecord $record, string | null $link_type = null): Collection
     {
         $query = DB::table('families')
             ->join('link', static function (JoinClause $join): void {
@@ -116,7 +116,7 @@ 
      *
      * @return Collection<int,Individual>
      */
-    public function linkedIndividuals(GedcomRecord $record, string|null $link_type = null): Collection
+    public function linkedIndividuals(GedcomRecord $record, string | null $link_type = null): Collection
     {
         $query = DB::table('individuals')
             ->join('link', static function (JoinClause $join): void {