fisharebest / webtrees

app/Http/Controllers/BranchesController.php

Spacing +7 added lines, -7 removed lines

@@ -43,8 +43,8 @@ 
     public function page(Request $request): Response
     {
         $surname     = $request->get('surname', '');
-        $soundex_std = (bool)$request->get('soundex_std');
-        $soundex_dm  = (bool)$request->get('soundex_dm');
+        $soundex_std = (bool) $request->get('soundex_std');
+        $soundex_dm  = (bool) $request->get('soundex_dm');
 
         if ($surname !== '') {
             /* I18N: %s is a surname */
@@ -71,8 +71,8 @@ 
      */
     public function list(Request $request, Tree $tree, User $user): Response
     {
-        $soundex_dm  = (bool)$request->get('soundex_dm');
-        $soundex_std = (bool)$request->get('soundex_std');
+        $soundex_dm  = (bool) $request->get('soundex_dm');
+        $soundex_std = (bool) $request->get('soundex_std');
         $surname     = $request->get('surname', '');
 
         // Highlight direct-line ancestors of this individual.
@@ -160,7 +160,7 @@ 
             $sdx = Soundex::russell($surname);
             if ($sdx !== '') {
                 foreach (explode(':', $sdx) as $value) {
-                    $sql    .= " OR n_soundex_surn_std LIKE CONCAT('%', ?, '%')";
+                    $sql .= " OR n_soundex_surn_std LIKE CONCAT('%', ?, '%')";
                     $args[] = $value;
                 }
             }
@@ -170,7 +170,7 @@ 
             $sdx = Soundex::daitchMokotoff($surname);
             if ($sdx !== '') {
                 foreach (explode(':', $sdx) as $value) {
-                    $sql    .= " OR n_soundex_surn_dm LIKE CONCAT('%', ?, '%')";
+                    $sql .= " OR n_soundex_surn_dm LIKE CONCAT('%', ?, '%')";
                     $args[] = $value;
                 }
             }
@@ -340,7 +340,7 @@ 
      */
     private static function sosaGeneration($sosa)
     {
-        $generation = (int)log($sosa, 2) + 1;
+        $generation = (int) log($sosa, 2) + 1;
 
         return '<sup title="' . I18N::translate('Generation') . '">' . $generation . '</sup>';
     }

app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php

Spacing +1 added lines, -1 removed lines

@@ -175,7 +175,7 @@
             'words'     => I18N::translate('Match the exact text, unless it occurs in the middle of a word.'),
             'wildcards' => I18N::translate('Use a “?” to match a single character, use “*” to match zero or more characters.'),
             /* I18N: http://en.wikipedia.org/wiki/Regular_expression */
-            'regex'     => I18N::translate('Regular expressions are an advanced pattern matching technique.') . '<br>' .  I18N::translate('See %s for more information.', '<a href="http://php.net/manual/regexp.reference.php">php.net/manual/regexp.reference.php</a>'),
+            'regex'     => I18N::translate('Regular expressions are an advanced pattern matching technique.') . '<br>' . I18N::translate('See %s for more information.', '<a href="http://php.net/manual/regexp.reference.php">php.net/manual/regexp.reference.php</a>'),
         ];
 
         return

app/Http/Controllers/LifespansChartController.php

Spacing +8 added lines, -8 removed lines

@@ -52,9 +52,9 @@ 
     {
         $this->checkModuleIsActive($tree, 'lifespans_chart');
 
-        $xrefs     = (array)$request->get('xrefs', []);
+        $xrefs     = (array) $request->get('xrefs', []);
         $addxref   = $request->get('addxref', '');
-        $addfam    = (bool)$request->get('addfam', false);
+        $addfam    = (bool) $request->get('addfam', false);
         $placename = $request->get('placename', '');
         $start     = $request->get('start', '');
         $end       = $request->get('end', '');
@@ -111,7 +111,7 @@ 
     {
         $this->checkModuleIsActive($tree, 'lifespans_chart');
 
-        $xrefs = (array)$request->get('xrefs', []);
+        $xrefs = (array) $request->get('xrefs', []);
         $xrefs = array_unique($xrefs);
 
         /** @var Individual[] $individuals */
@@ -131,8 +131,8 @@ 
         $subtitle = $request->get('subtitle');
 
         // Round to whole decades
-        $start_year = (int)floor($this->minYear($individuals) / 10) * 10;
-        $end_year   = (int)ceil($this->maxYear($individuals) / 10) * 10;
+        $start_year = (int) floor($this->minYear($individuals) / 10) * 10;
+        $end_year   = (int) ceil($this->maxYear($individuals) / 10) * 10;
 
         $lifespans = $this->layoutIndividuals($individuals);
 
@@ -167,7 +167,7 @@ 
             'U' => new ColorGenerator(120, self::SATURATION, self::LIGHTNESS, self::ALPHA, self::RANGE),
         ];
 
-        $current_year = (int)date('Y');
+        $current_year = (int) date('Y');
 
         // Latest year used in each row
         $rows = [];
@@ -196,7 +196,7 @@ 
             // Fill the row up to the year (leaving a small gap)
             $rows[$next_row] = $death_year;
 
-            $lifespans[] = (object)[
+            $lifespans[] = (object) [
                 'background' => $colors[$individual->getSex()]->getNextColor(),
                 'birth_year' => $birth_year,
                 'death_year' => $death_year,
@@ -225,7 +225,7 @@ 
         $year = $this->jdToYear($jd);
 
         // Don't show future dates
-        return min($year, (int)date('Y'));
+        return min($year, (int) date('Y'));
     }
 
     /**

app/Http/Controllers/Auth/RegisterController.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
             ->setPreference('sessiontime', '0');
 
         // Create a dummy user, so we can send messages from the tree.
-        $sender = new User((object)[
+        $sender = new User((object) [
             'user_id'   => null,
             'user_name' => '',
             'real_name' => $tree->getTitle(),
@@ -137,7 +137,7 @@ 
         );
 
         // Tell the genealogy contact about the registration.
-        $webmaster = User::find((int)$tree->getPreference('WEBMASTER_USER_ID'));
+        $webmaster = User::find((int) $tree->getPreference('WEBMASTER_USER_ID'));
 
         if ($webmaster !== null) {
             I18N::init($webmaster->getPreference('language'));

app/Census/CensusColumnAge.php

Spacing +1 added lines, -1 removed lines

@@ -34,6 +34,6 @@
      */
     public function generate(Individual $individual, Individual $head)
     {
-        return (string)Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
+        return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
     }
 }

app/Theme/AbstractTheme.php

Spacing +3 added lines, -3 removed lines

@@ -214,7 +214,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) : '-',
             ];
@@ -276,7 +276,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>';
@@ -1803,7 +1803,7 @@ 
     public function menuSearchPhonetic()
     {
         /* 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/Individual.php

Spacing +8 added lines, -8 removed lines

@@ -123,7 +123,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) {
@@ -134,7 +134,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) {
@@ -150,7 +150,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);
@@ -322,7 +322,7 @@ 
      */
     public function isDead()
     {
-        $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)) {
@@ -711,7 +711,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
@@ -738,7 +738,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
@@ -1106,7 +1106,7 @@ 
         if ($display) {
             $txt .= ' style="display:' . $display . '"';
         }
-        $txt  .= '>';
+        $txt .= '>';
         $husb = $fam->getHusband();
         if ($husb) {
             // Temporarily reset the 'prefered' display name, as we always
@@ -1173,7 +1173,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/Module/PedigreeMapModule.php

Spacing +10 added lines, -10 removed lines

@@ -35,7 +35,7 @@ 
  */
 class PedigreeMapModule extends AbstractModule implements ModuleChartInterface
 {
-    const LINE_COLORS  = [
+    const LINE_COLORS = [
         '#FF0000',
         // Red
         '#00FF00',
@@ -140,7 +140,7 @@ 
                     $color            = self::LINE_COLORS[log($id, 2) % $color_count];
                     $icon['color']    = $color; //make icon color the same as the line
                     $sosa_points[$id] = $event->getLatLonJSArray();
-                    $sosa_parent      = (int)floor($id / 2);
+                    $sosa_parent      = (int) floor($id / 2);
                     if (array_key_exists($sosa_parent, $sosa_points)) {
                         // Would like to use a GeometryCollection to hold LineStrings
                         // rather than generate polylines but the MarkerCluster library
@@ -168,7 +168,7 @@ 
                             'icon'     => $icon,
                             'tooltip'  => $event->toolTip(),
                             'summary'  => view('modules/pedigree-map/event-sidebar', $event->shortSummary('pedigree', $id)),
-                            'zoom'     => (int)$event->getZoom(),
+                            'zoom'     => (int) $event->getZoom(),
                         ],
                     ];
                 }
@@ -188,7 +188,7 @@ 
     {
         $xref        = $request->get('reference');
         $individual  = Individual::getInstance($xref, $tree);
-        $generations = (int)$request->get(
+        $generations = (int) $request->get(
             'generations',
             $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS')
         );
@@ -241,14 +241,14 @@ 
                         function ($item) {
                             return preg_replace('/[^a-z\d]/i', '', strtolower($item));
                         },
-                        (array)$provider->styles
+                        (array) $provider->styles
                     );
 
-                    $key = preg_replace('/[^a-z\d]/i', '', strtolower((string)$provider->name));
+                    $key = preg_replace('/[^a-z\d]/i', '', strtolower((string) $provider->name));
 
                     self::$map_providers[$key] = [
-                        'name'   => (string)$provider->name,
-                        'styles' => array_combine($style_keys, (array)$provider->styles),
+                        'name'   => (string) $provider->name,
+                        'styles' => array_combine($style_keys, (array) $provider->styles),
                     ];
                 }
             } catch (Exception $ex) {
@@ -257,7 +257,7 @@ 
                     'provider' => 'openstreetmap',
                     'style'    => 'mapnik',
                 ];
-                self::$map_providers  = [
+                self::$map_providers = [
                     'openstreetmap' => [
                         'name'   => 'OpenStreetMap',
                         'styles' => ['mapnik' => 'Mapnik'],
@@ -318,7 +318,7 @@ 
             throw new IndividualAccessDeniedException();
         }
         
-        return (object)[
+        return (object) [
             'name' => 'modules/pedigree-map/pedigree-map-page',
             'data' => [
                 'module'         => $this->getName(),

app/Database.php

Spacing +3 added lines, -4 removed lines

@@ -88,8 +88,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.
@@ -222,7 +221,7 @@ 
     public static function updateSchema($namespace, $schema_name, $target_version)
     {
         try {
-            $current_version = (int)Site::getPreference($schema_name);
+            $current_version = (int) Site::getPreference($schema_name);
         } catch (PDOException $ex) {
             DebugBar::addThrowable($ex);
 
@@ -239,7 +238,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;
         }