fisharebest / webtrees

app/Census/CensusOfUnitedStates1920.php

Indentation +41 added lines, -41 removed lines

@@ -19,46 +19,46 @@
  * Definitions for a census
  */
 class CensusOfUnitedStates1920 extends CensusOfUnitedStates implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return 'JAN 1920';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return 'JAN 1920';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnSurnameGivenNameInitial($this, 'Name', 'Name'),
-			new CensusColumnRelationToHead($this, 'Relation', 'Relationship of each person to the head of the family'),
-			new CensusColumnNull($this, 'Home', 'Owned or rented'),
-			new CensusColumnNull($this, 'Mort', 'If owned, free or mortgaged'),
-			new CensusColumnSexMF($this, 'Sex', 'Sex'),
-			new CensusColumnNull($this, 'Race', 'Color or race'),
-			new CensusColumnAge($this, 'Age', 'Age at last birthday'),
-			new CensusColumnConditionUs($this, 'Condition', 'Whether single, married, widowed, or divorced'),
-			new CensusColumnNull($this, 'Imm', 'Year of immigration to the United States'),
-			new CensusColumnNull($this, 'Nat', 'Naturalized or alien'),
-			new CensusColumnNull($this, 'NatY', 'If naturalized, year of naturalization'),
-			new CensusColumnNull($this, 'School', 'Attended school since Sept. 1, 1919'),
-			new CensusColumnNull($this, 'R', 'Whether able to read'),
-			new CensusColumnNull($this, 'W', 'Whether able to write'),
-			new CensusColumnBirthPlaceSimple($this, 'BP', 'Place of birth'),
-			new CensusColumnNull($this, 'Lang', 'Mother tongue'),
-			new CensusColumnFatherBirthPlaceSimple($this, 'FBP', 'Place of birth of father'),
-			new CensusColumnNull($this, 'Father lang', 'Mother tongue of father'),
-			new CensusColumnFatherBirthPlaceSimple($this, 'MBP', 'Place of birth of mother'),
-			new CensusColumnNull($this, 'Mother lang', 'Mother tongue of mother'),
-			new CensusColumnNull($this, 'Eng', 'Whether able to speak English'),
-			new CensusColumnOccupation($this, 'Occupation', 'Trade, profession, or particular kind of work done'),
-			new CensusColumnNull($this, 'Ind', 'Industry, business of establishment in which at work'),
-			new CensusColumnNull($this, 'Emp', 'Employer, salary or wage worker, or work on own account'),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnSurnameGivenNameInitial($this, 'Name', 'Name'),
+            new CensusColumnRelationToHead($this, 'Relation', 'Relationship of each person to the head of the family'),
+            new CensusColumnNull($this, 'Home', 'Owned or rented'),
+            new CensusColumnNull($this, 'Mort', 'If owned, free or mortgaged'),
+            new CensusColumnSexMF($this, 'Sex', 'Sex'),
+            new CensusColumnNull($this, 'Race', 'Color or race'),
+            new CensusColumnAge($this, 'Age', 'Age at last birthday'),
+            new CensusColumnConditionUs($this, 'Condition', 'Whether single, married, widowed, or divorced'),
+            new CensusColumnNull($this, 'Imm', 'Year of immigration to the United States'),
+            new CensusColumnNull($this, 'Nat', 'Naturalized or alien'),
+            new CensusColumnNull($this, 'NatY', 'If naturalized, year of naturalization'),
+            new CensusColumnNull($this, 'School', 'Attended school since Sept. 1, 1919'),
+            new CensusColumnNull($this, 'R', 'Whether able to read'),
+            new CensusColumnNull($this, 'W', 'Whether able to write'),
+            new CensusColumnBirthPlaceSimple($this, 'BP', 'Place of birth'),
+            new CensusColumnNull($this, 'Lang', 'Mother tongue'),
+            new CensusColumnFatherBirthPlaceSimple($this, 'FBP', 'Place of birth of father'),
+            new CensusColumnNull($this, 'Father lang', 'Mother tongue of father'),
+            new CensusColumnFatherBirthPlaceSimple($this, 'MBP', 'Place of birth of mother'),
+            new CensusColumnNull($this, 'Mother lang', 'Mother tongue of mother'),
+            new CensusColumnNull($this, 'Eng', 'Whether able to speak English'),
+            new CensusColumnOccupation($this, 'Occupation', 'Trade, profession, or particular kind of work done'),
+            new CensusColumnNull($this, 'Ind', 'Industry, business of establishment in which at work'),
+            new CensusColumnNull($this, 'Emp', 'Employer, salary or wage worker, or work on own account'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfUnitedStates1920 extends CensusOfUnitedStates implements CensusInterface {
+class CensusOfUnitedStates1920 extends CensusOfUnitedStates implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return 'JAN 1920';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnSurnameGivenNameInitial($this, 'Name', 'Name'),
 			new CensusColumnRelationToHead($this, 'Relation', 'Relationship of each person to the head of the family'),

app/Census/CensusOfDenmark1803.php

Indentation +30 added lines, -30 removed lines

@@ -19,36 +19,36 @@
  * Definitions for a census
  */
 class CensusOfDenmark1803 extends CensusOfDenmark implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '01 FEB 1803';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '01 FEB 1803';
+    }
 
-	/**
-	 * Where did this census occur, in GEDCOM format.
-	 *
-	 * @return string
-	 */
-	public function censusPlace() {
-		return 'Schleswig-Holstein, Deutschland';
-	}
+    /**
+     * Where did this census occur, in GEDCOM format.
+     *
+     * @return string
+     */
+    public function censusPlace() {
+        return 'Schleswig-Holstein, Deutschland';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Navn', ''),
-			new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
-			new CensusColumnAge($this, 'Alder', ''),
-			new CensusColumnConditionDanish($this, 'Civilstand', ''),
-			new CensusColumnOccupation($this, 'Erhverv', ''),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnFullName($this, 'Navn', ''),
+            new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+            new CensusColumnAge($this, 'Alder', ''),
+            new CensusColumnConditionDanish($this, 'Civilstand', ''),
+            new CensusColumnOccupation($this, 'Erhverv', ''),
+        );
+    }
 }

Braces +8 added lines, -4 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfDenmark1803 extends CensusOfDenmark implements CensusInterface {
+class CensusOfDenmark1803 extends CensusOfDenmark implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '01 FEB 1803';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function censusPlace() {
+	public function censusPlace()
+	{
 		return 'Schleswig-Holstein, Deutschland';
 	}
 
@@ -42,7 +45,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnFullName($this, 'Navn', ''),
 			new CensusColumnRelationToHead($this, 'Stilling i familien', ''),

app/Census/CensusOfDenmark1925.php

Indentation +28 added lines, -28 removed lines

@@ -19,33 +19,33 @@
  * Definitions for a census
  */
 class CensusOfDenmark1925 extends CensusOfDenmark implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '05 NOV 1925';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '05 NOV 1925';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Navn', 'Samtlige Personers Navn (ogsaa Fornavn). Ved Børn, endnu uden Navn, sættes „Dreng“ eller „Pige“. Midlertidig fraværerade Personer anføres ikke her, men paa Skemaeta Bagside)'),
-			new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M) eller Kvindekøn (K).'),
-			new CensusColumnBirthDaySlashMonth($this, 'Fødselsdag', ''),
-			new CensusColumnBirthYear($this, 'Fødselsaar', ''),
-			new CensusColumnBirthPlace($this, 'Fødested', ''),
-			new CensusColumnNull($this, 'Statsbergerferhold', ''),
-			new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U), Gift (G), Enkemand eller Enke (E), Separeret (S), Fraskilt (F).'),
-			new CensusColumnRelationToHead($this, 'Stilling i familien', 'Stilling i Familien: Husfader, Husmoder, Barn, Slangtning o.l., Tjenestetyende, Logerende, Pensioner'),
-			new CensusColumnOccupation($this, 'Erhverv', 'Erhverv eller Livsstilling'),
-			new CensusColumnNull($this, 'Bopæl', 'Bopæl den 5. Novbr. 1924'),
-			new CensusColumnNull($this, 'Anmærkninger', 'Anmærkninger'),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnFullName($this, 'Navn', 'Samtlige Personers Navn (ogsaa Fornavn). Ved Børn, endnu uden Navn, sættes „Dreng“ eller „Pige“. Midlertidig fraværerade Personer anføres ikke her, men paa Skemaeta Bagside)'),
+            new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M) eller Kvindekøn (K).'),
+            new CensusColumnBirthDaySlashMonth($this, 'Fødselsdag', ''),
+            new CensusColumnBirthYear($this, 'Fødselsaar', ''),
+            new CensusColumnBirthPlace($this, 'Fødested', ''),
+            new CensusColumnNull($this, 'Statsbergerferhold', ''),
+            new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U), Gift (G), Enkemand eller Enke (E), Separeret (S), Fraskilt (F).'),
+            new CensusColumnRelationToHead($this, 'Stilling i familien', 'Stilling i Familien: Husfader, Husmoder, Barn, Slangtning o.l., Tjenestetyende, Logerende, Pensioner'),
+            new CensusColumnOccupation($this, 'Erhverv', 'Erhverv eller Livsstilling'),
+            new CensusColumnNull($this, 'Bopæl', 'Bopæl den 5. Novbr. 1924'),
+            new CensusColumnNull($this, 'Anmærkninger', 'Anmærkninger'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfDenmark1925 extends CensusOfDenmark implements CensusInterface {
+class CensusOfDenmark1925 extends CensusOfDenmark implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '05 NOV 1925';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnFullName($this, 'Navn', 'Samtlige Personers Navn (ogsaa Fornavn). Ved Børn, endnu uden Navn, sættes „Dreng“ eller „Pige“. Midlertidig fraværerade Personer anføres ikke her, men paa Skemaeta Bagside)'),
 			new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M) eller Kvindekøn (K).'),

app/Census/CensusOfEngland1871.php

Indentation +25 added lines, -25 removed lines

@@ -19,30 +19,30 @@
  * Definitions for a census
  */
 class CensusOfEngland1871 extends CensusOfEngland implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '02 APR 1871';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '02 APR 1871';
+    }
 
-	/**
-	 * 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 deaf-and-dumb, blind, imbecile, idiot or lunatic'),
-		);
-	}
+    /**
+     * 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 deaf-and-dumb, blind, imbecile, idiot or lunatic'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfEngland1871 extends CensusOfEngland implements CensusInterface {
+class CensusOfEngland1871 extends CensusOfEngland implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '02 APR 1871';
 	}
 
@@ -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/CensusOfEngland1841.php

Indentation +23 added lines, -23 removed lines

@@ -19,28 +19,28 @@
  * Definitions for a census
  */
 class CensusOfEngland1841 extends CensusOfEngland implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '06 JUN 1841';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '06 JUN 1841';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Name', 'Name'),
-			new CensusColumnAgeMale5Years($this, 'AgeM', 'Age (males)'),
-			new CensusColumnAgeFemale5Years($this, 'AgeF', 'Age (females)'),
-			new CensusColumnOccupation($this, 'Occupation', 'Profession, trade, employment or of independent means'),
-			new CensusColumnNull($this, 'BiC', 'Born in same county'),
-			new CensusColumnBornForeignParts($this, 'SIF', 'Born in Scotland, Ireland or foreign parts'),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnFullName($this, 'Name', 'Name'),
+            new CensusColumnAgeMale5Years($this, 'AgeM', 'Age (males)'),
+            new CensusColumnAgeFemale5Years($this, 'AgeF', 'Age (females)'),
+            new CensusColumnOccupation($this, 'Occupation', 'Profession, trade, employment or of independent means'),
+            new CensusColumnNull($this, 'BiC', 'Born in same county'),
+            new CensusColumnBornForeignParts($this, 'SIF', 'Born in Scotland, Ireland or foreign parts'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfEngland1841 extends CensusOfEngland implements CensusInterface {
+class CensusOfEngland1841 extends CensusOfEngland implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '06 JUN 1841';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnFullName($this, 'Name', 'Name'),
 			new CensusColumnAgeMale5Years($this, 'AgeM', 'Age (males)'),

app/Census/CensusOfFrance1831.php

Indentation +27 added lines, -27 removed lines

@@ -19,32 +19,32 @@
  * Definitions for a census
  */
 class CensusOfFrance1831 extends CensusOfFrance implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '20 JAN 1831';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '20 JAN 1831';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
-			new CensusColumnGivenNames($this, 'Prénoms', ''),
-			new CensusColumnOccupation($this, 'Titres', 'Titres, qualifications, état ou profession et fonctions'),
-			new CensusColumnConditionFrenchGarcon($this, 'Garçons', ''),
-			new CensusColumnConditionFrenchHomme($this, 'Hommes', 'Hommes mariés'),
-			new CensusColumnConditionFrenchVeuf($this, 'Veufs', ''),
-			new CensusColumnConditionFrenchFille($this, 'Filles', ''),
-			new CensusColumnConditionFrenchFemme($this, 'Femmes', 'Femmes mariées'),
-			new CensusColumnConditionFrenchVeuve($this, 'Veuves', ''),
-			new CensusColumnAge($this, 'Âge', ''),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+            new CensusColumnGivenNames($this, 'Prénoms', ''),
+            new CensusColumnOccupation($this, 'Titres', 'Titres, qualifications, état ou profession et fonctions'),
+            new CensusColumnConditionFrenchGarcon($this, 'Garçons', ''),
+            new CensusColumnConditionFrenchHomme($this, 'Hommes', 'Hommes mariés'),
+            new CensusColumnConditionFrenchVeuf($this, 'Veufs', ''),
+            new CensusColumnConditionFrenchFille($this, 'Filles', ''),
+            new CensusColumnConditionFrenchFemme($this, 'Femmes', 'Femmes mariées'),
+            new CensusColumnConditionFrenchVeuve($this, 'Veuves', ''),
+            new CensusColumnAge($this, 'Âge', ''),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfFrance1831 extends CensusOfFrance implements CensusInterface {
+class CensusOfFrance1831 extends CensusOfFrance implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '20 JAN 1831';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
 			new CensusColumnGivenNames($this, 'Prénoms', ''),

app/Census/CensusColumnFullName.php

Indentation +40 added lines, -40 removed lines

@@ -22,48 +22,48 @@
  * The individual's full name.
  */
 class CensusColumnFullName 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) {
-		$name = $this->nameAtCensusDate($individual, $this->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) {
+        $name = $this->nameAtCensusDate($individual, $this->date());
 
-		return strip_tags($name['full']);
-	}
+        return strip_tags($name['full']);
+    }
 
-	/**
-	 * What was an individual's likely name on a given date, allowing
-	 * for marriages and married names.
-	 *
-	 * @param Individual $individual
-	 * @param Date       $census_date
-	 *
-	 * @return string[]
-	 */
-	protected function nameAtCensusDate(Individual $individual, Date $census_date) {
-		$names = $individual->getAllNames();
-		$name  = $names[0];
+    /**
+     * What was an individual's likely name on a given date, allowing
+     * for marriages and married names.
+     *
+     * @param Individual $individual
+     * @param Date       $census_date
+     *
+     * @return string[]
+     */
+    protected function nameAtCensusDate(Individual $individual, Date $census_date) {
+        $names = $individual->getAllNames();
+        $name  = $names[0];
 
-		foreach ($individual->getSpouseFamilies() as $family) {
-			foreach ($family->getFacts('MARR') as $marriage) {
-				if ($marriage->getDate()->isOK() && Date::compare($marriage->getDate(), $census_date) < 0) {
-					$spouse = $family->getSpouse($individual);
-					foreach ($names as $individual_name) {
-						foreach ($spouse->getAllNames() as $spouse_name) {
-							if ($individual_name['type'] === '_MARNM' && $individual_name['surn'] === $spouse_name['surn']) {
-								return $individual_name;
-							}
-						}
-					}
-				}
-			}
-		}
+        foreach ($individual->getSpouseFamilies() as $family) {
+            foreach ($family->getFacts('MARR') as $marriage) {
+                if ($marriage->getDate()->isOK() && Date::compare($marriage->getDate(), $census_date) < 0) {
+                    $spouse = $family->getSpouse($individual);
+                    foreach ($names as $individual_name) {
+                        foreach ($spouse->getAllNames() as $spouse_name) {
+                            if ($individual_name['type'] === '_MARNM' && $individual_name['surn'] === $spouse_name['surn']) {
+                                return $individual_name;
+                            }
+                        }
+                    }
+                }
+            }
+        }
 
-		return $name;
-	}
+        return $name;
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -21,7 +21,8 @@ 
 /**
  * The individual's full name.
  */
-class CensusColumnFullName extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnFullName 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)
+	{
 		$name = $this->nameAtCensusDate($individual, $this->date());
 
 		return strip_tags($name['full']);
@@ -45,7 +47,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	protected function nameAtCensusDate(Individual $individual, Date $census_date) {
+	protected function nameAtCensusDate(Individual $individual, Date $census_date)
+	{
 		$names = $individual->getAllNames();
 		$name  = $names[0];
 

app/Census/CensusColumnFatherForeign.php

Indentation +16 added lines, -16 removed lines

@@ -21,21 +21,21 @@
  * Is the individual's father a foreigner.
  */
 class CensusColumnFatherForeign 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) {
-		$father = $this->father($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) {
+        $father = $this->father($individual);
 
-		if ($father && $this->lastPartOfPlace($father->getBirthPlace()) !== $this->place()) {
-			return 'Y';
-		} else {
-			return '';
-		}
-	}
+        if ($father && $this->lastPartOfPlace($father->getBirthPlace()) !== $this->place()) {
+            return 'Y';
+        } else {
+            return '';
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * Is the individual's father a foreigner.
  */
-class CensusColumnFatherForeign extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnFatherForeign extends AbstractCensusColumn implements CensusColumnInterface
+{
 	/**
 	 * Generate the likely value of this census column, based on available information.
 	 *
@@ -29,7 +30,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function generate(Individual $individual, Individual $head = null) {
+	public function generate(Individual $individual, Individual $head = null)
+	{
 		$father = $this->father($individual);
 
 		if ($father && $this->lastPartOfPlace($father->getBirthPlace()) !== $this->place()) {

app/Census/CensusOfWales.php

Indentation +26 added lines, -26 removed lines

@@ -19,31 +19,31 @@
  * Definitions for a census
  */
 class CensusOfWales extends Census implements CensusPlaceInterface {
-	/**
-	 * All available censuses for this census place.
-	 *
-	 * @return CensusInterface[]
-	 */
-	public function allCensusDates() {
-		return array(
-			new CensusOfWales1841(),
-			new CensusOfWales1851(),
-			new CensusOfWales1861(),
-			new CensusOfWales1871(),
-			new CensusOfWales1881(),
-			new CensusOfWales1891(),
-			new CensusOfWales1901(),
-			new CensusOfWales1911(),
-			new RegisterOfWales1939(),
-		);
-	}
+    /**
+     * All available censuses for this census place.
+     *
+     * @return CensusInterface[]
+     */
+    public function allCensusDates() {
+        return array(
+            new CensusOfWales1841(),
+            new CensusOfWales1851(),
+            new CensusOfWales1861(),
+            new CensusOfWales1871(),
+            new CensusOfWales1881(),
+            new CensusOfWales1891(),
+            new CensusOfWales1901(),
+            new CensusOfWales1911(),
+            new RegisterOfWales1939(),
+        );
+    }
 
-	/**
-	 * Where did this census occur, in GEDCOM format.
-	 *
-	 * @return string
-	 */
-	public function censusPlace() {
-		return 'Wales';
-	}
+    /**
+     * Where did this census occur, in GEDCOM format.
+     *
+     * @return string
+     */
+    public function censusPlace() {
+        return 'Wales';
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfWales extends Census implements CensusPlaceInterface {
+class CensusOfWales extends Census implements CensusPlaceInterface
+{
 	/**
 	 * All available censuses for this census place.
 	 *
 	 * @return CensusInterface[]
 	 */
-	public function allCensusDates() {
+	public function allCensusDates()
+	{
 		return array(
 			new CensusOfWales1841(),
 			new CensusOfWales1851(),
@@ -43,7 +45,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function censusPlace() {
+	public function censusPlace()
+	{
 		return 'Wales';
 	}
 }