fisharebest / webtrees

app/Http/Controllers/HourglassChartController.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
 		$maximum_generations = (int) $tree->getPreference('MAX_DESCENDANCY_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
 		$default_generations = (int) $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
 
-		$generations  = (int) $request->get('generations', $default_generations);
+		$generations = (int) $request->get('generations', $default_generations);
 
 		$generations = min($generations, $maximum_generations);
 		$generations = max($generations, self::MINIMUM_GENERATIONS);
@@ -220,7 +220,7 @@ 
 				echo '<table cellspacing="0" cellpadding="0" border="0" style="position: relative; top: auto; float: ' . $tablealign . ';">';
 				for ($i = 0; $i < $ct; $i++) {
 					$individual2 = $children[$i];
-					$chil    = $individual2->getXref();
+					$chil = $individual2->getXref();
 					echo '<tr>';
 					echo '<td id="td_', e($chil), '" class="', I18N::direction(), '" style="text-align:', $otablealign, '">';
 					$this->printDescendency($individual2, $generation + 1, $generations, $show_spouse, false);

app/Http/Controllers/HelpTextController.php

Spacing +6 added lines, -6 removed lines

@@ -116,18 +116,18 @@
 		];
 
 		const DMY_SHORTCUTS = [
-			'11 DEC 1913' => ['11/12/1913', '11-12-1913', '11.12.1913',],
-			'01 FEB 2003' => ['01/02/03', '01-02-03', '01.02.03',],
+			'11 DEC 1913' => ['11/12/1913', '11-12-1913', '11.12.1913', ],
+			'01 FEB 2003' => ['01/02/03', '01-02-03', '01.02.03', ],
 		];
 
 		const MDY_SHORTCUTS = [
-			'11 DEC 1913' => ['12/11/1913', '12-11-1913', '12.11.1913',],
-			'01 FEB 2003' => ['02/01/03', '02-01-03', '02.01.03',],
+			'11 DEC 1913' => ['12/11/1913', '12-11-1913', '12.11.1913', ],
+			'01 FEB 2003' => ['02/01/03', '02-01-03', '02.01.03', ],
 		];
 
 		const YMD_SHORTCUTS = [
-			'11 DEC 1913' => ['11/12/1913', '11-12-1913', '11.12.1913',],
-			'01 FEB 2003' => ['03/02/01', '03-02-01', '03.02.01',],
+			'11 DEC 1913' => ['11/12/1913', '11-12-1913', '11.12.1913', ],
+			'01 FEB 2003' => ['03/02/01', '03-02-01', '03.02.01', ],
 		];
 
 		/**

app/Http/Controllers/RelationshipsChartController.php

Spacing +4 added lines, -4 removed lines

@@ -105,7 +105,7 @@ 
 		$recursion = (int) $request->get('recursion', '0');
 		$ancestors = (bool) $request->get('ancestors', '0');
 
-		$max_recursion  = (int) $tree->getPreference('RELATIONSHIP_RECURSION', RelationshipsChartModule::DEFAULT_RECURSION);
+		$max_recursion = (int) $tree->getPreference('RELATIONSHIP_RECURSION', RelationshipsChartModule::DEFAULT_RECURSION);
 
 		$recursion = min($recursion, $max_recursion);
 
@@ -153,14 +153,14 @@ 
 							case 'sis':
 							case 'sib':
 								$table[$x + 1][$y] = '<div style="background:url(' . Theme::theme()->parameter('image-hline') . ') repeat-x center;  width: 94px; text-align: center"><div class="hline-text" style="height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px;">' . FontAwesome::decorativeIcon('arrow-end') . '</div></div>';
-								$x                 += 2;
+								$x += 2;
 								break;
 							case 'son':
 							case 'dau':
 							case 'chi':
 								if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) {
 									$table[$x + 1][$y - 1] = '<div style="background:url(' . $diagonal2 . '); width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: end;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: start;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>';
-									$x                     += 2;
+									$x += 2;
 								} else {
 									$table[$x][$y - 1] = '<div style="background:url(' . Theme::theme()
 											->parameter('image-vline') . ') repeat-y center; height: 64px; text-align: center;"><div class="vline-text" style="display: inline-block; width:50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>';
@@ -172,7 +172,7 @@ 
 							case 'par':
 								if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) {
 									$table[$x + 1][$y + 1] = '<div style="background:url(' . $diagonal1 . '); background-position: top right; width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: start;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: end;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>';
-									$x                     += 2;
+									$x += 2;
 								} else {
 									$table[$x][$y + 1] = '<div style="background:url(' . Theme::theme()
 											->parameter('image-vline') . ') repeat-y center; height: 64px; text-align:center; "><div class="vline-text" style="display: inline-block; width: 50%; line-height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . FontAwesome::decorativeIcon('arrow-up') . '</div></div>';

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-places.php

Indentation +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 </div>
 <form method="POST"
 	  action="<?=e(route('admin-module',
-		  ['module' => $module, 'action' => 'AdminPlaces', 'parent_id' => $parent_id])) ?>">
+			['module' => $module, 'action' => 'AdminPlaces', 'parent_id' => $parent_id])) ?>">
 
 	<?= csrf_field() ?>
 	<?= Bootstrap4::checkbox(
@@ -54,12 +54,12 @@ 
 		<tr>
             <td>
                 <a href="<?= e(route('admin-module',
-					   ['module' => $module,
-					    'action' => 'AdminPlaces',
-					    'parent_id' => $place->pl_id,
-					    'inactive' => $inactive]
-				   )
-				   ) ?>">
+						 ['module' => $module,
+							'action' => 'AdminPlaces',
+							'parent_id' => $place->pl_id,
+							'inactive' => $inactive]
+					 )
+					 ) ?>">
 					<?= e($place->pl_place) ?>
                     <span class="badge badge-pill badge-<?= $place->badge ?>">
 				        <?= I18N::number($place->child_count) ?>
@@ -68,11 +68,11 @@ 
             </td>
 			<td>
 				<?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
+										strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
 			</td>
 			<td>
 				<?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
+										strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
 			</td>
 			<td>
 				<?= $place->pl_long === null ? FontAwesome::decorativeIcon('warning') : $place->pl_zoom ?>

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,
 				];