fisharebest / webtrees

app/Module/ChartsBlockModule.php

Spacing +4 added lines, -4 removed lines

@@ -108,7 +108,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',
@@ -124,7 +124,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',
@@ -139,7 +139,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',
@@ -233,7 +233,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/Functions/FunctionsRtl.php

Spacing +2 added lines, -2 removed lines

@@ -183,7 +183,7 @@ 
                         $currentLen        = $endPos + 2;
                         $directive         = substr($workingText, 0, $currentLen);
                         $workingText       = substr($workingText, $currentLen);
-                        $result            .= self::$waitingText . $directive;
+                        $result .= self::$waitingText . $directive;
                         self::$waitingText = '';
                         break;
                     }
@@ -1125,7 +1125,7 @@ 
 
             // We're done: finish the span
             $textSpan = self::starredName($textSpan, 'RTL'); // Wrap starred name in <u> and </u> tags
-            $result   .= $textSpan . self::END_RTL;
+            $result .= $textSpan . self::END_RTL;
         }
 
         if (self::$currentState !== 'LTR' && self::$currentState !== 'RTL') {

app/Http/RequestHandlers/HelpText.php

Spacing +1 added lines, -1 removed lines

@@ -299,6 +299,6 @@
      */
     private function dmyOrder(): string
     {
-        return preg_replace('/[^DMY]/', '', str_replace(['J', 'F',], ['D', 'M',], I18N::dateFormat()));
+        return preg_replace('/[^DMY]/', '', str_replace(['J', 'F', ], ['D', 'M', ], I18N::dateFormat()));
     }
 }

app/Http/Controllers/MediaFileController.php

Spacing +1 added lines, -1 removed lines

@@ -188,7 +188,7 @@
             $params['tree'] = $media_file->media()->tree()->name();
             $this->glideSignature()->validateRequest('', $params);
 
-            $path = $media_file->media()->tree()->getPreference('MEDIA_DIRECTORY', 'media/') .  $media_file->filename();
+            $path = $media_file->media()->tree()->getPreference('MEDIA_DIRECTORY', 'media/') . $media_file->filename();
             $folder = dirname($path);
 
             $cache_path           = 'thumbnail-cache/' . md5($folder);

app/Report/ReportParserGenerate.php

Spacing +1 added lines, -1 removed lines

@@ -828,7 +828,7 @@
         // Until this can be re-designed, we need this assertion to help static analysis tools.
         assert($this->current_element instanceof ReportBaseElement, new LogicException());
 
-        $this->wt_report       = array_pop($this->wt_report_stack);
+        $this->wt_report = array_pop($this->wt_report_stack);
         $this->wt_report->addElement($this->current_element);
     }
 

app/Module/InteractiveTree/TreeView.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
     public function getIndividuals(Tree $tree, string $request): string
     {
         $json_requests = explode(';', $request);
-        $r    = [];
+        $r = [];
         foreach ($json_requests as $json_request) {
             $firstLetter = substr($json_request, 0, 1);
             $json_request = substr($json_request, 1);

app/Http/Controllers/EditIndividualController.php

Indentation +6 added lines, -6 removed lines

@@ -37,12 +37,12 @@
 class EditIndividualController extends AbstractEditController
 {
     /**
-      * Add a child to an existing individual (creating a one-parent family).
-      *
-      * @param ServerRequestInterface $request
-      *
-      * @return ResponseInterface
-      */
+     * Add a child to an existing individual (creating a one-parent family).
+     *
+     * @param ServerRequestInterface $request
+     *
+     * @return ResponseInterface
+     */
     public function addChild(ServerRequestInterface $request): ResponseInterface
     {
         $tree = $request->getAttribute('tree');

Spacing +3 added lines, -3 removed lines

@@ -547,7 +547,7 @@ 
         $tree = $request->getAttribute('tree');
         assert($tree instanceof Tree);
 
-        $xref  = $request->getQueryParams()['xref'];
+        $xref = $request->getQueryParams()['xref'];
 
         $individual = Factory::individual()->make($xref, $tree);
         $individual = Auth::checkIndividualAccess($individual, true);
@@ -559,7 +559,7 @@ 
         $family = Factory::family()->make($famid, $tree);
         $family = Auth::checkFamilyAccess($family, true);
 
-        $PEDI  = $params['PEDI'];
+        $PEDI = $params['PEDI'];
 
         // Replace any existing child->family link (we may be changing the PEDI);
         $fact_id = '';
@@ -631,7 +631,7 @@ 
         $tree = $request->getAttribute('tree');
         assert($tree instanceof Tree);
 
-        $xref   = $request->getQueryParams()['xref'];
+        $xref = $request->getQueryParams()['xref'];
 
         $individual = Factory::individual()->make($xref, $tree);
         $individual = Auth::checkIndividualAccess($individual, true);

app/Http/Controllers/Admin/ImportThumbnailsController.php

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
                 // Turn each filename into a row for the table
                 $original = $this->findOriginalFileFromThumbnail($thumbnail);
 
-                $original_url  = route('unused-media-thumbnail', [
+                $original_url = route('unused-media-thumbnail', [
                     'path' => $original,
                     'w'    => 100,
                     'h'    => 100,

app/Http/Controllers/ListController.php

Braces +3 added lines, -1 removed lines

@@ -246,7 +246,8 @@ 
                     <li class="wt-initials-list-item d-flex">
                         <?php if ($count > 0) : ?>
                             <a href="<?= e(route('module', ['module' => $module, 'action' => $action, 'alpha' => $letter, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a>
-                        <?php else : ?>
+                        <?php else {
+    : ?>
                             <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span>
 
                         <?php endif ?>
@@ -300,6 +301,7 @@ 
 
             if ($show === 'indi' || $show === 'surn') {
                 $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, I18N::locale());
+}
                 if ($show === 'surn') {
                     // Show the surname list
                     switch ($tree->getPreference('SURNAME_LIST_STYLE')) {

Spacing +2 added lines, -2 removed lines

@@ -136,7 +136,7 @@ 
         $alpha = $request->getQueryParams()['alpha'] ?? '';
 
         // All individuals with this surname
-        $surname = $request->getQueryParams()['surname'] ??  '';
+        $surname = $request->getQueryParams()['surname'] ?? '';
 
         // All individuals
         $show_all = $request->getQueryParams()['show_all'] ?? 'no';
@@ -189,7 +189,7 @@ 
                     'tree'      => $tree->name(),
                     'show_all' => 'yes',
                 ];
-                $show    = $request->getQueryParams()['show'] ?? 'surn';
+                $show = $request->getQueryParams()['show'] ?? 'surn';
             }
         } elseif ($surname !== '') {
             $alpha    = $this->localization_service->initialLetter($surname, I18N::locale()); // so we can highlight the initial letter