fisharebest / webtrees

app/Census/CensusColumnConditionFrenchFemme.php

Indentation +15 added lines, -15 removed lines

@@ -19,23 +19,23 @@
  * Marital status.
  */
 class CensusColumnConditionFrenchFemme extends AbstractCensusColumnCondition {
-	/* Text to display for married individuals */
-	protected $husband = '';
-	protected $wife    = '1';
+    /* Text to display for married individuals */
+    protected $husband = '';
+    protected $wife    = '1';
 
-	/* Text to display for unmarried individuals */
-	protected $bachelor = '';
-	protected $spinster = '';
+    /* Text to display for unmarried individuals */
+    protected $bachelor = '';
+    protected $spinster = '';
 
-	/* Text to display for children */
-	protected $boy  = '';
-	protected $girl = '';
+    /* Text to display for children */
+    protected $boy  = '';
+    protected $girl = '';
 
-	/* Text to display for divorced individuals */
-	protected $divorce  = '';
-	protected $divorcee = '1';
+    /* Text to display for divorced individuals */
+    protected $divorce  = '';
+    protected $divorcee = '1';
 
-	/* Text to display for widowed individuals (not yet implemented) */
-	protected $widower = '';
-	protected $widow   = '';
+    /* Text to display for widowed individuals (not yet implemented) */
+    protected $widower = '';
+    protected $widow   = '';
 }

Braces +2 added lines, -1 removed lines

@@ -18,7 +18,8 @@
 /**
  * Marital status.
  */
-class CensusColumnConditionFrenchFemme extends AbstractCensusColumnCondition {
+class CensusColumnConditionFrenchFemme extends AbstractCensusColumnCondition
+{
 	/* Text to display for married individuals */
 	protected $husband = '';
 	protected $wife    = '1';

app/Census/CensusOfScotland1861.php

Indentation +26 added lines, -26 removed lines

@@ -19,31 +19,31 @@
  * Definitions for a census
  */
 class CensusOfScotland1861 extends CensusOfScotland implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '07 APR 1861';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '07 APR 1861';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Name', 'Name and surname'),
-			new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'),
-			new CensusColumnConditionEnglish($this, 'Condition', 'Condition'),
-			new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'),
-			new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'),
-			new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'),
-			new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'),
-			new CensusColumnNull($this, 'Infirm', 'Whether blind or deaf-and-dumb'),
-			new CensusColumnNull($this, 'School', 'Number of children between 5 and 13 attending school'),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnFullName($this, 'Name', 'Name and surname'),
+            new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'),
+            new CensusColumnConditionEnglish($this, 'Condition', 'Condition'),
+            new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'),
+            new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'),
+            new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'),
+            new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'),
+            new CensusColumnNull($this, 'Infirm', 'Whether blind or deaf-and-dumb'),
+            new CensusColumnNull($this, 'School', 'Number of children between 5 and 13 attending school'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfScotland1861 extends CensusOfScotland implements CensusInterface {
+class CensusOfScotland1861 extends CensusOfScotland implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '07 APR 1861';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnFullName($this, 'Name', 'Name and surname'),
 			new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'),

app/Census/CensusColumnConditionUs.php

Indentation +15 added lines, -15 removed lines

@@ -19,23 +19,23 @@
  * Marital status.
  */
 class CensusColumnConditionUs extends CensusColumnConditionEnglish {
-	/* Text to display for married individuals */
-	protected $husband = 'M';
-	protected $wife    = 'M';
+    /* Text to display for married individuals */
+    protected $husband = 'M';
+    protected $wife    = 'M';
 
-	/* Text to display for unmarried individuals */
-	protected $bachelor = 'S';
-	protected $spinster = 'S';
+    /* Text to display for unmarried individuals */
+    protected $bachelor = 'S';
+    protected $spinster = 'S';
 
-	/* Text to display for children */
-	protected $boy  = 'S';
-	protected $girl = 'S';
+    /* Text to display for children */
+    protected $boy  = 'S';
+    protected $girl = 'S';
 
-	/* Text to display for divorced individuals */
-	protected $divorce  = 'D';
-	protected $divorcee = 'D';
+    /* Text to display for divorced individuals */
+    protected $divorce  = 'D';
+    protected $divorcee = 'D';
 
-	/* Text to display for widowed individuals (not yet implemented) */
-	protected $widower = 'W';
-	protected $widow   = 'W';
+    /* Text to display for widowed individuals (not yet implemented) */
+    protected $widower = 'W';
+    protected $widow   = 'W';
 }

Braces +2 added lines, -1 removed lines

@@ -18,7 +18,8 @@
 /**
  * Marital status.
  */
-class CensusColumnConditionUs extends CensusColumnConditionEnglish {
+class CensusColumnConditionUs extends CensusColumnConditionEnglish
+{
 	/* Text to display for married individuals */
 	protected $husband = 'M';
 	protected $wife    = 'M';

app/Census/CensusOfDenmark.php

Indentation +39 added lines, -39 removed lines

@@ -19,44 +19,44 @@
  * Definitions for a census
  */
 class CensusOfDenmark extends Census implements CensusPlaceInterface {
-	/**
-	 * All available censuses for this census place.
-	 *
-	 * @return CensusInterface[]
-	 */
-	public function allCensusDates() {
-		return array(
-			new CensusOfDenmark1787(),
-			new CensusOfDenmark1801(),
-			new CensusOfDenmark1803(),
-			new CensusOfDenmark1834(),
-			new CensusOfDenmark1835(),
-			new CensusOfDenmark1840(),
-			new CensusOfDenmark1845(),
-			new CensusOfDenmark1850(),
-			new CensusOfDenmark1855(),
-			new CensusOfDenmark1860(),
-			new CensusOfDenmark1870(),
-			new CensusOfDenmark1880(),
-			new CensusOfDenmark1885(),
-			new CensusOfDenmark1890(),
-			new CensusOfDenmark1901(),
-			new CensusOfDenmark1906(),
-			new CensusOfDenmark1911(),
-			new CensusOfDenmark1916(),
-			new CensusOfDenmark1921(),
-			new CensusOfDenmark1925(),
-			new CensusOfDenmark1930(),
-			new CensusOfDenmark1940(),
-		);
-	}
+    /**
+     * All available censuses for this census place.
+     *
+     * @return CensusInterface[]
+     */
+    public function allCensusDates() {
+        return array(
+            new CensusOfDenmark1787(),
+            new CensusOfDenmark1801(),
+            new CensusOfDenmark1803(),
+            new CensusOfDenmark1834(),
+            new CensusOfDenmark1835(),
+            new CensusOfDenmark1840(),
+            new CensusOfDenmark1845(),
+            new CensusOfDenmark1850(),
+            new CensusOfDenmark1855(),
+            new CensusOfDenmark1860(),
+            new CensusOfDenmark1870(),
+            new CensusOfDenmark1880(),
+            new CensusOfDenmark1885(),
+            new CensusOfDenmark1890(),
+            new CensusOfDenmark1901(),
+            new CensusOfDenmark1906(),
+            new CensusOfDenmark1911(),
+            new CensusOfDenmark1916(),
+            new CensusOfDenmark1921(),
+            new CensusOfDenmark1925(),
+            new CensusOfDenmark1930(),
+            new CensusOfDenmark1940(),
+        );
+    }
 
-	/**
-	 * Where did this census occur, in GEDCOM format.
-	 *
-	 * @return string
-	 */
-	public function censusPlace() {
-		return 'Danmark';
-	}
+    /**
+     * Where did this census occur, in GEDCOM format.
+     *
+     * @return string
+     */
+    public function censusPlace() {
+        return 'Danmark';
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfDenmark extends Census implements CensusPlaceInterface {
+class CensusOfDenmark extends Census implements CensusPlaceInterface
+{
 	/**
 	 * All available censuses for this census place.
 	 *
 	 * @return CensusInterface[]
 	 */
-	public function allCensusDates() {
+	public function allCensusDates()
+	{
 		return array(
 			new CensusOfDenmark1787(),
 			new CensusOfDenmark1801(),
@@ -56,7 +58,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function censusPlace() {
+	public function censusPlace()
+	{
 		return 'Danmark';
 	}
 }

app/Census/CensusOfWales1851.php

Indentation +25 added lines, -25 removed lines

@@ -19,30 +19,30 @@
  * Definitions for a census
  */
 class CensusOfWales1851 extends CensusOfWales implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '30 MAR 1851';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '30 MAR 1851';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Name', 'Name and surname'),
-			new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'),
-			new CensusColumnConditionEnglish($this, 'Condition', 'Condition'),
-			new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'),
-			new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'),
-			new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'),
-			new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'),
-			new CensusColumnNull($this, 'Infirm', 'Whether blind or deaf-and-dumb'),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnFullName($this, 'Name', 'Name and surname'),
+            new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'),
+            new CensusColumnConditionEnglish($this, 'Condition', 'Condition'),
+            new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'),
+            new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'),
+            new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'),
+            new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'),
+            new CensusColumnNull($this, 'Infirm', 'Whether blind or deaf-and-dumb'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfWales1851 extends CensusOfWales implements CensusInterface {
+class CensusOfWales1851 extends CensusOfWales implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '30 MAR 1851';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnFullName($this, 'Name', 'Name and surname'),
 			new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'),

app/Census/CensusColumnRelationToHead.php

Indentation +17 added lines, -17 removed lines

@@ -22,21 +22,21 @@
  * Relationshiop to head of household.
  */
 class CensusColumnRelationToHead extends AbstractCensusColumn implements CensusColumnInterface {
-	/**
-	 * Generate the likely value of this census column, based on available information.
-	 *
-	 * @param Individual      $individual
-	 * @param Individual|null $head
-	 *
-	 * @return string
-	 */
-	public function generate(Individual $individual, Individual $head = null) {
-		if ($head === null) {
-			return '';
-		} elseif ($individual == $head) {
-			return 'head';
-		} else {
-			return Functions::getCloseRelationshipName($head, $individual);
-		}
-	}
+    /**
+     * Generate the likely value of this census column, based on available information.
+     *
+     * @param Individual      $individual
+     * @param Individual|null $head
+     *
+     * @return string
+     */
+    public function generate(Individual $individual, Individual $head = null) {
+        if ($head === null) {
+            return '';
+        } elseif ($individual == $head) {
+            return 'head';
+        } else {
+            return Functions::getCloseRelationshipName($head, $individual);
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -21,7 +21,8 @@ 
 /**
  * Relationshiop to head of household.
  */
-class CensusColumnRelationToHead extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnRelationToHead extends AbstractCensusColumn implements CensusColumnInterface
+{
 	/**
 	 * Generate the likely value of this census column, based on available information.
 	 *
@@ -30,7 +31,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function generate(Individual $individual, Individual $head = null) {
+	public function generate(Individual $individual, Individual $head = null)
+	{
 		if ($head === null) {
 			return '';
 		} elseif ($individual == $head) {

app/Census/CensusOfEngland1851.php

Indentation +25 added lines, -25 removed lines

@@ -19,30 +19,30 @@
  * Definitions for a census
  */
 class CensusOfEngland1851 extends CensusOfEngland implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '30 MAR 1851';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '30 MAR 1851';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Name', 'Name and surname'),
-			new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'),
-			new CensusColumnConditionEnglish($this, 'Condition', 'Condition'),
-			new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'),
-			new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'),
-			new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'),
-			new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'),
-			new CensusColumnNull($this, 'Infirm', 'Whether blind or deaf-and-dumb'),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnFullName($this, 'Name', 'Name and surname'),
+            new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'),
+            new CensusColumnConditionEnglish($this, 'Condition', 'Condition'),
+            new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'),
+            new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'),
+            new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'),
+            new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'),
+            new CensusColumnNull($this, 'Infirm', 'Whether blind or deaf-and-dumb'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfEngland1851 extends CensusOfEngland implements CensusInterface {
+class CensusOfEngland1851 extends CensusOfEngland implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '30 MAR 1851';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnFullName($this, 'Name', 'Name and surname'),
 			new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'),

app/Census/CensusColumnInterface.php

Indentation +33 added lines, -33 removed lines

@@ -22,41 +22,41 @@
  * Definitions for a census column
  */
 interface CensusColumnInterface {
-	/**
-	 * A short version of the column's name.
-	 *
-	 * @return string
-	 */
-	public function abbreviation();
+    /**
+     * A short version of the column's name.
+     *
+     * @return string
+     */
+    public function abbreviation();
 
-	/**
-	 * When did this census occur
-	 *
-	 * @return Date
-	 */
-	public function date();
+    /**
+     * When did this census occur
+     *
+     * @return Date
+     */
+    public function date();
 
-	/**
-	 * Generate the likely value of this census column, based on available information.
-	 *
-	 * @param Individual      $individual
-	 * @param Individual|null $head
-	 *
-	 * @return string
-	 */
-	public function generate(Individual $individual, Individual $head = null);
+    /**
+     * Generate the likely value of this census column, based on available information.
+     *
+     * @param Individual      $individual
+     * @param Individual|null $head
+     *
+     * @return string
+     */
+    public function generate(Individual $individual, Individual $head = null);
 
-	/**
-	 * Where did this census occur
-	 *
-	 * @return string
-	 */
-	public function place();
+    /**
+     * Where did this census occur
+     *
+     * @return string
+     */
+    public function place();
 
-	/**
-	 * The full version of the column's name.
-	 *
-	 * @return string
-	 */
-	public function title();
+    /**
+     * The full version of the column's name.
+     *
+     * @return string
+     */
+    public function title();
 }

Braces +2 added lines, -1 removed lines

@@ -21,7 +21,8 @@
 /**
  * Definitions for a census column
  */
-interface CensusColumnInterface {
+interface CensusColumnInterface
+{
 	/**
 	 * A short version of the column's name.
 	 *

app/Census/CensusOfDenmark1870.php

Indentation +31 added lines, -31 removed lines

@@ -19,36 +19,36 @@
  * Definitions for a census
  */
 class CensusOfDenmark1870 extends CensusOfDenmark implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '01 FEB 1870';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '01 FEB 1870';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Navn', ''),
-			new CensusColumnSexMK($this, 'Køn', ''),
-			new CensusColumnAge($this, 'Alder', ''),
-			new CensusColumnConditionDanish($this, 'Civilstand', ''),
-			new CensusColumnReligion($this, 'Religion', ''),
-			new CensusColumnOccupation($this, 'Erhverv', ''),
-			new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnFullName($this, 'Navn', ''),
+            new CensusColumnSexMK($this, 'Køn', ''),
+            new CensusColumnAge($this, 'Alder', ''),
+            new CensusColumnConditionDanish($this, 'Civilstand', ''),
+            new CensusColumnReligion($this, 'Religion', ''),
+            new CensusColumnOccupation($this, 'Erhverv', ''),
+            new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnNull($this, '', ''),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfDenmark1870 extends CensusOfDenmark implements CensusInterface {
+class CensusOfDenmark1870 extends CensusOfDenmark implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '01 FEB 1870';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnFullName($this, 'Navn', ''),
 			new CensusColumnSexMK($this, 'Køn', ''),