fisharebest / webtrees

app/Module/TimelineChartModule.php

Spacing +3 added lines, -3 removed lines

@@ -46,7 +46,7 @@ 
 {
     use ModuleChartTrait;
 
-    protected const ROUTE_URL  = '/tree/{tree}/timeline-{scale}';
+    protected const ROUTE_URL = '/tree/{tree}/timeline-{scale}';
 
     // Defaults
     protected const DEFAULT_SCALE      = 10;
@@ -67,7 +67,7 @@ 
         '_TODO',
         'CHAN',
     ];
-    protected const BHEIGHT   = 30;
+    protected const BHEIGHT = 30;
 
     // Box height
 
@@ -152,7 +152,7 @@ 
 
         $params = (array) $request->getParsedBody();
 
-        $add  = $params['add'] ?? '';
+        $add = $params['add'] ?? '';
 
         Auth::checkComponentAccess($this, ModuleChartInterface::class, $tree, $user);
 

app/Http/RequestHandlers/PendingChangesLogData.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
                 '<div class="gedcom-data" dir="ltr">' .
                 preg_replace_callback(
                     '/@(' . Gedcom::REGEX_XREF . ')@/',
-                    static function (array $match) use ($tree): string {
+                    static function (array $match) use ($tree) : string {
                         $record = Registry::gedcomRecordFactory()->make($match[1], $tree);
 
                         return $record ? '<a href="' . e($record->url()) . '">' . $match[0] . '</a>' : $match[0];

app/Module/ChartsBlockModule.php

Spacing +5 added lines, -5 removed lines

@@ -117,7 +117,7 @@ 
                             'generations' => 3,
                             'layout'      => PedigreeChartModule::STYLE_RIGHT,
                         ]);
-                        $content   = view('modules/charts/chart', [
+                        $content = view('modules/charts/chart', [
                             'block_id'  => $block_id,
                             'chart_url' => $chart_url,
                             'class'     => 'wt-chart-pedigree',
@@ -138,7 +138,7 @@ 
                             'generations' => 2,
                             'chart_style' => DescendancyChartModule::CHART_STYLE_TREE,
                         ]);
-                        $content   = view('modules/charts/chart', [
+                        $content = view('modules/charts/chart', [
                             'block_id'  => $block_id,
                             'chart_url' => $chart_url,
                             'class'     => 'wt-chart-descendants',
@@ -151,7 +151,7 @@ 
                     break;
 
                 case 'hourglass':
-                    $module    = $this->module_service->findByInterface(HourglassChartModule::class)->first();
+                    $module = $this->module_service->findByInterface(HourglassChartModule::class)->first();
 
                     if ($module instanceof HourglassChartModule) {
                         $title     = $module->chartTitle($individual);
@@ -159,7 +159,7 @@ 
                             'ajax'        => true,
                             'generations' => 2,
                         ]);
-                        $content   = view('modules/charts/chart', [
+                        $content = view('modules/charts/chart', [
                             'block_id'  => $block_id,
                             'chart_url' => $chart_url,
                             'class'     => 'wt-chart-hourglass',
@@ -265,7 +265,7 @@ 
         $default_xref     = $gedcomid ?: $PEDIGREE_ROOT_ID;
 
         $type = $this->getBlockSetting($block_id, 'type', 'pedigree');
-        $xref  = $this->getBlockSetting($block_id, 'pid', $default_xref);
+        $xref = $this->getBlockSetting($block_id, 'pid', $default_xref);
 
         $charts = [
             'pedigree'    => I18N::translate('Pedigree'),

app/Http/RequestHandlers/DataFixUpdateAll.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
         /** @var Collection<GedcomRecord> $records */
         $records = $rows->map(function (stdClass $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/Http/RequestHandlers/ManageMediaData.php

Spacing +2 added lines, -2 removed lines

@@ -232,7 +232,7 @@ 
                     $create_form = '';
                     foreach ($media_trees as $media_tree => $media_directory) {
                         if (str_starts_with($row[0], $media_directory)) {
-                            $tmp         = substr($row[0], strlen($media_directory));
+                            $tmp = substr($row[0], strlen($media_directory));
                             $create_form .=
                                 '<p><a href="#" data-toggle="modal" data-backdrop="static" data-target="#modal-create-media-from-file" data-file="' . e($tmp) . '" data-url="' . e(route(CreateMediaObjectFromFile::class, ['tree' => $media_tree])) . '" onclick="document.getElementById(\'modal-create-media-from-file-form\').action=this.dataset.url; document.getElementById(\'file\').value=this.dataset.file;">' . I18N::translate('Create') . '</a> — ' . e($media_tree) . '<p>';
                         }
@@ -327,7 +327,7 @@ 
                 // This will work for local filesystems.  For remote filesystems, we will
                 // need to copy the file locally to work out the image size.
                 $imgsize = getimagesize(Webtrees::DATA_DIR . $file);
-                $html    .= '<dt>' . I18N::translate('Image dimensions') . '</dt>';
+                $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>';
                 /* I18N: image dimensions, width × height */
                 $html .= '<dd>' . I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1'])) . '</dd>';
             } catch (Throwable $ex) {

app/Http/RequestHandlers/MapDataList.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
         }
 
         // Request for a non-existent location?
-        if ($parent_id !== null &&  $parent->id() === null) {
+        if ($parent_id !== null && $parent->id() === null) {
             return redirect(route(__CLASS__));
         }
 

app/Services/UserService.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
      */
     public function find(?int $user_id): ?User
     {
-        return Registry::cache()->array()->remember('user-' . $user_id, static function () use ($user_id): ?User {
+        return Registry::cache()->array()->remember('user-' . $user_id, static function () use ($user_id) : ?User {
             return DB::table('user')
                 ->where('user_id', '=', $user_id)
                 ->get()

app/Report/PdfRenderer.php

Spacing +1 added lines, -1 removed lines

@@ -180,7 +180,7 @@
         $this->headerElements[] = $element;
     // set default header data
         if ($done == 0) {
-            $this->tcpdf->SetHeaderData('', 0, $element->getValue(), '', array(0,0,0), array(255,255,255));
+            $this->tcpdf->SetHeaderData('', 0, $element->getValue(), '', array(0, 0, 0), array(255, 255, 255));
             $done++;
         }
     }

app/Report/TcpdfWrapper.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
         $f = $this->getHeaderFont();
         $f[2] = 12;
         $this->setHeaderFont($f);
-        $this->header_line_color = array(255,255,255);  // the line cuts through the pedigree chart in landscape mode
+        $this->header_line_color = array(255, 255, 255); // the line cuts through the pedigree chart in landscape mode
     // and no line gives a nicer look
 
         if ($this->header_xobjid === false) {
@@ -111,7 +111,7 @@ 
         // print header template
         $xx = 0;
         if ($this->original_lMargin < 15) {
-            $xx = 15;   // approx 5mm (15/72*25.4)  // my Lexmark printer masks ~2 mm at the paper edge
+            $xx = 15; // approx 5mm (15/72*25.4)  // my Lexmark printer masks ~2 mm at the paper edge
                     // only applicable on pedigree charts(?)
         }
         $dx = 0;

Braces +2 added lines, -1 removed lines

@@ -99,7 +99,8 @@
             $this->SetFont($headerfont[0], 'B', $headerfont[2] + 1);
             $this->SetX($header_x);
             $this->Cell($cw, $cell_height, $headerdata['title'], 0, 1, 'C', 0, '', 0);
-            if ($this->page == 1) {   // allows for a second line, not used (yet)
+            if ($this->page == 1) {
+// allows for a second line, not used (yet)
                 // header string
                 $this->SetFont($headerfont[0], $headerfont[1], $headerfont[2]);
                 $this->SetX($header_x);