fisharebest / webtrees

app/Http/Controllers/AdminController.php

Spacing +2 added lines, -2 removed lines

@@ -230,7 +230,7 @@ 
      */
     public function changesLogData(Request $request): Response
     {
-        list($select, , $where, $args1) = $this->changesQuery($request);
+        list($select,, $where, $args1) = $this->changesQuery($request);
         list($order_by, $limit, $args2) = $this->dataTablesPagination($request);
 
         $rows = Database::prepare(
@@ -306,7 +306,7 @@ 
      */
     public function changesLogDownload(Request $request): Response
     {
-        list($select, , $where, $args) = $this->changesQuery($request);
+        list($select,, $where, $args) = $this->changesQuery($request);
 
         $rows = Database::prepare($select . $where)->execute($args)->fetchAll();
 

resources/views/admin/control-panel.php

Braces +5 added lines, -2 removed lines

@@ -30,7 +30,8 @@ 
                     <?= /* I18N: %s is a version number */
                     I18N::translate('Upgrade to webtrees %s.', e($latest_version)) ?>
                 </a>
-            <?php else : ?>
+            <?php else {
+    : ?>
                 <?= I18N::translate('This is the latest version of webtrees. No upgrade is available.') ?>
             <?php endif ?>
         </p>
@@ -134,7 +135,9 @@ 
                     'repositories' => $repositories,
                     'media'        => $media,
                     'notes'        => $notes,
-                ]); ?>
+                ]);
+}
+?>
             </tbody>
             <tfoot>
                 <tr>

resources/views/compact-tree-arrow.php

Braces +3 added lines, -1 removed lines

@@ -3,6 +3,8 @@
 
 <?php if ($individual === null) : ?>
     <?= FontAwesome::decorativeIcon($class) ?>
-<?php else : ?>
+<?php else {
+    : ?>
     <?= FontAwesome::linkIcon($class, I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())), ['href' => route('compact-tree', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName()])]) ?>
 <?php endif;
+}

resources/views/lists/families-table.php

Spacing +1 added lines, -1 removed lines

@@ -313,7 +313,7 @@
                 </td>
 
                 <!-- Marriage anniversary -->
-                <td class="center" data-sort="<?= - $family->getMarriageDate()->julianDay() ?>">
+                <td class="center" data-sort="<?= -$family->getMarriageDate()->julianDay() ?>">
                     <?= Date::getAge($family->getMarriageDate(), null) ?>
                 </td>
 

resources/views/lists/individuals-table.php

Spacing +2 added lines, -2 removed lines

@@ -273,7 +273,7 @@ 
                 </td>
 
                 <!-- Birth anniversary -->
-                <td class="center" data-sort="<?= - $individual->getEstimatedBirthDate()->julianDay() ?>">
+                <td class="center" data-sort="<?= -$individual->getEstimatedBirthDate()->julianDay() ?>">
                     <?php if (isset($birth_dates[0]) && $birth_dates[0]->gregorianYear() >= 1550 && $birth_dates[0]->gregorianYear() < 2030 && !isset($unique_indis[$individual->getXref()])) : ?>
                         <?php $birt_by_decade[(int) ($birth_dates[0]->gregorianYear() / 10) * 10] .= $individual->getSex() ?>
                         <?= Date::getAge($birth_dates[0], null) ?>
@@ -305,7 +305,7 @@ 
                 </td>
 
                 <!-- Death anniversary -->
-                <td class="center" data-sort="<?= - $individual->getEstimatedDeathDate()->julianDay() ?>">
+                <td class="center" data-sort="<?= -$individual->getEstimatedDeathDate()->julianDay() ?>">
                     <?php if (isset($death_dates[0]) && $death_dates[0]->gregorianYear() >= 1550 && $death_dates[0]->gregorianYear() < 2030 && !isset($unique_indis[$individual->getXref()])) : ?>
                         <?php $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $individual->getSex() ?>
                         <?= Date::getAge($death_dates[0], null) ?>

Braces +5 added lines, -2 removed lines

@@ -319,8 +319,11 @@
                     <?php if (!isset($unique_indis[$individual->getXref()]) && $age_at_death >= 0 && $age_at_death <= $max_age) : ?>
                         <?php $deat_by_age[$age_at_death] .= $individual->getSex(); ?>
                     <?php endif ?>
-                <?php else : ?>
-                    <?php $age_at_death = ''; ?>
+                <?php else {
+    : ?>
+                    <?php $age_at_death = '';
+}
+?>
                     <?php $age_at_death_sort = PHP_INT_MAX; ?>
                 <?php endif ?>
                 <td class="center" data-sort="<?= e($age_at_death_sort) ?>">

resources/views/individual-page.php

Indentation +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
                 <?php foreach ($tabs as $tab) : ?>
                     <div id="<?= $tab->getName() ?>" class="tab-pane fade wt-ajax-load" role="tabpanel"><?php if (!$tab->canLoadAjax()) :
                         ?><?= $tab->getTabContent($individual) ?><?php
-                             endif ?></div>
+                                endif ?></div>
                 <?php endforeach ?>
             </div>
         </div>

resources/views/calendar-page.php

Braces +3 added lines, -1 removed lines

@@ -45,7 +45,8 @@ 
                     <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->d, 'month' => $m, 'year' => $cal_date->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) ?>" rel="nofollow">
                         <?php if ($m === $cal_month) : ?>
                             <span class="error"><?= e($month_name) ?></span>
-                        <?php else : ?>
+                        <?php else {
+    : ?>
                             <?= e($month_name) ?>
                         <?php endif ?>
                     </a> |
@@ -160,6 +161,7 @@ 
             <td class="topbottombar width50">
                 <?php
                     $n = 0;
+}
                 foreach (Date::calendarNames() as $newcal => $cal_name) {
                     $tmp = $cal_date->convertToCalendar($newcal);
                     if ($tmp->inValidRange()) {

app/GedcomTag.php

Spacing +1 added lines, -1 removed lines

@@ -1943,7 +1943,7 @@
                     return I18N::translate('Marriage of a father');
                 }
 
-                if ($sex ===  'F') {
+                if ($sex === 'F') {
                     /* I18N: ...to another spouse */
                     return I18N::translate('Marriage of a mother');
                 }

app/Functions/Functions.php

Spacing +1 added lines, -1 removed lines

@@ -1766,7 +1766,7 @@
                                 return I18N::translateContext('great ×(%s-1) grandparent’s brother', 'great ×%s uncle', I18N::number($up - 2));
                             }
 
-                            if ($sex2  === 'F') {
+                            if ($sex2 === 'F') {
                                 return I18N::translate('great ×%s aunt', I18N::number($up - 2));
                             }