fisharebest / webtrees

app/Http/RequestHandlers/DataFixUpdateAll.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
         /** @var Collection<int,GedcomRecord> $records */
         $records = $rows->map(function (object $row) use ($tree): ?GedcomRecord {
             return $this->data_fix_service->getRecordByType($row->xref, $tree, $row->type);
-        })->filter(static function (?GedcomRecord $record) use ($module, $params): bool {
+        })->filter(static function (?GedcomRecord $record) use ($module, $params) : bool {
             return $record instanceof GedcomRecord && !$record->isPendingDeletion() && $module->doesRecordNeedUpdate($record, $params);
         });
 

app/Factories/TimestampFactory.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,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();
 
@@ -61,7 +61,7 @@ 
      */
     public function fromString(?string $string, string $format = 'Y-m-d H:i:s', UserInterface $user = null): TimestampInterface
     {
-        $string    ??= date($format);
+        $string ??= date($format);
         $timestamp = date_create_from_format($format, $string);
 
         if ($timestamp === false) {

app/Report/ReportParserSetup.php

Spacing +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
             } else {
                 $match = [];
                 if (preg_match('/NOW([+\-]\d+)/', $attrs['default'], $match) > 0) {
-                    $date = Registry::timestampFactory()->now()->addDays((int)$match[1]);
+                    $date = Registry::timestampFactory()->now()->addDays((int) $match[1]);
                     $this->input['default'] = strtoupper($date->format('d M Y'));
                 } else {
                     $this->input['default'] = $attrs['default'];

app/Http/Middleware/HandleExceptions.php

Spacing +1 added lines, -1 removed lines

@@ -154,7 +154,7 @@
     {
         $tree    = Validator::attributes($request)->treeOptional();
         $default = Site::getPreference('DEFAULT_GEDCOM');
-        $tree    ??= $this->tree_service->all()[$default] ?? $this->tree_service->all()->first();
+        $tree ??= $this->tree_service->all()[$default] ?? $this->tree_service->all()->first();
 
         $status_code = $exception->getCode();
 

app/Module/UpcomingAnniversariesModule.php

Spacing +4 added lines, -4 removed lines

@@ -146,8 +146,8 @@ 
     {
         $default_events = implode(',', self::DEFAULT_EVENTS);
 
-        $days      = (int)$this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
-        $filter    = (bool)$this->getBlockSetting($block_id, 'filter', self::DEFAULT_FILTER);
+        $days      = (int) $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
+        $filter    = (bool) $this->getBlockSetting($block_id, 'filter', self::DEFAULT_FILTER);
         $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE);
         $sortStyle = $this->getBlockSetting($block_id, 'sortStyle', self::DEFAULT_SORT);
         $events    = $this->getBlockSetting($block_id, 'events', $default_events);
@@ -256,8 +256,8 @@ 
         $sort_style = Validator::parsedBody($request)->isInArrayKeys($this->sortStyles())->string('sortStyle');
         $events     = Validator::parsedBody($request)->array('events');
 
-        $this->setBlockSetting($block_id, 'days', (string)$days);
-        $this->setBlockSetting($block_id, 'filter', (string)$filter);
+        $this->setBlockSetting($block_id, 'days', (string) $days);
+        $this->setBlockSetting($block_id, 'filter', (string) $filter);
         $this->setBlockSetting($block_id, 'infoStyle', $info_style);
         $this->setBlockSetting($block_id, 'sortStyle', $sort_style);
         $this->setBlockSetting($block_id, 'events', implode(',', $events));

app/Module/FanChartModule.php

Indentation +1 added lines, -1 removed lines

@@ -228,7 +228,7 @@
                 'style'       => Validator::parsedBody($request)->isInArrayKeys($this->styles())->integer('style'),
                 'width'       => Validator::parsedBody($request)->isBetween(self::MINIMUM_WIDTH, self::MAXIMUM_WIDTH)->integer('width'),
                 'xref'        => Validator::parsedBody($request)->isXref()->string('xref'),
-             ]));
+                ]));
         }
 
         Auth::checkComponentAccess($this, ModuleChartInterface::class, $tree, $user);

app/Validator.php

Spacing +7 added lines, -7 removed lines

@@ -107,7 +107,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;
             }
@@ -145,7 +145,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;
     }
@@ -157,7 +157,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);
@@ -251,7 +251,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);
 
         $value = array_reduce($this->rules, $callback, $value);
         $value ??= [];
@@ -283,7 +283,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);
 
@@ -326,9 +326,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);
+        $value = array_reduce($this->rules, $callback, $value);
         $value ??= $default;
 
         if ($value === null || preg_match('//u', $value) !== 1) {

app/Module/LanguageFrench.php

Spacing +1 added lines, -2 removed lines

@@ -144,8 +144,7 @@
                 }
                 return $genitive(
                     $sex === 'F' ?
-                        'cousine du ' . $down . '<sup>e</sup> au ' . $up . '<sup>e</sup> degré' :
-                        'cousin du ' . $down . '<sup>e</sup> au ' . $up . '<sup>e</sup> degré',
+                        'cousine du ' . $down . '<sup>e</sup> au ' . $up . '<sup>e</sup> degré' : 'cousin du ' . $down . '<sup>e</sup> au ' . $up . '<sup>e</sup> degré',
                     $sex === 'F' ? 'de la ' : 'du '
                 );
             };

app/Services/GedcomEditService.php

Spacing +1 added lines, -1 removed lines

@@ -154,7 +154,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 {