fisharebest / webtrees

app/Report/ReportPdfCell.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 /**
  * webtrees: online genealogy
  * Copyright (C) 2018 webtrees development team
@@ -46,7 +46,7 @@ 
             '<u>',
             '</u>',
         ], $temptext);
-        $match    = [];
+        $match = [];
         // Indicates if the cell background must be painted (1) or transparent (0)
         if ($this->fill == 1) {
             if (!empty($this->bgcolor)) {

app/Report/ReportHtmlText.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 /**
  * webtrees: online genealogy
  * Copyright (C) 2018 webtrees development team
@@ -62,7 +62,7 @@ 
                     $lines = explode("\n", $temptext);
                     foreach ($lines as $line) {
                         echo '<div style="position:absolute;top:', $startY, 'pt;', $renderer->alignRTL, ':', $startX, 'pt;width:', $width, 'pt;">';
-                        $line   = $renderer->textWrap($line, $width);
+                        $line = $renderer->textWrap($line, $width);
                         $startY += $renderer->getTextCellHeight($line);
                         $renderer->setY($startY);
                         $renderer->write($line, $this->color);
@@ -149,7 +149,7 @@ 
                                     $newtext .= ' ';
                                 }
                             } else {
-                                $lw      = $html->getStringWidth($word . ' ');
+                                $lw = $html->getStringWidth($word . ' ');
                                 $newtext .= "\n$word";
                                 if ($addspace != 0) {
                                     $newtext .= ' ';

app/Report/ReportParserGenerate.php

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 /**
  * webtrees: online genealogy
  * Copyright (C) 2018 webtrees development team
@@ -1848,7 +1848,7 @@ 
         // Some filters/sorts can be applied using SQL, while others require PHP
         switch ($listname) {
             case 'pending':
-                $rows       = Database::prepare(
+                $rows = Database::prepare(
                     "SELECT xref, CASE new_gedcom WHEN '' THEN old_gedcom ELSE new_gedcom END AS gedcom" .
                     " FROM `##change`" . " WHERE (xref, change_id) IN (" .
                     "  SELECT xref, MAX(change_id)" .
@@ -1887,7 +1887,7 @@ 
                                 $sql_params[$attr . 'date'] = $date->minimumJulianDay();
                             }
                             if ($sortby == $match[1]) {
-                                $sortby       = "";
+                                $sortby = "";
                                 $sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.d_julianday1";
                             }
                             unset($attrs[$attr]); // This filter has been fully processed
@@ -1899,13 +1899,13 @@ 
                                 if ($match[1] != '') {
                                     $names = explode(' ', $match[1]);
                                     foreach ($names as $n => $name) {
-                                        $sql_where                       .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
+                                        $sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
                                         $sql_params[$attr . 'name' . $n] = $name;
                                     }
                                 }
                                 // Let the DB do the name sorting even when no name was entered
                                 if ($sortby == 'NAME') {
-                                    $sortby       = '';
+                                    $sortby = '';
                                     $sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.n_sort";
                                 }
                             }
@@ -1922,7 +1922,7 @@ 
                             $sql_params[$attr . 'place'] = $match[1];
                             // Don't unset this filter. This is just initial filtering
                         } elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
-                            $sql_where                       .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
+                            $sql_where .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
                             $sql_params[$attr . 'contains1'] = $match[1];
                             $sql_params[$attr . 'contains2'] = $match[2];
                             $sql_params[$attr . 'contains3'] = $match[3];
@@ -1964,7 +1964,7 @@ 
                                 $sql_params[$attr . 'date'] = $date->minimumJulianDay();
                             }
                             if ($sortby == $match[1]) {
-                                $sortby       = '';
+                                $sortby = '';
                                 $sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.d_julianday1";
                             }
                             unset($attrs[$attr]); // This filter has been fully processed
@@ -1981,13 +1981,13 @@ 
                                 if ($match[1] != '') {
                                     $names = explode(' ', $match[1]);
                                     foreach ($names as $n => $name) {
-                                        $sql_where                       .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
+                                        $sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
                                         $sql_params[$attr . 'name' . $n] = $name;
                                     }
                                 }
                                 // Let the DB do the name sorting even when no name was entered
                                 if ($sortby == 'NAME') {
-                                    $sortby       = '';
+                                    $sortby = '';
                                     $sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.n_sort";
                                 }
                             }
@@ -1999,7 +1999,7 @@ 
                             $sql_params[$attr . 'place'] = $match[1];
                             // Don't unset this filter. This is just initial filtering
                         } elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
-                            $sql_where                       .= " AND f_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
+                            $sql_where .= " AND f_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
                             $sql_params[$attr . 'contains1'] = $match[1];
                             $sql_params[$attr . 'contains2'] = $match[2];
                             $sql_params[$attr . 'contains3'] = $match[3];

app/Report/ReportHtml.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 /**
  * webtrees: online genealogy
  * Copyright (C) 2018 webtrees development team
@@ -148,7 +148,7 @@ 
             $this->pageh = $tmpw;
         }
         // Store the pagewidth without margins
-        $this->noMarginWidth = (int)($this->pagew - $this->leftmargin - $this->rightmargin);
+        $this->noMarginWidth = (int) ($this->pagew - $this->leftmargin - $this->rightmargin);
         // If RTL
         if ($this->rtl) {
             $this->alignRTL  = 'right';
@@ -740,14 +740,14 @@ 
     public function textWrap($str, $width): string
     {
         // Calculate the line width
-        $lw = (int)($width / ($this->getCurrentStyleHeight() / 2));
+        $lw = (int) ($width / ($this->getCurrentStyleHeight() / 2));
         // Wordwrap each line
         $lines = explode("\n", $str);
         // Line Feed counter
         $lfct     = count($lines);
         $wraptext = '';
         foreach ($lines as $line) {
-            $wtext    = FunctionsRtl::utf8WordWrap($line, $lw, "\n", true);
+            $wtext = FunctionsRtl::utf8WordWrap($line, $lw, "\n", true);
             $wraptext .= $wtext;
             // Add a new line as long as it’s not the last line
             if ($lfct > 1) {

app/Menu.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 /**
  * webtrees: online genealogy
  * Copyright (C) 2018 webtrees development team
@@ -70,7 +70,7 @@ 
                     $attrs .= ' ' . $key . '="' . e($value) . '"';
                 }
 
-                $class    = trim('dropdown-item ' . $submenu->class);
+                $class = trim('dropdown-item ' . $submenu->class);
                 $submenus .= '<a class="' . $class . '" href="' . e($submenu->link) . '"' . $attrs . '>' . $submenu->label . '</a>';
             }
 

app/Functions/FunctionsPrintFacts.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 /**
  * webtrees: online genealogy
  * Copyright (C) 2018 webtrees development team
@@ -177,14 +177,14 @@ 
             case '_BIRT_CHIL':
                 $children[$fact->getParent()->getXref()] = true;
                 /* I18N: Abbreviation for "number %s" */
-                $label                                   .= '<br>' . I18N::translate('#%s', count($children));
+                $label .= '<br>' . I18N::translate('#%s', count($children));
                 break;
             case '_BIRT_GCHI':
             case '_BIRT_GCH1':
             case '_BIRT_GCH2':
                 $grandchildren[$fact->getParent()->getXref()] = true;
                 /* I18N: Abbreviation for "number %s" */
-                $label                                        .= '<br>' . I18N::translate('#%s', count($grandchildren));
+                $label .= '<br>' . I18N::translate('#%s', count($grandchildren));
                 break;
         }
 
@@ -578,7 +578,7 @@ 
         for ($j = 0; $j < $ct; $j++) {
             if (strpos($match[$j][1], '@') === false) {
                 $source = e($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2]));
-                $data   .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
+                $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
             }
         }
         // Find source for each fact
@@ -596,7 +596,7 @@ 
                     }
                     $srec      = substr($factrec, $spos1, $spos2 - $spos1);
                     $lt        = preg_match_all("/$nlevel \w+/", $srec, $matches);
-                    $data      .= '<div class="fact_SOUR">';
+                    $data .= '<div class="fact_SOUR">';
                     $elementID = Uuid::uuid4()->toString();
                     if ($tree->getPreference('EXPAND_SOURCES')) {
                         $plusminus = 'icon-minus';

app/Functions/FunctionsRtl.php

Spacing +13 added lines, -13 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 /**
  * webtrees: online genealogy
  * Copyright (C) 2018 webtrees development team
@@ -293,7 +293,7 @@ 
                         if ($openParIndex !== false) {
                             // Opening parentheses always inherit the following directionality
                             self::$waitingText .= $currentLetter;
-                            $workingText       = substr($workingText, $currentLen);
+                            $workingText = substr($workingText, $currentLen);
                             while (true) {
                                 if ($workingText === '') {
                                     break;
@@ -301,13 +301,13 @@ 
                                 if (substr($workingText, 0, 1) === ' ') {
                                     // Spaces following this left parenthesis inherit the following directionality too
                                     self::$waitingText .= ' ';
-                                    $workingText       = substr($workingText, 1);
+                                    $workingText = substr($workingText, 1);
                                     continue;
                                 }
                                 if (substr($workingText, 0, 6) === '&nbsp;') {
                                     // Spaces following this left parenthesis inherit the following directionality too
                                     self::$waitingText .= '&nbsp;';
-                                    $workingText       = substr($workingText, 6);
+                                    $workingText = substr($workingText, 6);
                                     continue;
                                 }
                                 break;
@@ -324,9 +324,9 @@ 
                         // Exceptions to this rule will be handled later during final clean-up.
                         //
                         self::$waitingText .= $currentLetter;
-                        $workingText       = substr($workingText, $currentLen);
+                        $workingText = substr($workingText, $currentLen);
                         if (self::$currentState != '') {
-                            $result            .= self::$waitingText;
+                            $result .= self::$waitingText;
                             self::$waitingText = '';
                         }
                         break 2; // double break because we're waiting for more information
@@ -457,7 +457,7 @@ 
                 }
                 if (substr($result . "\n", 0, self::LENGTH_START) != self::START_LTR && substr($result . "\n", 0, self::LENGTH_START) != self::START_RTL) {
                     $leadingText .= substr($result, 0, 1);
-                    $result      = substr($result, 1);
+                    $result = substr($result, 1);
                     continue;
                 }
                 $result = substr($result, 0, self::LENGTH_START) . $leadingText . substr($result, self::LENGTH_START);
@@ -592,11 +592,11 @@ 
     public static function breakCurrentSpan(&$result)
     {
         // Interrupt the current span, insert that <br>, and then continue the current span
-        $result            .= self::$waitingText;
+        $result .= self::$waitingText;
         self::$waitingText = '';
 
         $breakString = '<' . self::$currentState . 'br>';
-        $result      .= $breakString;
+        $result .= $breakString;
     }
 
     /**
@@ -649,7 +649,7 @@ 
                 break;
             } // No more numeric strings
 
-            $tempResult    .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string
+            $tempResult .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string
             $numericString = substr($textSpan, $posLRE + 3, $posPDF - $posLRE); // Separate the entire numeric string
             $textSpan      = substr($textSpan, $posPDF + 3);
             $posColon      = strpos($numericString, ':');
@@ -1141,7 +1141,7 @@ 
         while ($string) {
             if (mb_strlen($string) <= $width) {
                 // Do not wrap any text that is less than the output area.
-                $out    .= $string;
+                $out .= $string;
                 $string = '';
             } else {
                 $sub1 = mb_substr($string, 0, $width + 1);
@@ -1155,7 +1155,7 @@ 
                 if ($spacepos === false) {
                     // No space on line?
                     if ($cut) {
-                        $out    .= $sub . $sep;
+                        $out .= $sub . $sep;
                         $string = mb_substr($string, mb_strlen($sub));
                     } else {
                         $spacepos = strpos($string, ' ');
@@ -1169,7 +1169,7 @@ 
                     }
                 } else {
                     // Split at space;
-                    $out    .= substr($string, 0, $spacepos) . $sep;
+                    $out .= substr($string, 0, $spacepos) . $sep;
                     $string = substr($string, $spacepos + 1);
                 }
             }

app/Functions/FunctionsPrintLists.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 /**
  * webtrees: online genealogy
  * Copyright (C) 2018 webtrees development team
@@ -54,7 +54,7 @@ 
                 } else {
                     $size = 75.0 + 125.0 * ($count - $minimum) / ($maximum - $minimum);
                 }
-                $url  = route($route, [
+                $url = route($route, [
                     'surname' => $surn,
                     'ged'     => $tree->getName(),
                 ]);
@@ -131,13 +131,13 @@ 
                 }
                 $newcol = ceil($count / $col);
                 $html2  = '<table class="list_table"><tr>';
-                $html2  .= '<td class="list_value" style="padding: 14px;">';
+                $html2 .= '<td class="list_value" style="padding: 14px;">';
 
                 foreach ($html as $surns) {
                     $html2 .= $surns . '<br>';
                     $i++;
                     if ($i == $newcol && $i < $count) {
-                        $html2  .= '</td><td class="list_value" style="padding: 14px;">';
+                        $html2 .= '</td><td class="list_value" style="padding: 14px;">';
                         $newcol = $i + ceil($count / $col);
                     }
                 }

app/Functions/FunctionsEdit.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 /**
  * webtrees: online genealogy
  * Copy§right (C) 2017 webtrees development team
@@ -527,7 +527,7 @@ 
         if ($islink) {
             $value = trim($value, '@');
         } else {
-            $value = (string)substr($tag, strlen($fact) + 3);
+            $value = (string) substr($tag, strlen($fact) + 3);
         }
         if ($fact === 'REPO' || $fact === 'SOUR' || $fact === 'OBJE' || $fact === 'FAMC') {
             $islink = true;
@@ -812,7 +812,7 @@ 
             $html .= '<p class="small text-muted">' . I18N::translate('Use this image for charts and on the individual’s page.') . '</p>';
         } elseif ($fact === 'TYPE' && $level === '3') {
             //-- Build the selector for the Media 'TYPE' Fact
-            $html          .= '<select name="text[]"><option selected value="" ></option>';
+            $html .= '<select name="text[]"><option selected value="" ></option>';
             $selectedValue = strtolower($value);
             if (!array_key_exists($selectedValue, GedcomTag::getFileFormTypes())) {
                 $html .= '<option selected value="' . e($value) . '" >' . e($value) . '</option>';