fisharebest / webtrees

resources/views/admin/map-import-form.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 				</div>
 				<select id="serverfile" name="serverfile" class="form-control">
                     <option selected value=""></option>
-                    <?php foreach($files as $file): ?>
+                    <?php foreach ($files as $file): ?>
                         <option value="<?= e($file) ?>">
                             <?= e($file) ?>
                         </option>

resources/views/admin/locations.php

Spacing +2 added lines, -4 removed lines

@@ -32,12 +32,10 @@
                 </a>
             </th>
 			<td>
-				<?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
+				<?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
 			</td>
 			<td>
-				<?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
+				<?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
 			</td>
 			<td>
 				<?= $place->pl_long === null ? FontAwesome::decorativeIcon('warning') : $place->pl_zoom ?>

app/Bootstrap4.php

Spacing +3 added lines, -3 removed lines

@@ -100,7 +100,7 @@ 
                     'type'    => 'radio',
                     'name'    => $name,
                     'value'   => $value,
-                    'checked' => (string)$value === (string)$selected,
+                    'checked' => (string) $value === (string) $selected,
                 ] + $attributes);
 
             $html .=
@@ -129,7 +129,7 @@ 
         foreach ($options as $value => $option) {
             $option_attributes = self::attributes([
                 'value'    => $value,
-                'selected' => (string)$value === (string)$selected,
+                'selected' => (string) $value === (string) $selected,
             ]);
 
             $html .= '<option ' . $option_attributes . '>' . e($option) . '</option>';
@@ -161,7 +161,7 @@ 
         foreach ($options as $value => $option) {
             $option_attributes = self::attributes([
                 'value'    => $value,
-                'selected' => in_array((string)$value, $selected),
+                'selected' => in_array((string) $value, $selected),
             ]);
 
             $html .= '<option ' . $option_attributes . '>' . e($option) . '</option>';

resources/views/admin/trees.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 				</div>
 				<div id="card-tree-content-<?= $managed_tree->getTreeId() ?>" class="collapse<?= $managed_tree == $tree || $managed_tree->getPreference('imported') === '0' ? ' show' : '' ?>" role="tabpanel" aria-labelledby="panel-tree-header-<?= $managed_tree->getTreeId() ?>">
 					<div class="card-body">
-						<?php $importing = Database::prepare("SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1" )->execute([$managed_tree->getTreeId()])->fetchOne() ?>
+						<?php $importing = Database::prepare("SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1")->execute([$managed_tree->getTreeId()])->fetchOne() ?>
 						<?php if ($importing): ?>
 							<div id="import<?= $managed_tree->getTreeId() ?>" class="col-xs-12">
 								<div class="progress">

app/Functions/FunctionsRtl.php

Spacing +12 added lines, -12 removed lines

@@ -292,7 +292,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;
@@ -300,13 +300,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) === ' ') {
                                     // Spaces following this left parenthesis inherit the following directionality too
                                     self::$waitingText .= ' ';
-                                    $workingText       = substr($workingText, 6);
+                                    $workingText = substr($workingText, 6);
                                     continue;
                                 }
                                 break;
@@ -323,9 +323,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
@@ -456,7 +456,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);
@@ -591,11 +591,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;
     }
 
     /**
@@ -648,7 +648,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, ':');
@@ -1140,7 +1140,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);
@@ -1154,7 +1154,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, ' ');
@@ -1168,7 +1168,7 @@ 
                     }
                 } else {
                     // Split at space;
-                    $out    .= substr($string, 0, $spacepos) . $sep;
+                    $out .= substr($string, 0, $spacepos) . $sep;
                     $string = substr($string, $spacepos + 1);
                 }
             }

app/Http/Controllers/AccountController.php

Spacing +11 added lines, -11 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function edit(Tree $tree, User $user): Response
     {
-        $allow_user_themes    = (bool)Site::getPreference('ALLOW_USER_THEMES');
+        $allow_user_themes    = (bool) Site::getPreference('ALLOW_USER_THEMES');
         $my_individual_record = Individual::getInstance($tree->getUserPreference(Auth::user(), 'gedcomid'), $tree);
         $contact_methods      = FunctionsEdit::optionsContactMethods();
         $default_individual   = Individual::getInstance($tree->getUserPreference(Auth::user(), 'rootid'), $tree);
@@ -82,16 +82,16 @@ 
      */
     public function update(Request $request, Tree $tree, User $user): RedirectResponse
     {
-        $contact_method = (string)$request->get('contact_method');
-        $email          = (string)$request->get('email');
-        $language       = (string)$request->get('language');
-        $real_name      = (string)$request->get('real_name');
-        $password       = (string)$request->get('password');
-        $rootid         = (string)$request->get('root_id');
-        $theme          = (string)$request->get('theme');
-        $time_zone      = (string)$request->get('timezone');
-        $user_name      = (string)$request->get('user_name');
-        $visible_online = (string)$request->get('visible_online');
+        $contact_method = (string) $request->get('contact_method');
+        $email          = (string) $request->get('email');
+        $language       = (string) $request->get('language');
+        $real_name      = (string) $request->get('real_name');
+        $password       = (string) $request->get('password');
+        $rootid         = (string) $request->get('root_id');
+        $theme          = (string) $request->get('theme');
+        $time_zone      = (string) $request->get('timezone');
+        $user_name      = (string) $request->get('user_name');
+        $visible_online = (string) $request->get('visible_online');
 
         // Change the password
         if ($password !== '') {

app/Http/Controllers/EditGedcomRecordController.php

Spacing +4 added lines, -4 removed lines

@@ -290,8 +290,8 @@ 
     public function editRawRecordAction(Request $request, Tree $tree): Response
     {
         $xref     = $request->get('xref');
-        $facts    = (array)$request->get('fact');
-        $fact_ids = (array)$request->get('fact_id');
+        $facts    = (array) $request->get('fact');
+        $fact_ids = (array) $request->get('fact_id');
         $record   = GedcomRecord::getInstance($xref, $tree);
 
         $this->checkRecordAccess($record, true);
@@ -395,7 +395,7 @@ 
         $record = GedcomRecord::getInstance($xref, $tree);
         $this->checkRecordAccess($record, true);
 
-        $keep_chan = (bool)$request->get('keep_chan');
+        $keep_chan = (bool) $request->get('keep_chan');
 
         $this->glevels = $request->get('glevels', []);
         $this->tag     = $request->get('tag', []);
@@ -414,7 +414,7 @@ 
 
         $newged = '';
         if (!empty($_POST['NAME'])) {
-            $newged     .= "\n1 NAME " . $_POST['NAME'];
+            $newged .= "\n1 NAME " . $_POST['NAME'];
             $name_facts = [
                 'TYPE',
                 'NPFX',

app/Http/Controllers/AutocompleteController.php

Spacing +10 added lines, -10 removed lines

@@ -84,7 +84,7 @@ 
         $pages = [];
 
         // Escape the query for MySQL and PHP, converting spaces to wildcards.
-        $like_query  = strtr($query, [
+        $like_query = strtr($query, [
             '_' => '\\_',
             '%' => '\\%',
             ' ' => '%',
@@ -206,7 +206,7 @@ 
      */
     public function select2Family(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::familySearch($tree, $page, $query));
@@ -220,7 +220,7 @@ 
     public function select2Flag(Request $request): JsonResponse
     {
         $page  = $request->get('page');
-        $query = (int)$request->get('q');
+        $query = (int) $request->get('q');
 
         return new JsonResponse(Select2::flagSearch($page, $query));
     }
@@ -233,7 +233,7 @@ 
      */
     public function select2Individual(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::individualSearch($tree, $page, $query));
@@ -247,7 +247,7 @@ 
      */
     public function select2MediaObject(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::mediaObjectSearch($tree, $page, $query));
@@ -261,7 +261,7 @@ 
      */
     public function select2Note(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::noteSearch($tree, $page, $query));
@@ -275,7 +275,7 @@ 
      */
     public function select2Place(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::placeSearch($tree, $page, $query, true));
@@ -289,7 +289,7 @@ 
      */
     public function select2Repository(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::repositorySearch($tree, $page, $query));
@@ -303,7 +303,7 @@ 
      */
     public function select2Source(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::sourceSearch($tree, $page, $query));
@@ -317,7 +317,7 @@ 
      */
     public function select2Submitter(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::submitterSearch($tree, $page, $query));

app/Http/Controllers/PendingChangesController.php

Spacing +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
     {
         $url       = $request->get('url', '');
         $xref      = $request->get('xref', '');
-        $change_id = (int)$request->get('change_id');
+        $change_id = (int) $request->get('change_id');
 
         $changes = Database::prepare(
             "SELECT change_id, xref, old_gedcom, new_gedcom" .
@@ -204,7 +204,7 @@ 
     {
         $url       = $request->get('url', '');
         $xref      = $request->get('xref', '');
-        $change_id = (int)$request->get('change_id');
+        $change_id = (int) $request->get('change_id');
 
         // Reject a change, and subsequent changes to the same record
         Database::prepare(