fisharebest / webtrees

app/Session.php

Spacing +4 added lines, -4 removed lines

@@ -69,7 +69,7 @@ 
         $path   = (string) parse_url($url, PHP_URL_PATH);
 
         // Paths containing UTF-8 characters need special handling.
-        $path = implode('/', array_map(static fn (string $x): string => rawurlencode($x), explode('/', $path)));
+        $path = implode('/', array_map(static fn(string $x): string => rawurlencode($x), explode('/', $path)));
 
         session_name($secure ? self::SECURE_SESSION_NAME : self::SESSION_NAME);
         session_register_shutdown();
@@ -109,7 +109,7 @@ 
      *
      * @return array|bool|int|null|string
      */
-    public static function get(string $name, array|bool|int|string $default = null)
+    public static function get(string $name, array | bool | int | string $default = null)
     {
         return $_SESSION[$name] ?? $default;
     }
@@ -121,7 +121,7 @@ 
      *
      * @return array|bool|int|null|string
      */
-    public static function pull(string $name): array|bool|int|null|string
+    public static function pull(string $name): array | bool | int | null | string
     {
         $value = self::get($name);
         self::forget($name);
@@ -165,7 +165,7 @@ 
      *
      * @return void
      */
-    public static function put(string $name, array|bool|int|null|string $value): void
+    public static function put(string $name, array | bool | int | null | string $value): void
     {
         $_SESSION[$name] = $value;
     }

app/Webtrees.php

Spacing +1 added lines, -1 removed lines

@@ -296,7 +296,7 @@
      * @param string        $abstract
      * @param string|object $concrete
      */
-    public static function set(string $abstract, string|object $concrete): void
+    public static function set(string $abstract, string | object $concrete): void
     {
         if (is_string($concrete)) {
             Container::getInstance()->bind($abstract, $concrete);

app/Date/AbstractCalendarDate.php

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
      *
      * @param array<string>|int|AbstractCalendarDate $date
      */
-    protected function __construct(array|int|AbstractCalendarDate $date)
+    protected function __construct(array | int | AbstractCalendarDate $date)
     {
         // Construct from an integer (a julian day number)
         if (is_int($date)) {
@@ -97,7 +97,7 @@ 
             $this->month = static::MONTH_TO_NUMBER[$date[1]] ?? 0;
 
             if ($this->month === 0) {
-                $this->day   = 0;
+                $this->day = 0;
             }
 
             $this->year = $this->extractYear($date[0]);

app/I18N.php

Spacing +4 added lines, -4 removed lines

@@ -269,7 +269,7 @@ 
      *
      * @return string
      */
-    public static function digits(string|int $n): string
+    public static function digits(string | int $n): string
     {
         return self::$locale->digits((string) $n);
     }
@@ -324,7 +324,7 @@ 
 
             self::$language = $module_service
                 ->findByInterface(ModuleLanguageInterface::class)
-                ->first(fn (ModuleLanguageInterface $module): bool => $module->locale()->languageTag() === $code);
+                ->first(fn(ModuleLanguageInterface $module): bool => $module->locale()->languageTag() === $code);
         }
 
         // Create a translator
@@ -565,10 +565,10 @@ 
     public static function comparator(): Closure
     {
         if (self::$collator instanceof Collator) {
-            return static fn (string $x, string $y): int => (int) self::$collator->compare($x, $y);
+            return static fn(string $x, string $y): int => (int) self::$collator->compare($x, $y);
         }
 
-        return static fn (string $x, string $y): int => strcmp(self::strtolower($x), self::strtolower($y));
+        return static fn(string $x, string $y): int => strcmp(self::strtolower($x), self::strtolower($y));
     }
 
 

app/Http/RequestHandlers/EditFactPage.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
         $record = Auth::checkRecordAccess($record, true);
 
         // Find the fact to edit
-        $fact = $record->facts()->first(fn (Fact $fact): bool => $fact->id() === $fact_id && $fact->canEdit());
+        $fact = $record->facts()->first(fn(Fact $fact): bool => $fact->id() === $fact_id && $fact->canEdit());
 
         if ($fact === null) {
             return Registry::responseFactory()->redirectUrl($record->url());

app/Factories/ResponseFactory.php

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
         if (is_string($content)) {
             $headers['Content-Type'] ??= 'text/html; charset=UTF-8';
         } else {
-            $content                 = json_encode($content, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
+            $content = json_encode($content, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
             $headers['Content-Type'] ??= 'application/json';
         }
 

app/Validator.php

Spacing +8 added lines, -8 removed lines

@@ -102,7 +102,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;
             }
@@ -120,7 +120,7 @@ 
      */
     public function isInArray(array $values): self
     {
-        $this->rules[] = static fn (?string $value): ?string => $value !== null && in_array($value, $values, true) ? $value : null;
+        $this->rules[] = static fn(?string $value) : ?string => $value !== null && in_array($value, $values, true) ? $value : null;
 
         return $this;
     }
@@ -130,7 +130,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;
     }
@@ -142,7 +142,7 @@ 
      */
     public function isLocalUrl(string $base_url): self
     {
-        $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);
@@ -240,7 +240,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 ??= [];
@@ -272,7 +272,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);
 
@@ -315,9 +315,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/Factories/RouteFactory.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
         // webtrees uses http_build_query() to generate URLs - which maps false onto "0".
         // Aura uses rawurlencode(), which maps false onto "" - which does not work as an aura URL parameter.
-        $parameters = array_map(static fn ($var) => is_bool($var) ? (int) $var : $var, $parameters);
+        $parameters = array_map(static fn($var) => is_bool($var) ? (int) $var : $var, $parameters);
 
         $url = $router_container->getGenerator()->generate($route_name, $parameters);
 

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));