fisharebest / webtrees

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', ''),

app/Census/CensusColumnAgeMale5Years.php

Indentation +19 added lines, -19 removed lines

@@ -22,24 +22,24 @@
  * The age of a male individual (rounded down to the nearest 5 years).
  */
 class CensusColumnAgeMale5Years 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 ($individual->getSex() === 'F') {
-			return '';
-		} else {
-			$years = Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
-			if ($years > 15) {
-				$years -= $years % 5;
-			}
+    /**
+     * 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 ($individual->getSex() === 'F') {
+            return '';
+        } else {
+            $years = Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
+            if ($years > 15) {
+                $years -= $years % 5;
+            }
 
-			return (string) $years;
-		}
-	}
+            return (string) $years;
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -21,7 +21,8 @@ 
 /**
  * The age of a male individual (rounded down to the nearest 5 years).
  */
-class CensusColumnAgeMale5Years extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnAgeMale5Years 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 ($individual->getSex() === 'F') {
 			return '';
 		} else {

app/Census/CensusColumnMonthIfMarriedWithinYear.php

Indentation +21 added lines, -21 removed lines

@@ -21,26 +21,26 @@
  * The month of marriage, if within the last year.
  */
 class CensusColumnMonthIfMarriedWithinYear 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) {
-		foreach ($individual->getSpouseFamilies() as $family) {
-			foreach ($family->getFacts('MARR') as $fact) {
-				$marriage_jd = $fact->getDate()->julianDay();
-				$census_jd   = $this->date()->julianDay();
-				if ($marriage_jd <= $census_jd && $marriage_jd >= $census_jd - 365) {
-					// Use the GEDCOM month, as we need this in English - for the US census
-					return ucfirst(strtolower($fact->getDate()->minimumDate()->format('%O')));
-				}
-			}
-		}
+    /**
+     * 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) {
+        foreach ($individual->getSpouseFamilies() as $family) {
+            foreach ($family->getFacts('MARR') as $fact) {
+                $marriage_jd = $fact->getDate()->julianDay();
+                $census_jd   = $this->date()->julianDay();
+                if ($marriage_jd <= $census_jd && $marriage_jd >= $census_jd - 365) {
+                    // Use the GEDCOM month, as we need this in English - for the US census
+                    return ucfirst(strtolower($fact->getDate()->minimumDate()->format('%O')));
+                }
+            }
+        }
 
-		return '';
-	}
+        return '';
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * The month of marriage, if within the last year.
  */
-class CensusColumnMonthIfMarriedWithinYear extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnMonthIfMarriedWithinYear 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)
+	{
 		foreach ($individual->getSpouseFamilies() as $family) {
 			foreach ($family->getFacts('MARR') as $fact) {
 				$marriage_jd = $fact->getDate()->julianDay();

app/Census/CensusColumnBirthDate.php

Indentation +11 added lines, -11 removed lines

@@ -21,15 +21,15 @@
  * The individual's date of birth.
  */
 class CensusColumnBirthDate 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) {
-		return $individual->getEstimatedBirthDate()->minimumDate()->format('%j %n %Y');
-	}
+    /**
+     * 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) {
+        return $individual->getEstimatedBirthDate()->minimumDate()->format('%j %n %Y');
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * The individual's date of birth.
  */
-class CensusColumnBirthDate extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnBirthDate 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)
+	{
 		return $individual->getEstimatedBirthDate()->minimumDate()->format('%j %n %Y');
 	}
 }

app/Census/CensusOfDeutschland1867.php

Indentation +48 added lines, -48 removed lines

@@ -19,54 +19,54 @@
  * Definitions for a census
  */
 class CensusOfDeutschland1867 extends CensusOfDeutschland implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '03 DEC 1867';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '03 DEC 1867';
+    }
 
-	/**
-	 * Where did this census occur, in GEDCOM format.
-	 *
-	 * @return string
-	 */
-	public function censusPlace() {
-		return 'Mecklenburg-Schwerin, Deutschland';
-	}	
+    /**
+     * Where did this census occur, in GEDCOM format.
+     *
+     * @return string
+     */
+    public function censusPlace() {
+        return 'Mecklenburg-Schwerin, Deutschland';
+    }	
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnNull($this, '1.Nr.', 'Ordnungs-Nummer (1-15).'),
-			new CensusColumnGivenNames($this, '2.Vorname', 'I. Vor- und Familien-Name jeder Person. Vorname'),
-			new CensusColumnSurname($this, '3.Familienname', 'I. Vor- und Familien-Name jeder Person. Familienname.'),
-			new CensusColumnNull($this, '4.männlich', 'II. Geschlecht männlich.'),
-			new CensusColumnNull($this, '5.weiblich', 'II. Geschlecht weiblich.'),
-			new CensusColumnBirthYear($this, '6.Geburtsjahr', 'III. Alter.'),
-			new CensusColumnReligion($this, '7.Religion', 'IV. Religionsbekenntnis.'),
-			new CensusColumnNull($this, '8.ledig', 'V. Familienstand. ledig.'),
-			new CensusColumnNull($this, '9.verehelicht', 'V. Familienstand. verehelicht.'),
-			new CensusColumnNull($this, '10.verwittwet', 'V. Familienstand. verwittwet.'),
-			new CensusColumnNull($this, '11.geschieden', 'V. Familienstand. geschieden.'),
-			new CensusColumnRelationToHeadGerman($this, '12.Stellung', 'V. Familienstand. Verhältnis der Familienglieder zum Haushaltungsvorstand.'),
-			new CensusColumnOccupation($this, '13.Stand/Beruf', 'VI. Stand, Beruf oder Vorbereitung zum Beruf, Arbeits- und Dienstverhältnis.'),
-			new CensusColumnNull($this, '14.StA_M-S', 'VII. Staatsangehörigkeit. Mecklenburg-Schwerinscher Unterthan.'),
-			new CensusColumnNull($this, '15.StA', 'VII. Staatsangehörigkeit. Anderen Staaten angehörig. Welchem Staat?'),
-			new CensusColumnNull($this, '16.', 'VIII. Art des Aufenthalts am Zählungsort. Norddeutscher und Zollvereins- See- und Flußschiffer.'),
-			new CensusColumnNull($this, '17.', 'VIII. Art des Aufenthalts am Zählungsort. Reisender im Gasthof.'),
-			new CensusColumnNull($this, '18.', 'VIII. Art des Aufenthalts am Zählungsort. Gast der Familie (zum Besuch aus).'),
-			new CensusColumnNull($this, '19.', 'VIII. Art des Aufenthalts am Zählungsort. Alle übrigen Anwesenden.'),
-			new CensusColumnNull($this, '20.blind', 'IX. Besondere Mängel einzelner Individuen. blind auf beiden Augen.'),
-			new CensusColumnNull($this, '21.taubstumm', 'IX. Besondere Mängel einzelner Individuen. taubstumm.'),
-			new CensusColumnNull($this, '22.blödsinnig', 'IX. Besondere Mängel einzelner Individuen. blödsinnig.'),
-			new CensusColumnNull($this, '23.irrsinnig', 'IX. Besondere Mängel einzelner Individuen. irrsinnig.'),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnNull($this, '1.Nr.', 'Ordnungs-Nummer (1-15).'),
+            new CensusColumnGivenNames($this, '2.Vorname', 'I. Vor- und Familien-Name jeder Person. Vorname'),
+            new CensusColumnSurname($this, '3.Familienname', 'I. Vor- und Familien-Name jeder Person. Familienname.'),
+            new CensusColumnNull($this, '4.männlich', 'II. Geschlecht männlich.'),
+            new CensusColumnNull($this, '5.weiblich', 'II. Geschlecht weiblich.'),
+            new CensusColumnBirthYear($this, '6.Geburtsjahr', 'III. Alter.'),
+            new CensusColumnReligion($this, '7.Religion', 'IV. Religionsbekenntnis.'),
+            new CensusColumnNull($this, '8.ledig', 'V. Familienstand. ledig.'),
+            new CensusColumnNull($this, '9.verehelicht', 'V. Familienstand. verehelicht.'),
+            new CensusColumnNull($this, '10.verwittwet', 'V. Familienstand. verwittwet.'),
+            new CensusColumnNull($this, '11.geschieden', 'V. Familienstand. geschieden.'),
+            new CensusColumnRelationToHeadGerman($this, '12.Stellung', 'V. Familienstand. Verhältnis der Familienglieder zum Haushaltungsvorstand.'),
+            new CensusColumnOccupation($this, '13.Stand/Beruf', 'VI. Stand, Beruf oder Vorbereitung zum Beruf, Arbeits- und Dienstverhältnis.'),
+            new CensusColumnNull($this, '14.StA_M-S', 'VII. Staatsangehörigkeit. Mecklenburg-Schwerinscher Unterthan.'),
+            new CensusColumnNull($this, '15.StA', 'VII. Staatsangehörigkeit. Anderen Staaten angehörig. Welchem Staat?'),
+            new CensusColumnNull($this, '16.', 'VIII. Art des Aufenthalts am Zählungsort. Norddeutscher und Zollvereins- See- und Flußschiffer.'),
+            new CensusColumnNull($this, '17.', 'VIII. Art des Aufenthalts am Zählungsort. Reisender im Gasthof.'),
+            new CensusColumnNull($this, '18.', 'VIII. Art des Aufenthalts am Zählungsort. Gast der Familie (zum Besuch aus).'),
+            new CensusColumnNull($this, '19.', 'VIII. Art des Aufenthalts am Zählungsort. Alle übrigen Anwesenden.'),
+            new CensusColumnNull($this, '20.blind', 'IX. Besondere Mängel einzelner Individuen. blind auf beiden Augen.'),
+            new CensusColumnNull($this, '21.taubstumm', 'IX. Besondere Mängel einzelner Individuen. taubstumm.'),
+            new CensusColumnNull($this, '22.blödsinnig', 'IX. Besondere Mängel einzelner Individuen. blödsinnig.'),
+            new CensusColumnNull($this, '23.irrsinnig', 'IX. Besondere Mängel einzelner Individuen. irrsinnig.'),
+        );
+    }
 }

Braces +8 added lines, -4 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfDeutschland1867 extends CensusOfDeutschland implements CensusInterface {
+class CensusOfDeutschland1867 extends CensusOfDeutschland implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '03 DEC 1867';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function censusPlace() {
+	public function censusPlace()
+	{
 		return 'Mecklenburg-Schwerin, Deutschland';
 	}	
 
@@ -42,7 +45,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnNull($this, '1.Nr.', 'Ordnungs-Nummer (1-15).'),
 			new CensusColumnGivenNames($this, '2.Vorname', 'I. Vor- und Familien-Name jeder Person. Vorname'),

app/Census/CensusOfDenmark1911.php

Indentation +32 added lines, -32 removed lines

@@ -19,37 +19,37 @@
  * Definitions for a census
  */
 class CensusOfDenmark1911 extends CensusOfDenmark implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '01 FEB 1911';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '01 FEB 1911';
+    }
 
-	/**
-	 * 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 CensusColumnBirthDaySlashMonthYear($this, 'Fødselsdag', 'Føderlsaar og Føderladag.'),
-			new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U), Gift (G), Enkemand eller Enke (E), Separeret (S), Fraskilt (F).'),
-			new CensusColumnReligion($this, 'Trossamfund', 'Trossamfund (Folkekirken eller Navnet paa det Trossamfund, man tilhører, eller „udenfor Trossamfund“).'),
-			new CensusColumnBirthPlace($this, 'Fødested', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnRelationToHead($this, 'Stilling i familien', 'Stilling i Familien: Husfader, Husmoder, Barn, Slangtning o.l., Tjenestetyende, Logerende, Pensioner'),
-			new CensusColumnOccupation($this, 'Erhverv', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-			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 CensusColumnBirthDaySlashMonthYear($this, 'Fødselsdag', 'Føderlsaar og Føderladag.'),
+            new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U), Gift (G), Enkemand eller Enke (E), Separeret (S), Fraskilt (F).'),
+            new CensusColumnReligion($this, 'Trossamfund', 'Trossamfund (Folkekirken eller Navnet paa det Trossamfund, man tilhører, eller „udenfor Trossamfund“).'),
+            new CensusColumnBirthPlace($this, 'Fødested', ''),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnRelationToHead($this, 'Stilling i familien', 'Stilling i Familien: Husfader, Husmoder, Barn, Slangtning o.l., Tjenestetyende, Logerende, Pensioner'),
+            new CensusColumnOccupation($this, 'Erhverv', ''),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnNull($this, 'Anmærkninger', 'Anmærkninger.'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfDenmark1911 extends CensusOfDenmark implements CensusInterface {
+class CensusOfDenmark1911 extends CensusOfDenmark implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '01 FEB 1911';
 	}
 
@@ -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/CensusColumnSexMZ.php

Indentation +2 added lines, -2 removed lines

@@ -19,6 +19,6 @@
  * The individual's sex.
  */
 class CensusColumnSexMZ extends CensusColumnSexMF {
-	/* Text to display for female individuals */
-	protected $female = 'Ž';
+    /* Text to display for female individuals */
+    protected $female = 'Ž';
 }

Braces +2 added lines, -1 removed lines

@@ -18,7 +18,8 @@
 /**
  * The individual's sex.
  */
-class CensusColumnSexMZ extends CensusColumnSexMF {
+class CensusColumnSexMZ extends CensusColumnSexMF
+{
 	/* Text to display for female individuals */
 	protected $female = 'Ž';
 }

app/Census/CensusOfFrance1896.php

Indentation +23 added lines, -23 removed lines

@@ -19,28 +19,28 @@
  * Definitions for a census
  */
 class CensusOfFrance1896 extends CensusOfFrance implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '16 JAN 1896';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '16 JAN 1896';
+    }
 
-	/**
-	 * 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 CensusColumnAge($this, 'Âge', ''),
-			new CensusColumnNationality($this, 'Nationalité', ''),
-			new CensusColumnOccupation($this, 'Profession', ''),
-			new CensusColumnRelationToHead($this, 'Position', 'Position dans le ménage'),
-		);
-	}
+    /**
+     * 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 CensusColumnAge($this, 'Âge', ''),
+            new CensusColumnNationality($this, 'Nationalité', ''),
+            new CensusColumnOccupation($this, 'Profession', ''),
+            new CensusColumnRelationToHead($this, 'Position', 'Position dans le ménage'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfFrance1896 extends CensusOfFrance implements CensusInterface {
+class CensusOfFrance1896 extends CensusOfFrance implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '16 JAN 1896';
 	}
 
@@ -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/CensusColumnNull.php

Indentation +11 added lines, -11 removed lines

@@ -21,15 +21,15 @@
  * A column that we cannot generate.
  */
 class CensusColumnNull 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) {
-		return '';
-	}
+    /**
+     * 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) {
+        return '';
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * A column that we cannot generate.
  */
-class CensusColumnNull extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnNull 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)
+	{
 		return '';
 	}
 }