CodeStyle

24 files changed, 80 insertions, 82 deletions

diff --git a/app/Census/CensusColumnConditionUs.php b/app/Census/CensusColumnConditionUs.php
index 3bfb7dacc2..e2d6c41400 100644
--- a/app/Census/CensusColumnConditionUs.php
+++ b/app/Census/CensusColumnConditionUs.php
@@ -28,7 +28,7 @@ class CensusColumnConditionUs extends CensusColumnConditionEnglish {
 	protected $spinster = 'S';
 
 	/* Text to display for children */
-	protected $boy = 'S';
+	protected $boy  = 'S';
 	protected $girl = 'S';
 
 	/* Text to display for divorced individuals */
diff --git a/app/Census/CensusOfEngland.php b/app/Census/CensusOfEngland.php
index 76ace55157..11a401f680 100644
--- a/app/Census/CensusOfEngland.php
+++ b/app/Census/CensusOfEngland.php
@@ -34,7 +34,7 @@ class CensusOfEngland extends Census implements CensusPlaceInterface {
 			new CensusOfEngland1891(),
 			new CensusOfEngland1901(),
 			new CensusOfEngland1911(),
-			new RegisterOfEngland1939()
+			new RegisterOfEngland1939(),
 		);
 	}
 
diff --git a/app/Census/CensusOfWales.php b/app/Census/CensusOfWales.php
index 0d38a817a9..90aa4cb7bb 100644
--- a/app/Census/CensusOfWales.php
+++ b/app/Census/CensusOfWales.php
@@ -34,7 +34,7 @@ class CensusOfWales extends Census implements CensusPlaceInterface {
 			new CensusOfWales1891(),
 			new CensusOfWales1901(),
 			new CensusOfWales1911(),
-			new RegisterOfWales1939()
+			new RegisterOfWales1939(),
 		);
 	}
 
diff --git a/app/Census/RegisterOfEngland1939.php b/app/Census/RegisterOfEngland1939.php
index 260a3dd6cd..578c993f13 100644
--- a/app/Census/RegisterOfEngland1939.php
+++ b/app/Census/RegisterOfEngland1939.php
@@ -42,7 +42,7 @@ class RegisterOfEngland1939 extends CensusOfEngland implements CensusInterface {
 			new CensusColumnSexMF($this, 'Sex', 'Male or Female'),
 			new CensusColumnBirthDayMonthSlashYear($this, 'DOB', 'Date of birth'),
 			new CensusColumnConditionEnglish($this, 'MC', 'Marital Condition - Married, Single, Unmarried, Widowed or Divorced'),
-			new CensusColumnOccupation($this, 'Occupation', 'Occupation')
+			new CensusColumnOccupation($this, 'Occupation', 'Occupation'),
 		);
 	}
 }
diff --git a/app/Census/RegisterOfWales1939.php b/app/Census/RegisterOfWales1939.php
index 0e15a9be18..8152ec78f7 100644
--- a/app/Census/RegisterOfWales1939.php
+++ b/app/Census/RegisterOfWales1939.php
@@ -42,7 +42,7 @@ class RegisterOfWales1939 extends CensusOfWales implements CensusInterface {
 			new CensusColumnSexMF($this, 'Sex', 'Male or Female'),
 			new CensusColumnBirthDayMonthSlashYear($this, 'DOB', 'Date of birth'),
 			new CensusColumnConditionEnglish($this, 'MC', 'Marital Condition - Married, Single, Unmarried, Widowed or Divorced'),
-			new CensusColumnOccupation($this, 'Occupation', 'Occupation')
+			new CensusColumnOccupation($this, 'Occupation', 'Occupation'),
 		);
 	}
 }
diff --git a/app/Database.php b/app/Database.php
index 18ffd55cb0..d5383a0b84 100644
--- a/app/Database.php
+++ b/app/Database.php
@@ -284,9 +284,9 @@ class Database {
 	 * @param string $schema_name    Where to find our MigrationXXX classes
 	 * @param int    $target_version updade/downgrade to this version
 	 *
-	 * @return bool  Were any updates applied
-	 *
 	 * @throws PDOException
+ *
+	 * @return bool  Were any updates applied
 	 */
 	public static function updateSchema($namespace, $schema_name, $target_version) {
 		try {
diff --git a/app/Functions/FunctionsImport.php b/app/Functions/FunctionsImport.php
index b2741c0573..0b492131b3 100644
--- a/app/Functions/FunctionsImport.php
+++ b/app/Functions/FunctionsImport.php
@@ -56,7 +56,7 @@ class FunctionsImport {
 		$newrec = '';
 		foreach ($matches as $n => $match) {
 			list(, $level, $xref, $tag, $data) = $match;
-			$tag = strtoupper($tag); // Tags should always be upper case
+			$tag                               = strtoupper($tag); // Tags should always be upper case
 			switch ($tag) {
 				// Convert PhpGedView tags to WT
 			case '_PGVU':
@@ -188,7 +188,7 @@ class FunctionsImport {
 				// Preserve text from INT dates
 				if (strpos($data, '(') !== false) {
 					list($date, $text) = explode('(', $data, 2);
-					$text = ' (' . $text;
+					$text              = ' (' . $text;
 				} else {
 					$date = $data;
 					$text = '';
diff --git a/app/I18N.php b/app/I18N.php
index 865a6338fe..e5acbc9a02 100644
--- a/app/I18N.php
+++ b/app/I18N.php
@@ -377,7 +377,7 @@ class I18N {
 		}
 
 		$cache_dir_exists = File::mkdir(WT_DATA_DIR . 'cache');
-		$cache_file = WT_DATA_DIR . 'cache/language-' . self::$locale->languageTag() . '-cache.php';
+		$cache_file       = WT_DATA_DIR . 'cache/language-' . self::$locale->languageTag() . '-cache.php';
 		if (file_exists($cache_file)) {
 			$filemtime = filemtime($cache_file);
 		} else {
diff --git a/app/Module/AncestorsChartModule.php b/app/Module/AncestorsChartModule.php
index d0537e1fd2..ae14654867 100644
--- a/app/Module/AncestorsChartModule.php
+++ b/app/Module/AncestorsChartModule.php
@@ -52,7 +52,7 @@ class AncestorsChartModule extends AbstractModule implements ModuleChartInterfac
 	public function defaultAccessLevel() {
 		return Auth::PRIV_PRIVATE;
 	}
-	
+
 	/**
 	 * Return a menu item for this chart.
 	 *
@@ -60,13 +60,13 @@ class AncestorsChartModule extends AbstractModule implements ModuleChartInterfac
 	 */
 	public function getChartMenu(Individual $individual) {
 		return new Menu(
-			$this->getTitle(), 
-			'ancestry.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(), 
-			'menu-chart-ancestry', 
+			$this->getTitle(),
+			'ancestry.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
+			'menu-chart-ancestry',
 			array('rel' => 'nofollow')
 		);
 	}
-	
+
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
diff --git a/app/Module/CompactTreeChartModule.php b/app/Module/CompactTreeChartModule.php
index 3bfe14db1e..07146e52c9 100644
--- a/app/Module/CompactTreeChartModule.php
+++ b/app/Module/CompactTreeChartModule.php
@@ -52,7 +52,7 @@ class CompactTreeChartModule extends AbstractModule implements ModuleChartInterf
 	public function defaultAccessLevel() {
 		return Auth::PRIV_PRIVATE;
 	}
-	
+
 	/**
 	 * Return a menu item for this chart.
 	 *
@@ -60,13 +60,13 @@ class CompactTreeChartModule extends AbstractModule implements ModuleChartInterf
 	 */
 	public function getChartMenu(Individual $individual) {
 		return new Menu(
-			$this->getTitle(), 
-			'compact.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(), 
-			'menu-chart-compact', 
+			$this->getTitle(),
+			'compact.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
+			'menu-chart-compact',
 			array('rel' => 'nofollow')
 		);
 	}
-	
+
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
diff --git a/app/Module/DescendancyChartModule.php b/app/Module/DescendancyChartModule.php
index 0c6f09ff08..f074aa8886 100644
--- a/app/Module/DescendancyChartModule.php
+++ b/app/Module/DescendancyChartModule.php
@@ -52,7 +52,7 @@ class DescendancyChartModule extends AbstractModule implements ModuleChartInterf
 	public function defaultAccessLevel() {
 		return Auth::PRIV_PRIVATE;
 	}
-	
+
 	/**
 	 * Return a menu item for this chart.
 	 *
@@ -60,13 +60,13 @@ class DescendancyChartModule extends AbstractModule implements ModuleChartInterf
 	 */
 	public function getChartMenu(Individual $individual) {
 		return new Menu(
-			$this->getTitle(), 
-			'descendancy.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(), 
-			'menu-chart-descendants', 
+			$this->getTitle(),
+			'descendancy.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
+			'menu-chart-descendants',
 			array('rel' => 'nofollow')
 		);
 	}
-	
+
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
diff --git a/app/Module/FamilyBookChartModule.php b/app/Module/FamilyBookChartModule.php
index 290d3a6780..46f2d0bcb6 100644
--- a/app/Module/FamilyBookChartModule.php
+++ b/app/Module/FamilyBookChartModule.php
@@ -52,7 +52,7 @@ class FamilyBookChartModule extends AbstractModule implements ModuleChartInterfa
 	public function defaultAccessLevel() {
 		return Auth::PRIV_PRIVATE;
 	}
-	
+
 	/**
 	 * Return a menu item for this chart.
 	 *
@@ -60,13 +60,13 @@ class FamilyBookChartModule extends AbstractModule implements ModuleChartInterfa
 	 */
 	public function getChartMenu(Individual $individual) {
 		return new Menu(
-			$this->getTitle(), 
-			'familybook.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(), 
-			'menu-chart-familybook', 
+			$this->getTitle(),
+			'familybook.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
+			'menu-chart-familybook',
 			array('rel' => 'nofollow')
 		);
 	}
-	
+
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
diff --git a/app/Module/FamilyTreeStatisticsModule.php b/app/Module/FamilyTreeStatisticsModule.php
index 3e0684f5e8..b012bbc935 100644
--- a/app/Module/FamilyTreeStatisticsModule.php
+++ b/app/Module/FamilyTreeStatisticsModule.php
@@ -31,7 +31,7 @@ use Fisharebest\Webtrees\Theme;
 class FamilyTreeStatisticsModule extends AbstractModule implements ModuleBlockInterface {
 	/** Show this number of surnames by default */
 	const DEFAULT_NUMBER_OF_SURNAMES = 10;
-	
+
 	/** {@inheritdoc} */
 	public function getTitle() {
 		return /* I18N: Name of a module */ I18N::translate('Statistics');
diff --git a/app/Module/FanChartModule.php b/app/Module/FanChartModule.php
index f39d3487b7..24f2afe9aa 100644
--- a/app/Module/FanChartModule.php
+++ b/app/Module/FanChartModule.php
@@ -17,8 +17,8 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
-use Fisharebest\Webtrees\Menu;
 use Fisharebest\Webtrees\Individual;
+use Fisharebest\Webtrees\Menu;
 
 /**
  * Class FanChartModule
@@ -52,7 +52,7 @@ class FanChartModule extends AbstractModule implements ModuleChartInterface {
 	public function defaultAccessLevel() {
 		return Auth::PRIV_PRIVATE;
 	}
-	
+
 	/**
 	 * Return a menu item for this chart.
 	 * 
@@ -63,16 +63,16 @@ class FanChartModule extends AbstractModule implements ModuleChartInterface {
 	public function getChartMenu(Individual $individual) {
 		if (function_exists('imagettftext')) {
 			return new Menu(
-				$this->getTitle(), 
-				'fanchart.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(), 
-				'menu-chart-fanchart', 
+				$this->getTitle(),
+				'fanchart.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
+				'menu-chart-fanchart',
 				array('rel' => 'nofollow')
 			);
 		} else {
 			return null;
 		}
 	}
-	
+
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
diff --git a/app/Module/FrequentlyAskedQuestionsModule.php b/app/Module/FrequentlyAskedQuestionsModule.php
index e6b6c1b9b5..6d54291fdf 100644
--- a/app/Module/FrequentlyAskedQuestionsModule.php
+++ b/app/Module/FrequentlyAskedQuestionsModule.php
@@ -125,7 +125,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen
 	/**
 	 * Action from the configuration page
 	 */
-		private function edit() {
+	private function edit() {
 		global $WT_TREE;
 
 		$controller = new PageController;
diff --git a/app/Module/GoogleMapsModule.php b/app/Module/GoogleMapsModule.php
index 4de625b727..b0a5fa91bc 100644
--- a/app/Module/GoogleMapsModule.php
+++ b/app/Module/GoogleMapsModule.php
@@ -1902,9 +1902,9 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 	 * @return null|\stdClass
 	 */
 	private function getLatitudeAndLongitudeFromPlaceLocation($place) {
-		$parent   = explode(',', $place);
-		$parent   = array_reverse($parent);
-		$place_id = 0;
+		$parent     = explode(',', $place);
+		$parent     = array_reverse($parent);
+		$place_id   = 0;
 		$num_parent = count($parent);
 		for ($i = 0; $i < $num_parent; $i++) {
 			$parent[$i] = trim($parent[$i]);
@@ -1941,7 +1941,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 	 */
 	private function buildIndividualMap(Individual $indi) {
 		$GM_MAX_ZOOM = $this->getSetting('GM_MAX_ZOOM');
-		$facts = $indi->getFacts();
+		$facts       = $indi->getFacts();
 		foreach ($indi->getSpouseFamilies() as $family) {
 			$facts = array_merge($facts, $family->getFacts());
 			// Add birth of children from this family to the facts array
@@ -1986,7 +1986,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 						'sv_lati'      => '0',
 						'sv_long'      => '0',
 						'sv_zoom'      => '0',
-						'events'       => ''
+						'events'       => '',
 					);
 				}
 			} else {
@@ -2005,7 +2005,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 							'sv_lati'      => $latlongval->sv_lati,
 							'sv_long'      => $latlongval->sv_long,
 							'sv_zoom'      => $latlongval->sv_zoom,
-							'events'       => ''
+							'events'       => '',
 						);
 					}
 					$GM_MAX_ZOOM = min($GM_MAX_ZOOM, $latlongval->pl_zoom);
@@ -2027,9 +2027,9 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 				$class  = 'optionbox';
 				if ($fact->getValue() && $spouse) {
 					$evtStr = '<div class="info_event"><span class="highlt_img">' . $spouse->displayImage() . '</span><div class="sp1">' . $label . '<div>' . $fact->getValue() . '</div><div><strong>' . $name . '</strong></div>' . $fact->getDate()->display(true) . '</div></div>';
-				} else if ($spouse) {
+				} elseif ($spouse) {
 					$evtStr = '<div class="info_event"><span class="highlt_img">' . $spouse->displayImage() . '</span><div class="sp1">' . $label . '<div><strong>' . $name . '</strong></div>' . $fact->getDate()->display(true) . '</div></div>';
-				} else if ($fact->getValue()) {
+				} elseif ($fact->getValue()) {
 					$evtStr = '<div class="info_event"><span class="highlt_img">' . Theme::theme()->icon($fact) . '</span><div class="sp1">' . $label . '<div> ' . $fact->getValue() . '</div><div>' . $fact->getDate()->display(true) . '</div></div></div>';
 				} else {
 					$evtStr = '<div class="info_event"><span class="highlt_img">' . Theme::theme()->icon($fact) . '</span><div class="sp1">' . $label . '<div>' . $fact->getDate()->display(true) . '</div></div></div>';
@@ -2044,7 +2044,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 				'info'       => $fact->getValue(),
 				'name'       => $name,
 				'place'      => '<a href="' . $fact->getPlace()->getURL() . '">' . $fact->getPlace()->getFullName() . '</a>',
-				'placeid'    => $index
+				'placeid'    => $index,
 			);
 		}
 
@@ -2526,7 +2526,6 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 
 	/**
 	 * Called by placelist.php
-	 *
 	 */
 	public function createMap() {
 		global $level, $levelm, $plzoom, $WT_TREE;
@@ -2535,7 +2534,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 
 		$STREETVIEW = (bool) $this->getSetting('GM_USE_STREETVIEW');
 		$parent     = Filter::getArray('parent');
-		$levelm = $this->setLevelMap($level, $parent);
+		$levelm     = $this->setLevelMap($level, $parent);
 
 		$latlng =
 			Database::prepare("SELECT pl_place, pl_id, pl_lati, pl_long, pl_zoom, sv_long, sv_lati, sv_bearing, sv_elevation, sv_zoom FROM `##placelocation` WHERE pl_id=?")
@@ -3148,8 +3147,8 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 				Database::prepare("SELECT pl_place, pl_lati, pl_long, pl_icon, pl_parent_id, pl_level, pl_zoom FROM `##placelocation` WHERE pl_id=?")
 				->execute(array($placeid))
 				->fetchOneRow();
-			$place_name = $row->pl_place;
-			$place_icon = $row->pl_icon;
+			$place_name       = $row->pl_place;
+			$place_icon       = $row->pl_icon;
 			$selected_country = explode("/", $place_icon);
 			if (isset($selected_country[1]) && $selected_country[1] !== 'flags') {
 				$selected_country = $selected_country[1];
@@ -3210,7 +3209,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 						$parent_lati = strtr($row->pl_lati, array('N' => '', 'S' => '-', ',' => '.'));
 						$parent_long = strtr($row->pl_long, array('E' => '', 'W' => '-', ',' => '.'));
 						$zoomfactor  = min($row->pl_zoom, $GM_MAX_ZOOM);
-						$level = $row->pl_level + 1;
+						$level       = $row->pl_level + 1;
 					}
 					$parent_id = $row->pl_parent_id;
 				} while ($row->pl_parent_id != 0 && $row->pl_lati === null && $row->pl_long === null);
diff --git a/app/Module/HourglassChartModule.php b/app/Module/HourglassChartModule.php
index 440d4d1fed..c817bb5393 100644
--- a/app/Module/HourglassChartModule.php
+++ b/app/Module/HourglassChartModule.php
@@ -52,7 +52,7 @@ class HourglassChartModule extends AbstractModule implements ModuleChartInterfac
 	public function defaultAccessLevel() {
 		return Auth::PRIV_PRIVATE;
 	}
-	
+
 	/**
 	 * Return a menu item for this chart.
 	 *
@@ -60,13 +60,13 @@ class HourglassChartModule extends AbstractModule implements ModuleChartInterfac
 	 */
 	public function getChartMenu(Individual $individual) {
 		return new Menu(
-			$this->getTitle(), 
-			'hourglass.php?rootid=' . $individual->getXref() . '&amp;ged=' . $individual->getTree()->getNameUrl(), 
-			'menu-chart-hourglass', 
+			$this->getTitle(),
+			'hourglass.php?rootid=' . $individual->getXref() . '&amp;ged=' . $individual->getTree()->getNameUrl(),
+			'menu-chart-hourglass',
 			array('rel' => 'nofollow')
 		);
 	}
-	
+
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
diff --git a/app/Module/InteractiveTreeModule.php b/app/Module/InteractiveTreeModule.php
index d1d34f26ea..0bb9edd394 100644
--- a/app/Module/InteractiveTreeModule.php
+++ b/app/Module/InteractiveTreeModule.php
@@ -71,7 +71,7 @@ class InteractiveTreeModule extends AbstractModule implements ModuleTabInterface
 	public function canLoadAjax() {
 		return true;
 	}
-	
+
 	/**
 	 * Return a menu item for this chart.
 	 *
@@ -79,13 +79,13 @@ class InteractiveTreeModule extends AbstractModule implements ModuleTabInterface
 	 */
 	public function getChartMenu(Individual $individual) {
 		return new Menu(
-			$this->getTitle(), 
-			'module.php?mod=tree&amp;mod_action=treeview&amp;rootid=' . $individual->getXref() . '&amp;ged=' . $individual->getTree()->getNameUrl(), 
-			'menu-chart-tree', 
+			$this->getTitle(),
+			'module.php?mod=tree&amp;mod_action=treeview&amp;rootid=' . $individual->getXref() . '&amp;ged=' . $individual->getTree()->getNameUrl(),
+			'menu-chart-tree',
 			array('rel' => 'nofollow')
 		);
 	}
-	
+
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
@@ -94,7 +94,7 @@ class InteractiveTreeModule extends AbstractModule implements ModuleTabInterface
 	public function getBoxChartMenu(Individual $individual) {
 		return $this->getChartMenu($individual);
 	}
-	
+
 	/** {@inheritdoc} */
 	public function getPreLoadContent() {
 		// We cannot use jQuery("head").append(<link rel="stylesheet" ...as jQuery is not loaded at this time
diff --git a/app/Module/LifespansChartModule.php b/app/Module/LifespansChartModule.php
index b897d936c2..ead8b0b616 100644
--- a/app/Module/LifespansChartModule.php
+++ b/app/Module/LifespansChartModule.php
@@ -52,7 +52,7 @@ class LifespansChartModule extends AbstractModule implements ModuleChartInterfac
 	public function defaultAccessLevel() {
 		return Auth::PRIV_PRIVATE;
 	}
-	
+
 	/**
 	 * Return a menu item for this chart.
 	 *
@@ -60,13 +60,13 @@ class LifespansChartModule extends AbstractModule implements ModuleChartInterfac
 	 */
 	public function getChartMenu(Individual $individual) {
 		return new Menu(
-			$this->getTitle(), 
-			'lifespan.php', 
-			'menu-chart-lifespan', 
+			$this->getTitle(),
+			'lifespan.php',
+			'menu-chart-lifespan',
 			array('rel' => 'nofollow')
 		);
 	}
-	
+
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
diff --git a/app/Module/ModuleChartInterface.php b/app/Module/ModuleChartInterface.php
index ab7a84ad3f..2c4de56e86 100644
--- a/app/Module/ModuleChartInterface.php
+++ b/app/Module/ModuleChartInterface.php
@@ -22,7 +22,6 @@ use Fisharebest\Webtrees\Menu;
  * Interface ModuleChartInterface - Classes and libraries for module system
  */
 interface ModuleChartInterface {
-
 	/**
 	 * Return a menu item for this chart.
 	 *
diff --git a/app/Module/PedigreeChartModule.php b/app/Module/PedigreeChartModule.php
index e097faa40a..a102dad311 100644
--- a/app/Module/PedigreeChartModule.php
+++ b/app/Module/PedigreeChartModule.php
@@ -52,7 +52,7 @@ class PedigreeChartModule extends AbstractModule implements ModuleChartInterface
 	public function defaultAccessLevel() {
 		return Auth::PRIV_PRIVATE;
 	}
-	
+
 	/**
 	 * Return a menu item for this chart.
 	 *
@@ -60,13 +60,13 @@ class PedigreeChartModule extends AbstractModule implements ModuleChartInterface
 	 */
 	public function getChartMenu(Individual $individual) {
 		return new Menu(
-			$this->getTitle(), 
-			'pedigree.php?rootid=' . $individual->getXref() . '&amp;ged=' . $individual->getTree()->getNameUrl(), 
-			'menu-chart-pedigree', 
+			$this->getTitle(),
+			'pedigree.php?rootid=' . $individual->getXref() . '&amp;ged=' . $individual->getTree()->getNameUrl(),
+			'menu-chart-pedigree',
 			array('rel' => 'nofollow')
 		);
 	}
-	
+
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
diff --git a/app/Module/StatisticsChartModule.php b/app/Module/StatisticsChartModule.php
index d675ef7a8c..dbe75ffc9e 100644
--- a/app/Module/StatisticsChartModule.php
+++ b/app/Module/StatisticsChartModule.php
@@ -52,7 +52,7 @@ class StatisticsChartModule extends AbstractModule implements ModuleChartInterfa
 	public function defaultAccessLevel() {
 		return Auth::PRIV_PRIVATE;
 	}
-	
+
 	/**
 	 * Return a menu item for this chart.
 	 *
@@ -60,13 +60,13 @@ class StatisticsChartModule extends AbstractModule implements ModuleChartInterfa
 	 */
 	public function getChartMenu(Individual $individual) {
 		return new Menu(
-			$this->getTitle(), 
-			'statistics.php?ged=' . $individual->getTree()->getNameUrl(), 
-			'menu-chart-statistics', 
+			$this->getTitle(),
+			'statistics.php?ged=' . $individual->getTree()->getNameUrl(),
+			'menu-chart-statistics',
 			array('rel' => 'nofollow')
 		);
 	}
-	
+
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
diff --git a/app/Report/ReportParserGenerate.php b/app/Report/ReportParserGenerate.php
index f9c752e54b..a8f84f8e88 100644
--- a/app/Report/ReportParserGenerate.php
+++ b/app/Report/ReportParserGenerate.php
@@ -2743,7 +2743,7 @@ class ReportParserGenerate extends ReportParserBase {
 		$tags      = explode(':', $tag);
 		$origlevel = $level;
 		if ($level == 0) {
-			$level = $gedrec{0} +1;
+			$level = $gedrec{0} + 1;
 		}
 
 		$subrec = $gedrec;
diff --git a/app/Stats.php b/app/Stats.php
index bf8ca6618b..3ba5444da4 100644
--- a/app/Stats.php
+++ b/app/Stats.php
@@ -5421,8 +5421,8 @@ class Stats {
 			return '';
 		}
 		$SURNAME_TRADITION = $this->tree->getPreference('SURNAME_TRADITION');
-		$all_surnames = array();
-		$tot          = 0;
+		$all_surnames      = array();
+		$tot               = 0;
 		foreach ($surnames as $surname => $num) {
 			$all_surnames = array_merge($all_surnames, QueryName::surnames($this->tree, I18N::strtoupper($surname), '', false, false));
 			$tot += $num;