jon48 / webtrees-lib

app/Module/Certificates/CertificatesModule.php

Spacing +7 added lines, -7 removed lines

@@ -113,11 +113,11 @@ 
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
-            $router->attach('', '/module-maj/certificates', static function (Map $router): void {
+            $router->attach('', '/module-maj/certificates', static function(Map $router): void {
 
-                $router->attach('', '/admin', static function (Map $router): void {
+                $router->attach('', '/admin', static function(Map $router): void {
 
                     $router->get(AdminConfigPage::class, '/config{/tree}', AdminConfigPage::class);
                     $router->post(AdminConfigAction::class, '/config/{tree}', AdminConfigAction::class)
@@ -140,7 +140,7 @@ 
                         'permission_preference' =>  'MAJ_CERTIF_SHOW_CERT'
                     ]);
 
-                $router->attach('', '/certificate/{tree}/{cid}', static function (Map $router): void {
+                $router->attach('', '/certificate/{tree}/{cid}', static function(Map $router): void {
 
                     $router->extras([
                         'middleware'            =>  [AuthTreePreference::class],
@@ -178,7 +178,7 @@ 
      */
     public function headContent(): string
     {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+        return '<link rel="stylesheet" href="'.e($this->moduleCssUrl()).'">';
     }
 
     /**
@@ -189,7 +189,7 @@ 
      */
     public function listUrl(Tree $tree, array $parameters = []): string
     {
-        return route(CertificatesList::class, ['tree' => $tree->name() ] + $parameters);
+        return route(CertificatesList::class, ['tree' => $tree->name()] + $parameters);
     }
 
     /**
@@ -207,7 +207,7 @@ 
      */
     public function listIsEmpty(Tree $tree): bool
     {
-        return Auth::accessLevel($tree) > (int) $tree->getPreference('MAJ_CERTIF_SHOW_CERT', (string) Auth::PRIV_HIDE);
+        return Auth::accessLevel($tree) > (int)$tree->getPreference('MAJ_CERTIF_SHOW_CERT', (string)Auth::PRIV_HIDE);
     }
 
     /**

app/Module/MiscExtensions/Factories/LegacyXrefFactory.php

Spacing +5 added lines, -5 removed lines

@@ -54,9 +54,9 @@ 
             return parent::generate($prefix, $suffix);
         }
 
-        $setting_name = 'MAJ_MISC_XREF_NEXT_' . $prefix;
+        $setting_name = 'MAJ_MISC_XREF_NEXT_'.$prefix;
         // Lock the row, so that only one new XREF may be generated at a time.
-        $num = (int) DB::table('gedcom_setting')
+        $num = (int)DB::table('gedcom_setting')
             ->where('gedcom_id', '=', $tree->id())
             ->where('setting_name', '=', $setting_name)
             ->lockForUpdate()
@@ -64,13 +64,13 @@ 
 
         $increment = 1.0;
         do {
-            $num += (int) $increment;
+            $num += (int)$increment;
 
             // This exponential increment allows us to scan over large blocks of
             // existing data in a reasonable time.
             $increment *= 1.01;
 
-            $xref = $prefix . $num . $suffix;
+            $xref = $prefix.$num.$suffix;
 
             // Records may already exist with this sequence number.
             $already_used =
@@ -82,7 +82,7 @@ 
                 DB::table('change')->where('gedcom_id', '=', $tree->id())->where('xref', '=', $xref)->exists();
         } while ($already_used);
 
-        $tree->setPreference($setting_name, (string) $num);
+        $tree->setPreference($setting_name, (string)$num);
 
         return $xref;
     }

app/Module/PatronymicLineage/Http/RequestHandlers/SurnamesList.php

Spacing +4 added lines, -4 removed lines

@@ -68,25 +68,25 @@
         $show_all = Validator::queryParams($request)->string('show_all', 'no') === 'yes';
 
         if ($show_all) {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . I18N::translate('All');
+            $title = I18N::translate('Patronymic Lineages').' — '.I18N::translate('All');
             $surnames = array_filter(
                 $all_surnames,
                 static fn (string $x): bool => $x !== '' && $x !== Individual::NOMEN_NESCIO,
                 ARRAY_FILTER_USE_KEY
             );
         } elseif (array_key_exists($initial, $initials_list)) {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . $initial;
+            $title = I18N::translate('Patronymic Lineages').' — '.$initial;
             $surnames = array_filter(
                 $all_surnames,
                 static fn (string $x): bool => I18N::language()->initialLetter($x) === $initial,
                 ARRAY_FILTER_USE_KEY
             );
         } else {
-            $title =  I18N::translate('Patronymic Lineages');
+            $title = I18N::translate('Patronymic Lineages');
             $surnames = [];
         }
 
-        return $this->viewResponse($this->module->name() . '::surnames-page', [
+        return $this->viewResponse($this->module->name().'::surnames-page', [
             'title'         =>  $title,
             'module'        =>  $this->module,
             'tree'          =>  $tree,

app/Module/PatronymicLineage/Http/RequestHandlers/LineagesPage.php

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
                 ->redirect(LineagesPage::class, ['tree' => $tree->name(), 'surname' => $surname]);
         }
 
-        if ($surname === '' ||  $surname === Individual::NOMEN_NESCIO) {
+        if ($surname === '' || $surname === Individual::NOMEN_NESCIO) {
             return Registry::responseFactory()->redirect(SurnamesList::class, ['tree' => $tree->name()]);
         }
 
@@ -86,11 +86,11 @@ 
         uasort($surname_variants, I18N::comparator());
         $surname_legend = implode('/', $surname_variants);
 
-        $title = I18N::translate('Patronymic Lineages') . ' — ' . $surname_legend;
+        $title = I18N::translate('Patronymic Lineages').' — '.$surname_legend;
 
         $lineages = app()->make(LineageBuilder::class, ['surname' => $surname])->buildLineages();
 
-        return $this->viewResponse($this->module->name() . '::lineages-page', [
+        return $this->viewResponse($this->module->name().'::lineages-page', [
             'title'         =>  $title,
             'module'        =>  $this->module,
             'tree'          =>  $tree,

app/Module/PatronymicLineage/PatronymicLineageModule.php

Spacing +8 added lines, -8 removed lines

@@ -72,11 +72,11 @@ 
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
-            $router->attach('', '/module-maj/lineages', static function (Map $router): void {
+            $router->attach('', '/module-maj/lineages', static function(Map $router): void {
 
-                $router->attach('', '/Page', static function (Map $router): void {
+                $router->attach('', '/Page', static function(Map $router): void {
 
                     $router->get(SurnamesList::class, '/{tree}/list{/alpha}', SurnamesList::class);
                     $router->get(LineagesPage::class, '/{tree}/lineage/{surname}', LineagesPage::class);
@@ -109,9 +109,9 @@ 
 
         // If a surname is already in the query attribute, use it
         if ($surname === null) {
-            $surname_attr =  Validator::attributes($request)->string('surname', '');
-            $surname_param =  Validator::queryParams($request)->string('surname', '');
-            $surname_body =  Validator::parsedBody($request)->string('surname', '');
+            $surname_attr = Validator::attributes($request)->string('surname', '');
+            $surname_param = Validator::queryParams($request)->string('surname', '');
+            $surname_body = Validator::parsedBody($request)->string('surname', '');
             $surname = $surname_attr !== '' ? $surname_attr : (
                 $surname_param !== '' ? $surname_param : (
                 $surname_body !== '' ? $surname_body : null
@@ -134,7 +134,7 @@ 
                 'surname'   =>  $surname
             ] + $parameters);
         }
-        return route(SurnamesList::class, ['tree'  =>  $tree->name() ] + $parameters);
+        return route(SurnamesList::class, ['tree'  =>  $tree->name()] + $parameters);
     }
 
     /**
@@ -152,7 +152,7 @@ 
      */
     public function headContent(): string
     {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+        return '<link rel="stylesheet" href="'.e($this->moduleCssUrl()).'">';
     }
 
     /**

app/Module/GeoDispersion/PlaceMappers/CoordinatesPlaceMapper.php

Spacing +2 added lines, -2 removed lines

@@ -139,7 +139,7 @@ 
         if ($cacheKey === null) {
             return null;
         }
-        return Registry::cache()->array()->remember($cacheKey, function (): ?array {
+        return Registry::cache()->array()->remember($cacheKey, function(): ?array {
             $map_def = $this->data('map');
             if (
                 !$this->setGeometryEngine()
@@ -214,6 +214,6 @@ 
         if ($map_def === null || !($map_def instanceof MapDefinitionInterface)) {
             return null;
         }
-        return spl_object_id($this) . '-map-' . $map_def->id();
+        return spl_object_id($this).'-map-'.$map_def->id();
     }
 }

app/Module/GeoDispersion/Services/PlacesReferenceTableService.php

Spacing +5 added lines, -5 removed lines

@@ -49,14 +49,14 @@ 
         if ($source_parts === false) {
             return null;
         }
-        $source_parts = array_map(function (string $part): string {
+        $source_parts = array_map(function(string $part): string {
             if (preg_match('/^#([^#]+)#$/i', $part, $column_id) === 1) {
                 return $this->columnName($column_id[1]);
             }
             return $this->sanitizeString(str_replace(['?', '*'], ['_', '%'], $part));
         }, array_filter($source_parts));
         $source_parts[] = "'%'";
-        $concat_statement = 'CONCAT(' . implode(', ', $source_parts) . ')';
+        $concat_statement = 'CONCAT('.implode(', ', $source_parts).')';
 
         // Extract columns used in target
         $columns = [];
@@ -67,7 +67,7 @@ 
         // Get the mapping
         $rows = DB::table('maj_geodata_ref')  //DB::table('maj_geodata_ref')
             ->select($columns)
-            ->whereRaw($this->sanitizeString($source) . " LIKE " . $concat_statement)
+            ->whereRaw($this->sanitizeString($source)." LIKE ".$concat_statement)
             ->get();
 
         // Format the output ID
@@ -75,10 +75,10 @@ 
             return null;
         }
 
-        $mapping = (array) $rows->first();
+        $mapping = (array)$rows->first();
 
         return str_replace(
-            array_map(fn($tag) => '{' . $tag . '}', $columns_select[1]),
+            array_map(fn($tag) => '{'.$tag.'}', $columns_select[1]),
             array_map(fn($tag) => $mapping[$this->columnName($tag)] ?? '', $columns_select[1]),
             $target_format
         );

app/Module/GeoDispersion/Services/GeoAnalysisDataService.php

Spacing +3 added lines, -3 removed lines

@@ -74,14 +74,14 @@
 
         return $query_individuals->unionAll($query_families)
             ->get()->pluck('g_gedcom')
-            ->flatMap(static function (string $gedcom): array {
+            ->flatMap(static function(string $gedcom): array {
                 preg_match_all('/\n2 PLAC (.+)/', $gedcom, $matches);
                 return $matches[1];
             })
             ->sort(I18N::comparator())->reverse()
-            ->mapWithKeys(static function (string $place): array {
+            ->mapWithKeys(static function(string $place): array {
                 $place_array = array_reverse(array_filter(array_map('trim', explode(",", $place))));
-                return [ count($place_array) => $place_array ];
+                return [count($place_array) => $place_array];
             })
             ->sortKeys()
             ->last() ?? [];

app/Module/ModuleMyArtJaubTrait.php

Spacing +5 added lines, -5 removed lines

@@ -33,7 +33,7 @@ 
      */
     public function boot(): void
     {
-        View::registerNamespace($this->name(), $this->resourcesFolder() . 'views/');
+        View::registerNamespace($this->name(), $this->resourcesFolder().'views/');
 
         $this->loadRoutes(Registry::routeFactory()->routeMap());
     }
@@ -43,7 +43,7 @@ 
      */
     public function resourcesFolder(): string
     {
-        return Webtrees::MODULES_DIR . trim($this->name(), '_') . '/resources/';
+        return Webtrees::MODULES_DIR.trim($this->name(), '_').'/resources/';
     }
 
     /**
@@ -69,7 +69,7 @@ 
      */
     public function customTranslations(string $language): array
     {
-        $translation_file = $this->resourcesFolder() . 'lang/' . $language . '/messages.php';
+        $translation_file = $this->resourcesFolder().'lang/'.$language.'/messages.php';
 
         try {
             $translation  = new Translation($translation_file);
@@ -96,10 +96,10 @@ 
     {
         /** @var ModuleThemeInterface $theme */
         $theme = app(ModuleThemeInterface::class);
-        $css_file = $this->resourcesFolder() . 'css/' . $theme->name() . '.min.css';
+        $css_file = $this->resourcesFolder().'css/'.$theme->name().'.min.css';
 
         if (file_exists($css_file)) {
-            return $this->assetUrl('css/' . $theme->name() . '.min.css');
+            return $this->assetUrl('css/'.$theme->name().'.min.css');
         } else {
             return $this->assetUrl('css/default.min.css');
         }