jon48 / webtrees-lib

app/Module/GeoDispersion/Schema/Migration2.php

Spacing +6 added lines, -6 removed lines

@@ -91,7 +91,7 @@ 
 
         foreach ($existing_views as $old_view) {
             try {
-                $tree = $tree_service->find((int) $old_view->majgd_file);
+                $tree = $tree_service->find((int)$old_view->majgd_file);
             } catch (RuntimeException $ex) {
                 continue;
             }
@@ -134,8 +134,8 @@ 
             $old_view->majgd_status === 'enabled',
             $old_view->majgd_descr,
             app(SosaByGenerationGeoAnalysis::class),
-            (int) $old_view->majgd_sublevel,
-            (int) $old_view->majgd_detailsgen
+            (int)$old_view->majgd_sublevel,
+            (int)$old_view->majgd_detailsgen
         );
 
         return $geoview_data_service->insertGetId($new_view) > 0;
@@ -165,8 +165,8 @@ 
             $old_view->majgd_status === 'enabled',
             $old_view->majgd_descr,
             app(SosaByGenerationGeoAnalysis::class),
-            (int) $old_view->majgd_sublevel,
-            (int) $old_view->majgd_detailsgen
+            (int)$old_view->majgd_sublevel,
+            (int)$old_view->majgd_detailsgen
         );
 
         $view_id = $geoview_data_service->insertGetId($new_view);
@@ -203,7 +203,7 @@ 
     private function mapIdsFromOld(string $map_xml): array
     {
         $mapping = self::MAPS_XML_MAPPING[$map_xml] ?? [];
-        return is_array($mapping) ? $mapping : [ $mapping ];
+        return is_array($mapping) ? $mapping : [$mapping];
     }
 
     /**

app/Module/GeoDispersion/Services/GeoAnalysisViewDataService.php

Spacing +7 added lines, -7 removed lines

@@ -42,7 +42,7 @@ 
     public function find(Tree $tree, int $id, bool $include_disabled = false): ?AbstractGeoAnalysisView
     {
         return $this->all($tree, $include_disabled)
-            ->first(fn(AbstractGeoAnalysisView $view): bool => $view->id() === $id);
+            ->first(fn(AbstractGeoAnalysisView $view) : bool => $view->id() === $id);
     }
 
     /**
@@ -58,7 +58,7 @@ 
     {
         return Registry::cache()->array()->remember(
             'all-geodispersion-views',
-            function () use ($tree, $include_disabled): Collection {
+            function() use ($tree, $include_disabled): Collection {
                 return DB::table('maj_geodisp_views')
                     ->select('maj_geodisp_views.*')
                     ->where('majgv_gedcom_id', '=', $tree->id())
@@ -148,7 +148,7 @@ 
      */
     private function viewMapper(Tree $tree): Closure
     {
-        return function (stdClass $row) use ($tree): ?AbstractGeoAnalysisView {
+        return function(stdClass $row) use ($tree): ?AbstractGeoAnalysisView {
             try {
                 $geoanalysis = app($row->majgv_analysis);
                 if (!($geoanalysis instanceof GeoAnalysisInterface)) {
@@ -156,13 +156,13 @@ 
                 }
 
                 $view = app()->makeWith($row->majgv_view_class, [
-                    'id'                    =>  (int) $row->majgv_id,
+                    'id'                    =>  (int)$row->majgv_id,
                     'tree'                  =>  $tree,
                     'enabled'               =>  $row->majgv_status === 'enabled',
                     'description'           =>  $row->majgv_descr,
                     'geoanalysis'           =>  $geoanalysis,
-                    'depth'                 =>  (int) $row->majgv_place_depth,
-                    'detailed_top_places'   =>  (int) $row->majgv_top_places
+                    'depth'                 =>  (int)$row->majgv_place_depth,
+                    'detailed_top_places'   =>  (int)$row->majgv_top_places
                 ]);
 
                 if ($row->majgv_colors !== null && $view instanceof GeoAnalysisMap) {
@@ -210,7 +210,7 @@ 
      */
     private function enabledFilter(bool $include_disabled): Closure
     {
-        return function (AbstractGeoAnalysisView $view) use ($include_disabled): bool {
+        return function(AbstractGeoAnalysisView $view) use ($include_disabled): bool {
             return $include_disabled || $view->isEnabled();
         };
     }

app/Module/GeoDispersion/Services/MapAdapterDataService.php

Spacing +3 added lines, -3 removed lines

@@ -132,7 +132,7 @@ 
      */
     private function mapAdapterMapper(): Closure
     {
-        return function (stdClass $row): ?GeoAnalysisMapAdapter {
+        return function(stdClass $row): ?GeoAnalysisMapAdapter {
             if (null === $map = $this->mapdefinition_service->find($row->majgm_map_id)) {
                 return null;
             }
@@ -143,8 +143,8 @@ 
                 }
 
                 return new GeoAnalysisMapAdapter(
-                    (int) $row->majgm_id,
-                    (int) $row->majgm_majgv_id,
+                    (int)$row->majgm_id,
+                    (int)$row->majgm_majgv_id,
                     $map,
                     app($row->majgm_mapper),
                     new MapViewConfig($row->majgm_feature_prop, $this->mapperConfigDecoder($row->majgm_config))

app/Module/Certificates/Http/RequestHandlers/CertificatesList.php

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
 
         $title = I18N::translate('Certificates');
 
-        $cities = array_map(function (string $item): array {
+        $cities = array_map(function(string $item): array {
             return [$this->url_obfuscator_service->obfuscate($item), $item];
         }, $this->certif_filesystem->cities($tree));
 
@@ -90,7 +90,7 @@ 
             $certificates = $this->certif_filesystem->certificatesForCity($tree, $city);
         }
 
-        return $this->viewResponse($this->module->name() . '::certificates-list', [
+        return $this->viewResponse($this->module->name().'::certificates-list', [
             'title'                     =>  $title,
             'tree'                      =>  $tree,
             'module_name'               =>  $this->module->name(),

app/Module/Certificates/Http/RequestHandlers/AdminConfigPage.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
             throw new HttpAccessDeniedException();
         }
 
-        return $this->viewResponse($this->module->name() . '::admin/config', [
+        return $this->viewResponse($this->module->name().'::admin/config', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  $this->module->title(),
             'tree'              =>  $tree,

app/Module/Certificates/Services/CertificateDataService.php

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
         $tree = $certificate->tree();
         return DB::table('individuals')
             ->where('i_file', '=', $tree->id())
-            ->where('i_gedcom', 'like', '% _ACT ' . $this->escapedSqlPath($certificate) . '%')
+            ->where('i_gedcom', 'like', '% _ACT '.$this->escapedSqlPath($certificate).'%')
             ->select(['individuals.*'])
             ->get()
             ->map(Registry::individualFactory()->mapper($tree))
@@ -64,7 +64,7 @@ 
         $tree = $certificate->tree();
         return DB::table('families')
             ->where('f_file', '=', $tree->id())
-            ->where('f_gedcom', 'like', '% _ACT ' . $this->escapedSqlPath($certificate) . '%')
+            ->where('f_gedcom', 'like', '% _ACT '.$this->escapedSqlPath($certificate).'%')
             ->select(['families.*'])
             ->get()
             ->map(Registry::familyFactory()->mapper($tree))
@@ -85,7 +85,7 @@ 
         $tree = $certificate->tree();
         return DB::table('media')
             ->where('m_file', '=', $tree->id())
-            ->where('m_gedcom', 'like', '% _ACT ' . $this->escapedSqlPath($certificate) . '%')
+            ->where('m_gedcom', 'like', '% _ACT '.$this->escapedSqlPath($certificate).'%')
             ->select(['media.*'])
             ->get()
             ->map(Registry::mediaFactory()->mapper($tree))
@@ -107,7 +107,7 @@ 
         return DB::table('other')
             ->where('o_file', '=', $tree->id())
             ->where('o_type', '=', 'NOTE')
-            ->where('o_gedcom', 'like', '% _ACT ' . $this->escapedSqlPath($certificate) . '%')
+            ->where('o_gedcom', 'like', '% _ACT '.$this->escapedSqlPath($certificate).'%')
             ->select(['other.*'])
             ->get()
             ->map(Registry::noteFactory()->mapper($tree))
@@ -135,7 +135,7 @@ 
     public function oneLinkedSource(Certificate $certificate): ?Source
     {
         $regex_query = preg_quote($certificate->gedcomPath(), '/');
-        $regex_pattern = '/[1-9] SOUR @(' . Gedcom::REGEX_XREF . ')@(?:\n[2-9]\s(?:(?!SOUR)\w+)\s.*)*\n[2-9] _ACT ' . $regex_query . '/i'; //phpcs:ignore Generic.Files.LineLength.TooLong
+        $regex_pattern = '/[1-9] SOUR @('.Gedcom::REGEX_XREF.')@(?:\n[2-9]\s(?:(?!SOUR)\w+)\s.*)*\n[2-9] _ACT '.$regex_query.'/i'; //phpcs:ignore Generic.Files.LineLength.TooLong
 
         foreach ($this->linkedRecordsLists($certificate) as $linked_records) {
             foreach ($linked_records as $gedcom_record) {

app/Module/Certificates/Model/Watermark.php

Spacing +1 added lines, -1 removed lines

@@ -125,6 +125,6 @@
      */
     private function stringLengthEstimate(int $text_length, int $font_size): int
     {
-        return $text_length * (int) ceil(($font_size + 2) * 0.5);
+        return $text_length * (int)ceil(($font_size + 2) * 0.5);
     }
 }

app/Module/Certificates/Model/Certificate.php

Spacing +3 added lines, -3 removed lines

@@ -202,11 +202,11 @@
     {
         $sort_prefix = '';
         if (preg_match_all('/\b([A-Z]{3,})\b/', $this->description(), $matches, PREG_SET_ORDER) >= 1) {
-            $sort_prefix = implode('_', array_map(function ($match) {
+            $sort_prefix = implode('_', array_map(function($match) {
                 return $match[1];
-            }, $matches)) . '_';
+            }, $matches)).'_';
         }
-        return $sort_prefix . $this->description();
+        return $sort_prefix.$this->description();
     }
 
     /**

app/Module/Certificates/Elements/SourceCertificate.php

Spacing +2 added lines, -2 removed lines

@@ -69,11 +69,11 @@
     {
         list($city, $file) = explode('/', $this->canonical($value), 2) + ['', ''];
 
-        $cities = array_map(function (string $item): array {
+        $cities = array_map(function(string $item): array {
             return [$this->url_obfuscator_service->obfuscate($item), $item];
         }, $this->certif_filesystem->cities($tree));
 
-        return view($this->module->name() . '::components/edit-certificate', [
+        return view($this->module->name().'::components/edit-certificate', [
             'module_name'   =>  $this->module->name(),
             'tree'          =>  $tree,
             'id'            =>  $id,