fisharebest / webtrees

app/Controller/SourceController.php

Braces +4 added lines, -2 removed lines

@@ -23,11 +23,13 @@
 /**
  * Controller for the source page
  */
-class SourceController extends GedcomRecordController {
+class SourceController extends GedcomRecordController
+{
 	/**
 	 * get edit menu
 	 */
-	public function getEditMenu() {
+	public function getEditMenu()
+	{
 		if (!$this->record || $this->record->isPendingDeletion()) {
 			return null;
 		}

app/Individual.php

Braces +88 added lines, -44 removed lines

@@ -21,7 +21,8 @@ 
 /**
  * A GEDCOM individual (INDI) object.
  */
-class Individual extends GedcomRecord {
+class Individual extends GedcomRecord
+{
 	const RECORD_TYPE = 'INDI';
 	const URL_PREFIX  = 'individual.php?pid=';
 
@@ -41,7 +42,8 @@ 
 	 * @param Tree  $tree
 	 * @param string[] $xrefs
 	 */
-	public static function load(Tree $tree, array $xrefs) {
+	public static function load(Tree $tree, array $xrefs)
+	{
 		$args = array(
 			'tree_id' => $tree->getTreeId(),
 		);
@@ -76,7 +78,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function canShowName($access_level = null) {
+	public function canShowName($access_level = null)
+	{
 		if ($access_level === null) {
 			$access_level = Auth::accessLevel($this->tree);
 		}
@@ -91,7 +94,8 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function canShowByType($access_level) {
+	protected function canShowByType($access_level)
+	{
 		global $WT_TREE;
 
 		// Dead people...
@@ -142,7 +146,8 @@ 
 	 *
 	 * @return bool
 	 */
-	private static function isRelated(Individual $target, $distance) {
+	private static function isRelated(Individual $target, $distance)
+	{
 		static $cache = null;
 
 		$user_individual = self::getInstance($target->tree->getUserPreference(Auth::user(), 'gedcomid'), $target->tree);
@@ -216,7 +221,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function createPrivateGedcomRecord($access_level) {
+	protected function createPrivateGedcomRecord($access_level)
+	{
 		$SHOW_PRIVATE_RELATIONSHIPS = $this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS');
 
 		$rec = '0 @' . $this->xref . '@ INDI';
@@ -250,7 +256,8 @@ 
 	 *
 	 * @return null|string
 	 */
-	protected static function fetchGedcomRecord($xref, $tree_id) {
+	protected static function fetchGedcomRecord($xref, $tree_id)
+	{
 		return Database::prepare(
 			"SELECT i_gedcom FROM `##individuals` WHERE i_id = :xref AND i_file = :tree_id"
 		)->execute(array(
@@ -267,7 +274,8 @@ 
 	 *
 	 * @return int
 	 */
-	public static function compareBirthDate(Individual $x, Individual $y) {
+	public static function compareBirthDate(Individual $x, Individual $y)
+	{
 		return Date::compare($x->getEstimatedBirthDate(), $y->getEstimatedBirthDate());
 	}
 
@@ -279,7 +287,8 @@ 
 	 *
 	 * @return int
 	 */
-	public static function compareDeathDate(Individual $x, Individual $y) {
+	public static function compareDeathDate(Individual $x, Individual $y)
+	{
 		return Date::compare($x->getEstimatedDeathDate(), $y->getEstimatedDeathDate());
 	}
 
@@ -289,7 +298,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isDead() {
+	public function isDead()
+	{
 		$MAX_ALIVE_AGE = $this->tree->getPreference('MAX_ALIVE_AGE');
 
 		// "1 DEAT Y" or "1 DEAT/2 DATE" or "1 DEAT/2 PLAC"
@@ -390,7 +400,8 @@ 
 	 *
 	 * @return null|Media
 	 */
-	public function findHighlightedMedia() {
+	public function findHighlightedMedia()
+	{
 		$objectA = null;
 		$objectB = null;
 		$objectC = null;
@@ -445,7 +456,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function displayImage() {
+	public function displayImage()
+	{
 		$media = $this->findHighlightedMedia();
 		if ($media && $this->canShow()) {
 			// Thumbnail exists - use it.
@@ -463,7 +475,8 @@ 
 	 *
 	 * @return Date
 	 */
-	public function getBirthDate() {
+	public function getBirthDate()
+	{
 		foreach ($this->getAllBirthDates() as $date) {
 			if ($date->isOK()) {
 				return $date;
@@ -478,7 +491,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getBirthPlace() {
+	public function getBirthPlace()
+	{
 		foreach ($this->getAllBirthPlaces() as $place) {
 			if ($place) {
 				return $place;
@@ -493,7 +507,8 @@ 
 	 *
 	 * @return string the year of birth
 	 */
-	public function getBirthYear() {
+	public function getBirthYear()
+	{
 		return $this->getBirthDate()->minimumDate()->format('%Y');
 	}
 
@@ -502,7 +517,8 @@ 
 	 *
 	 * @return Date
 	 */
-	public function getDeathDate() {
+	public function getDeathDate()
+	{
 		foreach ($this->getAllDeathDates() as $date) {
 			if ($date->isOK()) {
 				return $date;
@@ -517,7 +533,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDeathPlace() {
+	public function getDeathPlace()
+	{
 		foreach ($this->getAllDeathPlaces() as $place) {
 			if ($place) {
 				return $place;
@@ -532,7 +549,8 @@ 
 	 *
 	 * @return string the year of death
 	 */
-	public function getDeathYear() {
+	public function getDeathYear()
+	{
 		return $this->getDeathDate()->minimumDate()->format('%Y');
 	}
 
@@ -544,7 +562,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getLifeSpan() {
+	public function getLifeSpan()
+	{
 		return
 			/* I18N: A range of years, e.g. “1870–”, “1870–1920”, “–1920” */ I18N::translate(
 				'%1$s–%2$s',
@@ -558,7 +577,8 @@ 
 	 *
 	 * @return Date[]
 	 */
-	public function getAllBirthDates() {
+	public function getAllBirthDates()
+	{
 		foreach (explode('|', WT_EVENTS_BIRT) as $event) {
 			$tmp = $this->getAllEventDates($event);
 			if ($tmp) {
@@ -574,7 +594,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function getAllBirthPlaces() {
+	public function getAllBirthPlaces()
+	{
 		foreach (explode('|', WT_EVENTS_BIRT) as $event) {
 			$tmp = $this->getAllEventPlaces($event);
 			if ($tmp) {
@@ -590,7 +611,8 @@ 
 	 *
 	 * @return Date[]
 	 */
-	public function getAllDeathDates() {
+	public function getAllDeathDates()
+	{
 		foreach (explode('|', WT_EVENTS_DEAT) as $event) {
 			$tmp = $this->getAllEventDates($event);
 			if ($tmp) {
@@ -606,7 +628,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function getAllDeathPlaces() {
+	public function getAllDeathPlaces()
+	{
 		foreach (explode('|', WT_EVENTS_DEAT) as $event) {
 			$tmp = $this->getAllEventPlaces($event);
 			if ($tmp) {
@@ -622,7 +645,8 @@ 
 	 *
 	 * @return Date
 	 */
-	public function getEstimatedBirthDate() {
+	public function getEstimatedBirthDate()
+	{
 		if (is_null($this->_getEstimatedBirthDate)) {
 			foreach ($this->getAllBirthDates() as $date) {
 				if ($date->isOK()) {
@@ -707,7 +731,8 @@ 
 	 *
 	 * @return Date
 	 */
-	public function getEstimatedDeathDate() {
+	public function getEstimatedDeathDate()
+	{
 		if ($this->_getEstimatedDeathDate === null) {
 			foreach ($this->getAllDeathDates() as $date) {
 				if ($date->isOK()) {
@@ -734,7 +759,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getSex() {
+	public function getSex()
+	{
 		if (preg_match('/\n1 SEX ([MF])/', $this->gedcom . $this->pending, $match)) {
 			return $match[1];
 		} else {
@@ -749,7 +775,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getSexImage($size = 'small') {
+	public function getSexImage($size = 'small')
+	{
 		return self::sexImage($this->getSex(), $size);
 	}
 
@@ -761,7 +788,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function sexImage($sex, $size = 'small') {
+	public static function sexImage($sex, $size = 'small')
+	{
 		return '<i class="icon-sex_' . strtolower($sex) . '_' . ($size == 'small' ? '9x9' : '15x15') . '"></i>';
 	}
 
@@ -770,7 +798,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getBoxStyle() {
+	public function getBoxStyle()
+	{
 		$tmp = array('M' => '', 'F' => 'F', 'U' => 'NN');
 
 		return 'person_box' . $tmp[$this->getSex()];
@@ -783,7 +812,8 @@ 
 	 *
 	 * @return Family[]
 	 */
-	public function getSpouseFamilies($access_level = null) {
+	public function getSpouseFamilies($access_level = null)
+	{
 		if ($access_level === null) {
 			$access_level = Auth::accessLevel($this->tree);
 		}
@@ -809,7 +839,8 @@ 
 	 *
 	 * @return Individual|null
 	 */
-	public function getCurrentSpouse() {
+	public function getCurrentSpouse()
+	{
 		$tmp    = $this->getSpouseFamilies();
 		$family = end($tmp);
 		if ($family) {
@@ -824,7 +855,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function getNumberOfChildren() {
+	public function getNumberOfChildren()
+	{
 		if (preg_match('/\n1 NCHI (\d+)(?:\n|$)/', $this->getGedcom(), $match)) {
 			return $match[1];
 		} else {
@@ -846,7 +878,8 @@ 
 	 *
 	 * @return Family[]
 	 */
-	public function getChildFamilies($access_level = null) {
+	public function getChildFamilies($access_level = null)
+	{
 		if ($access_level === null) {
 			$access_level = Auth::accessLevel($this->tree);
 		}
@@ -876,7 +909,8 @@ 
 	 *
 	 * @return Family|null
 	 */
-	public function getPrimaryChildFamily() {
+	public function getPrimaryChildFamily()
+	{
 		$families = $this->getChildFamilies();
 		switch (count($families)) {
 		case 0:
@@ -914,7 +948,8 @@ 
 	 *
 	 * @return Family[]
 	 */
-	public function getChildStepFamilies() {
+	public function getChildStepFamilies()
+	{
 		$step_families = array();
 		$families      = $this->getChildFamilies();
 		foreach ($families as $family) {
@@ -944,7 +979,8 @@ 
 	 *
 	 * @return Family[]
 	 */
-	public function getSpouseStepFamilies() {
+	public function getSpouseStepFamilies()
+	{
 		$step_families = array();
 		$families      = $this->getSpouseFamilies();
 		foreach ($families as $family) {
@@ -968,7 +1004,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getChildFamilyLabel(Family $family) {
+	public function getChildFamilyLabel(Family $family)
+	{
 		if (preg_match('/\n1 FAMC @' . $family->getXref() . '@(?:\n[2-9].*)*\n2 PEDI (.+)/', $this->getGedcom(), $match)) {
 			// A specified pedigree
 			return GedcomCodePedi::getChildFamilyLabel($match[1]);
@@ -985,7 +1022,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getStepFamilyLabel(Family $step_family) {
+	public function getStepFamilyLabel(Family $step_family)
+	{
 		foreach ($this->getChildFamilies() as $family) {
 			if ($family !== $step_family) {
 				// Must be a step-family
@@ -1034,7 +1072,8 @@ 
 	 *
 	 * @return string a div block with father & mother names
 	 */
-	public function getPrimaryParentsNames($classname = '', $display = '') {
+	public function getPrimaryParentsNames($classname = '', $display = '')
+	{
 		$fam = $this->getPrimaryChildFamily();
 		if (!$fam) {
 			return '';
@@ -1075,7 +1114,8 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function getFallBackName() {
+	public function getFallBackName()
+	{
 		return '@P.N. /@N.N./';
 	}
 
@@ -1108,7 +1148,8 @@ 
 	 * @param string $full
 	 * @param string $gedcom
 	 */
-	protected function addName($type, $full, $gedcom) {
+	protected function addName($type, $full, $gedcom)
+	{
 		////////////////////////////////////////////////////////////////////////////
 		// Extract the structured name parts - use for "sortable" names and indexes
 		////////////////////////////////////////////////////////////////////////////
@@ -1247,7 +1288,8 @@ 
 	/**
 	 * Extract names from the GEDCOM record.
 	 */
-	public function extractNames() {
+	public function extractNames()
+	{
 		$this->extractNamesFromFacts(1, 'NAME', $this->getFacts('NAME', false, Auth::accessLevel($this->tree), $this->canShowName()));
 	}
 
@@ -1257,7 +1299,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function formatListDetails() {
+	public function formatListDetails()
+	{
 		return
 			$this->formatFirstMajorFact(WT_EVENTS_BIRT, 1) .
 			$this->formatFirstMajorFact(WT_EVENTS_DEAT, 1);
@@ -1268,7 +1311,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getShortName() {
+	public function getShortName()
+	{
 		global $bwidth;
 
 		// Estimate number of characters that can fit in box. Calulates to 28 characters in webtrees theme, or 34 if no thumbnail used.

app/Date/GregorianDate.php

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * Definitions for the Gregorian calendar
  */
-class GregorianDate extends CalendarDate {
+class GregorianDate extends CalendarDate
+{
 	/**
 	 * Create a date from either:
 	 * a Julian day number
@@ -29,7 +30,8 @@ 
 	 *
 	 * @param array|int|CalendarDate $date
 	 */
-	public function __construct($date) {
+	public function __construct($date)
+	{
 		$this->calendar = new GregorianCalendar;
 		parent::__construct($date);
 	}

app/Date/CalendarDate.php

Braces +86 added lines, -43 removed lines

@@ -31,7 +31,8 @@ 
  * midnight, solar midnight, sunset, sunrise, etc.), we convert on the basis of
  * midday.
  */
-class CalendarDate {
+class CalendarDate
+{
 	/** @var int[] Convert GEDCOM month names to month numbers  */
 	public static $MONTH_ABBREV = array('' => 0, 'JAN' => 1, 'FEB' => 2, 'MAR' => 3, 'APR' => 4, 'MAY' => 5, 'JUN' => 6, 'JUL' => 7, 'AUG' => 8, 'SEP' => 9, 'OCT' => 10, 'NOV' => 11, 'DEC' => 12);
 
@@ -64,7 +65,8 @@ 
 	 *
 	 * @param array|int|CalendarDate $date
 	 */
-	public function __construct($date) {
+	public function __construct($date)
+	{
 		// Construct from an integer (a julian day number)
 		if (is_integer($date)) {
 			$this->minJD                       = $date;
@@ -134,14 +136,16 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isLeapYear() {
+	public function isLeapYear()
+	{
 		return $this->calendar->isLeapYear($this->y);
 	}
 
 	/**
 	 * Set the object’s Julian day number from a potentially incomplete year/month/day
 	 */
-	public function setJdFromYmd() {
+	public function setJdFromYmd()
+	{
 		if ($this->y == 0) {
 			$this->minJD = 0;
 			$this->maxJD = 0;
@@ -168,7 +172,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function monthNameNominativeCase($month_number, $leap_year) {
+	public static function monthNameNominativeCase($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -202,7 +207,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function monthNameGenitiveCase($month_number, $leap_year) {
+	protected function monthNameGenitiveCase($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -236,7 +242,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function monthNameLocativeCase($month_number, $leap_year) {
+	protected function monthNameLocativeCase($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -270,7 +277,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function monthNameInstrumentalCase($month_number, $leap_year) {
+	protected function monthNameInstrumentalCase($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -302,7 +310,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function monthNameAbbreviated($month_number, $leap_year) {
+	protected function monthNameAbbreviated($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -333,7 +342,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function dayNames($day_number) {
+	public function dayNames($day_number)
+	{
 		static $translated_day_names;
 
 		if ($translated_day_names === null) {
@@ -358,7 +368,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function dayNamesAbbreviated($day_number) {
+	protected function dayNamesAbbreviated($day_number)
+	{
 		static $translated_day_names;
 
 		if ($translated_day_names === null) {
@@ -383,7 +394,8 @@ 
 	 *
 	 * @return int
 	 */
-	protected function nextYear($year) {
+	protected function nextYear($year)
+	{
 		return $year + 1;
 	}
 
@@ -394,7 +406,8 @@ 
 	 *
 	 * @return int
 	 */
-	protected function extractYear($year) {
+	protected function extractYear($year)
+	{
 		return (int) $year;
 	}
 
@@ -406,7 +419,8 @@ 
 	 *
 	 * @return int
 	 */
-	public static function compare(CalendarDate $d1, CalendarDate $d2) {
+	public static function compare(CalendarDate $d1, CalendarDate $d2)
+	{
 		if ($d1->maxJD < $d2->minJD) {
 			return -1;
 		} elseif ($d2->maxJD < $d1->minJD) {
@@ -429,7 +443,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getAge($full, $jd, $warn_on_negative = true) {
+	public function getAge($full, $jd, $warn_on_negative = true)
+	{
 		if ($this->y == 0 || $jd == 0) {
 			return $full ? '' : '0';
 		}
@@ -478,7 +493,8 @@ 
 	 *
 	 * @return CalendarDate
 	 */
-	public function convertToCalendar($calendar) {
+	public function convertToCalendar($calendar)
+	{
 		switch ($calendar) {
 		case 'gregorian':
 			return new GregorianDate($this);
@@ -502,7 +518,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function inValidRange() {
+	public function inValidRange()
+	{
 		return $this->minJD >= $this->calendar->jdStart() && $this->maxJD <= $this->calendar->jdEnd();
 	}
 
@@ -511,7 +528,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function monthsInYear() {
+	public function monthsInYear()
+	{
 		return $this->calendar->monthsInYear();
 	}
 
@@ -520,7 +538,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function daysInMonth() {
+	public function daysInMonth()
+	{
 		try {
 			return $this->calendar->daysInMonth($this->y, $this->m);
 		} catch (\InvalidArgumentException $ex) {
@@ -535,7 +554,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function daysInWeek() {
+	public function daysInWeek()
+	{
 		return $this->calendar->daysInWeek();
 	}
 
@@ -547,7 +567,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function format($format, $qualifier = '') {
+	public function format($format, $qualifier = '')
+	{
 		// Don’t show exact details for inexact dates
 		if (!$this->d) {
 			// The comma is for US "M D, Y" dates
@@ -663,7 +684,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatDayZeros() {
+	protected function formatDayZeros()
+	{
 		if ($this->d > 9) {
 			return I18N::digits($this->d);
 		} else {
@@ -676,7 +698,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatDay() {
+	protected function formatDay()
+	{
 		return I18N::digits($this->d);
 	}
 
@@ -685,7 +708,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatLongWeekday() {
+	protected function formatLongWeekday()
+	{
 		return $this->dayNames($this->minJD % $this->calendar->daysInWeek());
 	}
 
@@ -694,7 +718,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatShortWeekday() {
+	protected function formatShortWeekday()
+	{
 		return $this->dayNamesAbbreviated($this->minJD % $this->calendar->daysInWeek());
 	}
 
@@ -703,7 +728,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatIsoWeekday() {
+	protected function formatIsoWeekday()
+	{
 		return I18N::digits($this->minJD % 7 + 1);
 	}
 
@@ -712,7 +738,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatNumericWeekday() {
+	protected function formatNumericWeekday()
+	{
 		return I18N::digits(($this->minJD + 1) % $this->calendar->daysInWeek());
 	}
 
@@ -721,7 +748,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatDayOfYear() {
+	protected function formatDayOfYear()
+	{
 		return I18N::digits($this->minJD - $this->calendar->ymdToJd($this->y, 1, 1));
 	}
 
@@ -730,7 +758,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatMonth() {
+	protected function formatMonth()
+	{
 		return I18N::digits($this->m);
 	}
 
@@ -739,7 +768,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatMonthZeros() {
+	protected function formatMonthZeros()
+	{
 		if ($this->m > 9) {
 			return I18N::digits($this->m);
 		} else {
@@ -754,7 +784,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatLongMonth($case = 'NOMINATIVE') {
+	protected function formatLongMonth($case = 'NOMINATIVE')
+	{
 		switch ($case) {
 		case 'GENITIVE':
 			return $this->monthNameGenitiveCase($this->m, $this->isLeapYear());
@@ -774,7 +805,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatShortMonth() {
+	protected function formatShortMonth()
+	{
 		return $this->monthNameAbbreviated($this->m, $this->isLeapYear());
 	}
 
@@ -786,7 +818,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatShortYear() {
+	protected function formatShortYear()
+	{
 		return $this->formatLongYear();
 	}
 
@@ -795,7 +828,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatGedcomDay() {
+	protected function formatGedcomDay()
+	{
 		if ($this->d == 0) {
 			return '';
 		} else {
@@ -808,7 +842,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatGedcomMonth() {
+	protected function formatGedcomMonth()
+	{
 		// Our simple lookup table doesn't work correctly for Adar on leap years
 		if ($this->m == 7 && $this->calendar instanceof JewishCalendar && !$this->calendar->isLeapYear($this->y)) {
 			return 'ADR';
@@ -822,7 +857,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatGedcomYear() {
+	protected function formatGedcomYear()
+	{
 		if ($this->y == 0) {
 			return '';
 		} else {
@@ -835,7 +871,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatLongYear() {
+	protected function formatLongYear()
+	{
 		return I18N::digits($this->y);
 	}
 
@@ -844,7 +881,8 @@ 
 	 *
 	 * @return int[]
 	 */
-	protected function nextMonth() {
+	protected function nextMonth()
+	{
 		return array($this->m === $this->calendar->monthsInYear() ? $this->nextYear($this->y) : $this->y, ($this->m % $this->calendar->monthsInYear()) + 1);
 	}
 
@@ -855,7 +893,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function numberToRomanNumerals($number) {
+	protected function numberToRomanNumerals($number)
+	{
 		if ($number < 1) {
 			// Cannot convert zero/negative numbers
 			return (string) $number;
@@ -878,7 +917,8 @@ 
 	 *
 	 * @return int
 	 */
-	protected function romanNumeralsToNumber($roman) {
+	protected function romanNumeralsToNumber($roman)
+	{
 		$num = 0;
 		foreach (self::$roman_numerals as $key => $value) {
 			if (strpos($roman, $value) === 0) {
@@ -895,7 +935,8 @@ 
 	 *
 	 * @return int[]
 	 */
-	public function todayYmd() {
+	public function todayYmd()
+	{
 		return $this->calendar->jdToYmd(unixtojd());
 	}
 
@@ -904,7 +945,8 @@ 
 	 *
 	 * @return CalendarDate
 	 */
-	public function today() {
+	public function today()
+	{
 		$tmp    = clone $this;
 		$ymd    = $tmp->todayYmd();
 		$tmp->y = $ymd[0];
@@ -922,7 +964,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function calendarUrl($date_format) {
+	public function calendarUrl($date_format)
+	{
 		if (strpbrk($date_format, 'dDj') && $this->d) {
 			// If the format includes a day, and the date also includes a day, then use the day view
 			$view = 'day';

app/Date/HijriDate.php

Braces +14 added lines, -7 removed lines

@@ -24,7 +24,8 @@ 
  * Note that these are "theoretical" dates.
  * "True" dates are based on local lunar observations, and can be a +/- one day.
  */
-class HijriDate extends CalendarDate {
+class HijriDate extends CalendarDate
+{
 	/** @var int[] Convert GEDCOM month names to month numbers  */
 	public static $MONTH_ABBREV = array('' => 0, 'MUHAR' => 1, 'SAFAR' => 2, 'RABIA' => 3, 'RABIT' => 4, 'JUMAA' => 5, 'JUMAT' => 6, 'RAJAB' => 7, 'SHAAB' => 8, 'RAMAD' => 9, 'SHAWW' => 10, 'DHUAQ' => 11, 'DHUAH' => 12);
 
@@ -36,7 +37,8 @@ 
 	 *
 	 * @param array|int|CalendarDate $date
 	 */
-	public function __construct($date) {
+	public function __construct($date)
+	{
 		$this->calendar = new ArabicCalendar;
 		parent::__construct($date);
 	}
@@ -49,7 +51,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function monthNameNominativeCase($month_number, $leap_year) {
+	public static function monthNameNominativeCase($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -81,7 +84,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function monthNameGenitiveCase($month_number, $leap_year) {
+	protected function monthNameGenitiveCase($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -113,7 +117,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function monthNameLocativeCase($month_number, $leap_year) {
+	protected function monthNameLocativeCase($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -145,7 +150,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function monthNameInstrumentalCase($month_number, $leap_year) {
+	protected function monthNameInstrumentalCase($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -177,7 +183,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function monthNameAbbreviated($month_number, $leap_year) {
+	protected function monthNameAbbreviated($month_number, $leap_year)
+	{
 		return self::monthNameNominativeCase($month_number, $leap_year);
 	}
 }

app/Date/RomanDate.php

Braces +6 added lines, -3 removed lines

@@ -22,14 +22,17 @@
  * how it is to be represented.... This class is just a place holder so that
  * webtrees won’t compain if it receives one.
  */
-class RomanDate extends JulianDate {
+class RomanDate extends JulianDate
+{
 	/** {@inheritdoc} */
-	protected function formatGedcomYear() {
+	protected function formatGedcomYear()
+	{
 		return sprintf('%04dAUC', $this->y);
 	}
 
 	/** {@inheritdoc} */
-	protected function formatLongYear() {
+	protected function formatLongYear()
+	{
 		return $this->y . 'AUC';
 	}
 }

app/Date/FrenchDate.php

Braces +20 added lines, -10 removed lines

@@ -21,7 +21,8 @@ 
 /**
  * Definitions for the French Republican calendar
  */
-class FrenchDate extends CalendarDate {
+class FrenchDate extends CalendarDate
+{
 	/** @var int[] Convert GEDCOM month names to month numbers  */
 	public static $MONTH_ABBREV = array('' => 0, 'VEND' => 1, 'BRUM' => 2, 'FRIM' => 3, 'NIVO' => 4, 'PLUV' => 5, 'VENT' => 6, 'GERM' => 7, 'FLOR' => 8, 'PRAI' => 9, 'MESS' => 10, 'THER' => 11, 'FRUC' => 12, 'COMP' => 13);
 
@@ -33,7 +34,8 @@ 
 	 *
 	 * @param array|int|CalendarDate $date
 	 */
-	public function __construct($date) {
+	public function __construct($date)
+	{
 		$this->calendar = new FrenchCalendar;
 		parent::__construct($date);
 	}
@@ -46,7 +48,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function monthNameNominativeCase($month_number, $leap_year) {
+	public static function monthNameNominativeCase($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -79,7 +82,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function monthNameGenitiveCase($month_number, $leap_year) {
+	protected function monthNameGenitiveCase($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -112,7 +116,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function monthNameLocativeCase($month_number, $leap_year) {
+	protected function monthNameLocativeCase($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -145,7 +150,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function monthNameInstrumentalCase($month_number, $leap_year) {
+	protected function monthNameInstrumentalCase($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -178,7 +184,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function monthNameAbbreviated($month_number, $leap_year) {
+	protected function monthNameAbbreviated($month_number, $leap_year)
+	{
 		return self::monthNameNominativeCase($month_number, $leap_year);
 	}
 
@@ -189,7 +196,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function dayNames($day_number) {
+	public function dayNames($day_number)
+	{
 		static $translated_day_names;
 
 		if ($translated_day_names === null) {
@@ -217,7 +225,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function dayNamesAbbreviated($day_number) {
+	protected function dayNamesAbbreviated($day_number)
+	{
 		return $this->dayNames($day_number);
 	}
 
@@ -226,7 +235,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatLongYear() {
+	protected function formatLongYear()
+	{
 		return $this->numberToRomanNumerals($this->y);
 	}
 }

app/Date/JalaliDate.php

Braces +14 added lines, -7 removed lines

@@ -21,7 +21,8 @@ 
 /**
  * Definitions for the Jalali calendar
  */
-class JalaliDate extends CalendarDate {
+class JalaliDate extends CalendarDate
+{
 	/** @var int[] Convert GEDCOM month names to month numbers  */
 	public static $MONTH_ABBREV = array('' => 0, 'FARVA' => 1, 'ORDIB' => 2, 'KHORD' => 3, 'TIR' => 4, 'MORDA' => 5, 'SHAHR' => 6, 'MEHR' => 7, 'ABAN' => 8, 'AZAR' => 9, 'DEY' => 10, 'BAHMA' => 11, 'ESFAN' => 12);
 
@@ -33,7 +34,8 @@ 
 	 *
 	 * @param array|int|CalendarDate $date
 	 */
-	public function __construct($date) {
+	public function __construct($date)
+	{
 		$this->calendar = new PersianCalendar;
 		parent::__construct($date);
 	}
@@ -46,7 +48,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function monthNameNominativeCase($month_number, $leap_year) {
+	public static function monthNameNominativeCase($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -78,7 +81,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function monthNameGenitiveCase($month_number, $leap_year) {
+	protected function monthNameGenitiveCase($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -110,7 +114,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function monthNameLocativeCase($month_number, $leap_year) {
+	protected function monthNameLocativeCase($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -142,7 +147,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function monthNameInstrumentalCase($month_number, $leap_year) {
+	protected function monthNameInstrumentalCase($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {
@@ -174,7 +180,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function monthNameAbbreviated($month_number, $leap_year) {
+	protected function monthNameAbbreviated($month_number, $leap_year)
+	{
 		static $translated_month_names;
 
 		if ($translated_month_names === null) {

app/Date/JulianDate.php

Braces +12 added lines, -6 removed lines

@@ -22,7 +22,8 @@ 
  * Definitions for the Julian Proleptic calendar
  * (Proleptic means we extend it backwards, prior to its introduction in 46BC)
  */
-class JulianDate extends CalendarDate {
+class JulianDate extends CalendarDate
+{
 	/** @var bool True for dates recorded in new-style/old-style format, e.g. 2 FEB 1743/44 */
 	private $new_old_style = false;
 
@@ -34,7 +35,8 @@ 
 	 *
 	 * @param array|int|CalendarDate $date
 	 */
-	public function __construct($date) {
+	public function __construct($date)
+	{
 		$this->calendar = new JulianCalendar;
 		parent::__construct($date);
 	}
@@ -46,7 +48,8 @@ 
 	 *
 	 * @return int
 	 */
-	protected function nextYear($year) {
+	protected function nextYear($year)
+	{
 		if ($year == -1) {
 			return 1;
 		} else {
@@ -61,7 +64,8 @@ 
 	 *
 	 * @return int
 	 */
-	protected function extractYear($year) {
+	protected function extractYear($year)
+	{
 		if (preg_match('/^(\d\d\d\d)\/\d{1,4}$/', $year, $match)) {
 			// Assume the first year is correct
 			$this->new_old_style = true;
@@ -79,7 +83,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatLongYear() {
+	protected function formatLongYear()
+	{
 		if ($this->y < 0) {
 			return /*  I18N: BCE=Before the Common Era, for Julian years < 0. See http://en.wikipedia.org/wiki/Common_Era */
 				I18N::translate('%s&nbsp;BCE', I18N::digits(-$this->y));
@@ -98,7 +103,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatGedcomYear() {
+	protected function formatGedcomYear()
+	{
 		if ($this->y < 0) {
 			return sprintf('%04d B.C.', -$this->y);
 		} else {