fisharebest / webtrees

app/Individual.php

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 /**
  * webtrees: online genealogy
  * Copyright (C) 2018 webtrees development team
@@ -124,7 +124,7 @@ 
         // Dead people...
         if ($this->tree->getPreference('SHOW_DEAD_PEOPLE') >= $access_level && $this->isDead()) {
             $keep_alive             = false;
-            $KEEP_ALIVE_YEARS_BIRTH = (int)$this->tree->getPreference('KEEP_ALIVE_YEARS_BIRTH');
+            $KEEP_ALIVE_YEARS_BIRTH = (int) $this->tree->getPreference('KEEP_ALIVE_YEARS_BIRTH');
             if ($KEEP_ALIVE_YEARS_BIRTH) {
                 preg_match_all('/\n1 (?:' . WT_EVENTS_BIRT . ').*(?:\n[2-9].*)*(?:\n2 DATE (.+))/', $this->gedcom, $matches, PREG_SET_ORDER);
                 foreach ($matches as $match) {
@@ -135,7 +135,7 @@ 
                     }
                 }
             }
-            $KEEP_ALIVE_YEARS_DEATH = (int)$this->tree->getPreference('KEEP_ALIVE_YEARS_DEATH');
+            $KEEP_ALIVE_YEARS_DEATH = (int) $this->tree->getPreference('KEEP_ALIVE_YEARS_DEATH');
             if ($KEEP_ALIVE_YEARS_DEATH) {
                 preg_match_all('/\n1 (?:' . WT_EVENTS_DEAT . ').*(?:\n[2-9].*)*(?:\n2 DATE (.+))/', $this->gedcom, $matches, PREG_SET_ORDER);
                 foreach ($matches as $match) {
@@ -151,7 +151,7 @@ 
             }
         }
         // Consider relationship privacy (unless an admin is applying download restrictions)
-        $user_path_length = (int)$this->tree->getUserPreference(Auth::user(), 'RELATIONSHIP_PATH_LENGTH');
+        $user_path_length = (int) $this->tree->getUserPreference(Auth::user(), 'RELATIONSHIP_PATH_LENGTH');
         $gedcomid         = $this->tree->getUserPreference(Auth::user(), 'gedcomid');
         if ($gedcomid !== '' && $user_path_length > 0) {
             return self::isRelated($this, $user_path_length);
@@ -323,7 +323,7 @@ 
      */
     public function isDead(): bool
     {
-        $MAX_ALIVE_AGE = (int)$this->tree->getPreference('MAX_ALIVE_AGE');
+        $MAX_ALIVE_AGE = (int) $this->tree->getPreference('MAX_ALIVE_AGE');
 
         // "1 DEAT Y" or "1 DEAT/2 DATE" or "1 DEAT/2 PLAC"
         if (preg_match('/\n1 (?:' . WT_EVENTS_DEAT . ')(?: Y|(?:\n[2-9].+)*\n2 (DATE|PLAC) )/', $this->gedcom)) {
@@ -712,7 +712,7 @@ 
                 if ($min && $max) {
                     $gregorian_calendar = new GregorianCalendar();
 
-                    list($year) = $gregorian_calendar->jdToYmd((int)((max($min) + min($max)) / 2));
+                    list($year) = $gregorian_calendar->jdToYmd((int) ((max($min) + min($max)) / 2));
                     $this->estimated_birth_date = new Date('EST ' . $year);
                 } else {
                     $this->estimated_birth_date = new Date(''); // always return a date object
@@ -739,7 +739,7 @@ 
             }
             if ($this->estimated_death_date === null) {
                 if ($this->getEstimatedBirthDate()->minimumJulianDay()) {
-                    $max_alive_age              = (int)$this->tree->getPreference('MAX_ALIVE_AGE');
+                    $max_alive_age              = (int) $this->tree->getPreference('MAX_ALIVE_AGE');
                     $this->estimated_death_date = $this->getEstimatedBirthDate()->addYears($max_alive_age, 'BEF');
                 } else {
                     $this->estimated_death_date = new Date(''); // always return a date object
@@ -1107,7 +1107,7 @@ 
         if ($display) {
             $txt .= ' style="display:' . $display . '"';
         }
-        $txt  .= '>';
+        $txt .= '>';
         $husb = $fam->getHusband();
         if ($husb) {
             // Temporarily reset the 'prefered' display name, as we always
@@ -1179,7 +1179,7 @@ 
         // Extract the structured name parts - use for "sortable" names and indexes
         ////////////////////////////////////////////////////////////////////////////
 
-        $sublevel = 1 + (int)$gedcom[0];
+        $sublevel = 1 + (int) $gedcom[0];
         $NPFX     = preg_match("/\n{$sublevel} NPFX (.+)/", $gedcom, $match) ? $match[1] : '';
         $GIVN     = preg_match("/\n{$sublevel} GIVN (.+)/", $gedcom, $match) ? $match[1] : '';
         $SURN     = preg_match("/\n{$sublevel} SURN (.+)/", $gedcom, $match) ? $match[1] : '';

app/Soundex.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
@@ -3617,7 +3617,7 @@ 
             $soundTableEntry = self::$dmsounds[$thisEntry];
             $workingResult   = $partialResult;
             $partialResult   = [];
-            $currPos         += strlen($thisEntry);
+            $currPos += strlen($thisEntry);
 
             // Not at beginning of input string
             if ($state != 1) {

app/Theme/AbstractTheme.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
@@ -215,7 +215,7 @@ 
     {
         if ($analytics_id) {
             // Add extra dimensions (i.e. filtering categories)
-            $dimensions = (object)[
+            $dimensions = (object) [
                 'dimension1' => $this->tree ? $this->tree->getName() : '-',
                 'dimension2' => $this->tree ? Auth::accessLevel($this->tree) : '-',
             ];
@@ -277,7 +277,7 @@ 
         if ($project_id && $security_id) {
             return
                 '<script>' .
-                'var sc_project=' . (int)$project_id . ',sc_invisible=1,sc_security="' . $security_id .
+                'var sc_project=' . (int) $project_id . ',sc_invisible=1,sc_security="' . $security_id .
                 '",scJsHost = (("https:"===document.location.protocol)?"https://secure.":"http://www.");' .
                 'document.write("<sc"+"ript src=\'"+scJsHost+"statcounter.com/counter/counter.js\'></"+"script>");' .
                 '</script>';
@@ -1783,7 +1783,7 @@ 
     public function menuSearchPhonetic(): Menu
     {
         /* I18N: search using “sounds like”, rather than exact spelling */
-        return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged'    => $this->tree->getName(), 'action' => 'soundex',]), 'menu-search-soundex', ['rel' => 'nofollow']);
+        return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged'    => $this->tree->getName(), 'action' => 'soundex', ]), 'menu-search-soundex', ['rel' => 'nofollow']);
     }
 
     /**

app/Tree.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
@@ -295,7 +295,7 @@ 
     public static function getAll(): array
     {
         if (empty(self::$trees)) {
-            $rows        = Database::prepare(
+            $rows = Database::prepare(
                 "SELECT g.gedcom_id AS tree_id, g.gedcom_name AS tree_name, gs1.setting_value AS tree_title" .
                 " FROM `##gedcom` g" .
                 " LEFT JOIN `##gedcom_setting`      gs1 ON (g.gedcom_id=gs1.gedcom_id AND gs1.setting_name='title')" .

app/Database.php

Spacing +4 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
@@ -89,8 +89,7 @@ 
         self::$table_prefix = $config['tblpfx'];
 
         $dsn = (substr($config['dbhost'], 0, 1) === '/' ?
-            "mysql:unix_socket='{$config['dbhost']};dbname={$config['dbname']}" :
-            "mysql:host={$config['dbhost']};dbname={$config['dbname']};port={$config['dbport']}"
+            "mysql:unix_socket='{$config['dbhost']};dbname={$config['dbname']}" : "mysql:host={$config['dbhost']};dbname={$config['dbname']};port={$config['dbport']}"
         );
 
         // Create the underlying PDO object.
@@ -223,7 +222,7 @@ 
     public static function updateSchema($namespace, $schema_name, $target_version): bool
     {
         try {
-            $current_version = (int)Site::getPreference($schema_name);
+            $current_version = (int) Site::getPreference($schema_name);
         } catch (PDOException $ex) {
             DebugBar::addThrowable($ex);
 
@@ -240,7 +239,7 @@ 
             $migration = new $class();
             $migration->upgrade();
             $current_version++;
-            Site::setPreference($schema_name, (string)$current_version);
+            Site::setPreference($schema_name, (string) $current_version);
             $updates_applied = true;
         }
 

app/Statement.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
@@ -72,7 +72,7 @@ 
                     $this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_NULL);
                     break;
                 case 'boolean':
-                    $this->pdo_statement->bindValue($key, (int)$bind_variable, PDO::PARAM_INT);
+                    $this->pdo_statement->bindValue($key, (int) $bind_variable, PDO::PARAM_INT);
                     break;
                 case 'integer':
                     $this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_INT);

app/Schema/Migration22.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
@@ -63,7 +63,7 @@ 
                     $_tmp_dir   = $WT_DATA_DIR;
                     while (strpos($_mf_dir, $_tmp_dir) !== 0) {
                         $_media_dir .= '../';
-                        $_tmp_dir   = preg_replace('~[^/\\\\]+[/\\\\]$~', '', $_tmp_dir);
+                        $_tmp_dir = preg_replace('~[^/\\\\]+[/\\\\]$~', '', $_tmp_dir);
                         if ($_tmp_dir == '') {
                             // Shouldn't get here - but this script is not allowed to fail...
                             continue 2;

app/Report/ReportPdfFootnote.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
@@ -110,7 +110,7 @@ 
         if ($this->wrapWidthRemaining > 0) {
             // Check with line counter too!
             // but floor the $wrapWidthRemaining first to keep it bugfree!
-            $wrapWidthRemaining = (int)($this->wrapWidthRemaining);
+            $wrapWidthRemaining = (int) ($this->wrapWidthRemaining);
             if ($lw >= $wrapWidthRemaining || $lfct > 1) {
                 $newtext = '';
                 $lines   = explode("\n", $this->numText);
@@ -132,7 +132,7 @@ 
                                     $newtext .= ' ';
                                 }
                             } else {
-                                $lw      = $pdf->GetStringWidth($word . ' ');
+                                $lw = $pdf->GetStringWidth($word . ' ');
                                 $newtext .= "\n$word";
                                 if ($addspace != 0) {
                                     $newtext .= ' ';

app/Report/ReportPdfText.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
@@ -125,7 +125,7 @@ 
         if ($this->wrapWidthRemaining > 0) {
             // Check with line counter too!
             // but floor the $wrapWidthRemaining first to keep it bugfree!
-            $wrapWidthRemaining = (int)($this->wrapWidthRemaining);
+            $wrapWidthRemaining = (int) ($this->wrapWidthRemaining);
             if ($lw >= $wrapWidthRemaining || $lfct > 1) {
                 $newtext = '';
                 $lines   = explode("\n", $this->text);
@@ -147,7 +147,7 @@ 
                                     $newtext .= ' ';
                                 }
                             } else {
-                                $lw      = $pdf->GetStringWidth($word . ' ');
+                                $lw = $pdf->GetStringWidth($word . ' ');
                                 $newtext .= "\n$word";
                                 if ($addspace != 0) {
                                     $newtext .= ' ';