fisharebest / webtrees

app/FactLocation.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Fisharebest\Webtrees;
 

resources/views/modules/openstreetmap/event-sidebar.php

Spacing +2 added lines, -2 removed lines

@@ -9,14 +9,14 @@
     </a>
 <?php endif ?>
 
-<?php if($value): ?>
+<?php if ($value): ?>
     <span>
         <?= $value ?>
     </span>
 <?php endif ?>
 
 <div>
-    <?php if($addtag): ?>
+    <?php if ($addtag): ?>
         <?= GedcomTag::getLabel('BIRT') ?>:
     <?php endif ?>
     <?= $date ?>

resources/views/modules/openstreetmap/admin-import-form.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 
 <h3><?= $title ?></h3>
 <form id="upload_form" method="post" enctype="multipart/form-data" action="<?=
-    e(route('admin-module',[
+    e(route('admin-module', [
         'module' => $module,
         'action' => 'AdminImport',
     ])) ?>">
@@ -29,7 +29,7 @@ 
 				</div>
 				<select id="serverfile" name="serverfile" class="form-control">
                     <option class='custom-select' selected disabled value=''><?= I18N::translate('choose a file&hellip;') ?></option>
-                    <?php foreach($files as $file): ?>
+                    <?php foreach ($files as $file): ?>
                         <option value="<?= e($file) ?>"><?= $file ?></option>
                     <?php endforeach ?>
 				</select>

resources/views/modules/openstreetmap/admin-places.php

Spacing +3 added lines, -5 removed lines

@@ -67,12 +67,10 @@ 
                 </a>
             </td>
 			<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 ?>
@@ -194,7 +192,7 @@ 
 	</tfoot>
 </table>
 
-<form method="POST" action="<?= e(route('admin-module',[
+<form method="POST" action="<?= e(route('admin-module', [
 		'module' => $module,
 		'action' => 'AdminImportPlaces'
 	])) ?>">

resources/views/media-page.php

Spacing +2 added lines, -2 removed lines

@@ -10,13 +10,13 @@
 
 <?php if ($media->isPendingDeletion()): ?>
 	<?php if (Auth::isModerator($media->getTree())): ?>
-		<?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This media object has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
+		<?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This media object has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
 	<?php elseif (Auth::isEditor($media->getTree())): ?>
 		<?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This media object has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
 	<?php endif ?>
 <?php elseif ($media->isPendingAddition()): ?>
 	<?php if (Auth::isModerator($media->getTree())): ?>
-		<?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This media object has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>' ) . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
+		<?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This media object has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
 	<?php elseif (Auth::isEditor($media->getTree())): ?>
 		<?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This media object has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
 	<?php endif ?>

app/Location.php

Spacing +6 added lines, -8 removed lines

@@ -13,7 +13,7 @@ 
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Fisharebest\Webtrees;
 
@@ -30,14 +30,14 @@ 
 	 * @param array $record
 	 * @throws \Exception
 	 */
-	public function __construct($gedcomName, $record=[]) {
+	public function __construct($gedcomName, $record = []) {
 		$tmp = $this->getRecordFromName($gedcomName);
 		if ($tmp !== null) {
 			$this->record = $tmp;
 		} elseif (!empty($record)) {
-			$this->record = (object)$record;
+			$this->record = (object) $record;
 		} else {
-			$this->record = (object)[
+			$this->record = (object) [
 				'fqpn'         => '',
 				'pl_id'        => 0,
 				'pl_parent_id' => 0,
@@ -67,8 +67,7 @@ 
 		switch ($format) {
 			case 'signed':
 				return $this->record->pl_lati ?
-					(float)strtr($this->record->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) :
-					$this->record->pl_lati;
+					(float) strtr($this->record->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) : $this->record->pl_lati;
 			default:
 				return $this->record->pl_lati;
 		}
@@ -83,8 +82,7 @@ 
 		switch ($format) {
 			case 'signed':
 				return $this->record->pl_long ?
-					(float)strtr($this->record->pl_long, ['E' => '', 'W' => '-', ',' => '.']) :
-					$this->record->pl_long;
+					(float) strtr($this->record->pl_long, ['E' => '', 'W' => '-', ',' => '.']) : $this->record->pl_long;
 			default:
 				return $this->record->pl_long;
 		}

app/Http/Controllers/PlaceHierarchyController.php

Spacing +7 added lines, -7 removed lines

@@ -50,14 +50,14 @@ 
 		$osm_module = Module::getModuleByName(self::MAP_MODULE);
 		$method     = 'assets';
 		$showmap    = $osm_module &&
-			(bool)$osm_module->getPreference('place_hierarchy') &&
+			(bool) $osm_module->getPreference('place_hierarchy') &&
 			method_exists($osm_module, $method) &&
 			strpos($action, 'hierarchy') === 0;
 		$data       = null;
 		$note       = false;
 
 		if ($showmap) {
-			$note    = true;
+			$note = true;
 			$content .= view('modules/openstreetmap/map',
 				[
 					'assets' => $osm_module->$method(),
@@ -70,14 +70,14 @@ 
 
 		switch ($action) {
 			case 'list':
-				$nextaction      = ['hierarchy' => I18N::translate('Show place hierarchy')];
-				$content         .= view('place-list', $this->getList($tree));
+				$nextaction = ['hierarchy' => I18N::translate('Show place hierarchy')];
+				$content .= view('place-list', $this->getList($tree));
 				break;
 			case 'hierarchy':
 			case 'hierarchy-e':
 				$nextaction      = ['list' => I18N::translate('Show all places in a list')];
 				$data            = $this->getHierarchy($tree, $place, $parent);
-				$content         .= (null === $data || $showmap) ? '' : view('place-hierarchy', $data);
+				$content .= (null === $data || $showmap) ? '' : view('place-hierarchy', $data);
 				if (null === $data || $action === 'hierarchy-e') {
 					$content .= view('place-events', $this->getEvents($tree, $place));
 				}
@@ -117,7 +117,7 @@ 
 
 		return
 			[
-				'columns' => array_chunk($list_places, (int)ceil($numfound / $divisor)),
+				'columns' => array_chunk($list_places, (int) ceil($numfound / $divisor)),
 			];
 	}
 
@@ -139,7 +139,7 @@ 
 				[
 					'tree'      => $tree,
 					'col_class' => "w-" . ($divisor === 2 ? "25" : "50"),
-					'columns'   => array_chunk($child_places, (int)ceil($numfound / $divisor)),
+					'columns'   => array_chunk($child_places, (int) ceil($numfound / $divisor)),
 					'place'     => $place,
 					'parent'    => $parent,
 				];

app/Http/Controllers/FamilyBookChartController.php

Spacing +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 				echo '<table cellspacing="0" cellpadding="0" border="0" >';
 				foreach ($children as $i => $child) {
 					echo '<tr><td>';
-					$kids    = $this->printDescendency($child, $generation + 1);
+					$kids = $this->printDescendency($child, $generation + 1);
 					$numkids += $kids;
 					echo '</td>';
 					// Print the lines

resources/views/admin/trees.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,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">