fisharebest / webtrees

app/Census/CensusColumnBirthPlaceSimple.php

Indentation +11 added lines, -11 removed lines

@@ -21,15 +21,15 @@
  * The individual's birth place.
  */
 class CensusColumnBirthPlaceSimple extends CensusColumnBirthPlace 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 $this->lastPartOfPlace(parent::generate($individual, $head));
-	}
+    /**
+     * 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 $this->lastPartOfPlace(parent::generate($individual, $head));
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * The individual's birth place.
  */
-class CensusColumnBirthPlaceSimple extends CensusColumnBirthPlace implements CensusColumnInterface {
+class CensusColumnBirthPlaceSimple extends CensusColumnBirthPlace 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 $this->lastPartOfPlace(parent::generate($individual, $head));
 	}
 }

app/Census/CensusColumnChildrenDied.php

Indentation +28 added lines, -28 removed lines

@@ -22,34 +22,34 @@
  * The number of children who have died.
  */
 class CensusColumnChildrenDied 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 '';
-		}
+    /**
+     * 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 '';
+        }
 
-		$count = 0;
-		foreach ($individual->getSpouseFamilies() as $family) {
-			foreach ($family->getChildren() as $child) {
-				if (
-					$child->getBirthDate()->isOK() &&
-					Date::compare($child->getBirthDate(), $this->date()) < 0 &&
-					$child->getBirthDate() != $child->getDeathDate() &&
-					$child->getDeathDate()->isOK() &&
-					Date::compare($child->getDeathDate(), $this->date()) < 0
-				) {
-					$count++;
-				}
-			}
-		}
+        $count = 0;
+        foreach ($individual->getSpouseFamilies() as $family) {
+            foreach ($family->getChildren() as $child) {
+                if (
+                    $child->getBirthDate()->isOK() &&
+                    Date::compare($child->getBirthDate(), $this->date()) < 0 &&
+                    $child->getBirthDate() != $child->getDeathDate() &&
+                    $child->getDeathDate()->isOK() &&
+                    Date::compare($child->getDeathDate(), $this->date()) < 0
+                ) {
+                    $count++;
+                }
+            }
+        }
 
-		return (string) $count;
-	}
+        return (string) $count;
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -21,7 +21,8 @@ 
 /**
  * The number of children who have died.
  */
-class CensusColumnChildrenDied extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnChildrenDied 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 '';
 		}

app/Census/CensusOfFrance1911.php

Indentation +25 added lines, -25 removed lines

@@ -19,30 +19,30 @@
  * Definitions for a census
  */
 class CensusOfFrance1911 extends CensusOfFrance implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '19 JAN 1911';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '19 JAN 1911';
+    }
 
-	/**
-	 * 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 CensusColumnBirthYear($this, 'Année', 'Année de naissance'),
-			new CensusColumnBirthPlace($this, 'Lieu', 'Lieu de naissance'),
-			new CensusColumnNationality($this, 'Nationalité', ''),
-			new CensusColumnRelationToHead($this, 'Situation', 'Situation par rapport au chef de ménage'),
-			new CensusColumnOccupation($this, 'Profession', ''),
-			new CensusColumnNull($this, 'Empl', ''),
-		);
-	}
+    /**
+     * 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 CensusColumnBirthYear($this, 'Année', 'Année de naissance'),
+            new CensusColumnBirthPlace($this, 'Lieu', 'Lieu de naissance'),
+            new CensusColumnNationality($this, 'Nationalité', ''),
+            new CensusColumnRelationToHead($this, 'Situation', 'Situation par rapport au chef de ménage'),
+            new CensusColumnOccupation($this, 'Profession', ''),
+            new CensusColumnNull($this, 'Empl', ''),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

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

Indentation +23 added lines, -23 removed lines

@@ -19,28 +19,28 @@
  * Definitions for a census
  */
 class CensusOfFrance1886 extends CensusOfFrance implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '21 JAN 1886';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '21 JAN 1886';
+    }
 
-	/**
-	 * 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 CensusOfFrance1886 extends CensusOfFrance implements CensusInterface {
+class CensusOfFrance1886 extends CensusOfFrance implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '21 JAN 1886';
 	}
 
@@ -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/CensusOfDenmark1906.php

Indentation +31 added lines, -31 removed lines

@@ -19,36 +19,36 @@
  * Definitions for a census
  */
 class CensusOfDenmark1906 extends CensusOfDenmark implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '01 FEB 1906';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '01 FEB 1906';
+    }
 
-	/**
-	 * 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, '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, 'Anmærkninger', 'Anmærkninger.'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

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

Indentation +20 added lines, -20 removed lines

@@ -22,25 +22,25 @@
  * At what age did the individual marry.
  */
 class CensusColumnAgeMarried 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->getBirthDate()->isOK()) {
-			foreach ($individual->getSpouseFamilies() as $family) {
-				foreach ($family->getFacts('MARR', true) as $fact) {
-					if ($fact->getDate()->isOK()) {
-						return Date::getAge($individual->getBirthDate(), $fact->getDate(), 0);
-					}
-				}
-			}
-		}
+    /**
+     * 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->getBirthDate()->isOK()) {
+            foreach ($individual->getSpouseFamilies() as $family) {
+                foreach ($family->getFacts('MARR', true) as $fact) {
+                    if ($fact->getDate()->isOK()) {
+                        return Date::getAge($individual->getBirthDate(), $fact->getDate(), 0);
+                    }
+                }
+            }
+        }
 
-		return '';
-	}
+        return '';
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -21,7 +21,8 @@ 
 /**
  * At what age did the individual marry.
  */
-class CensusColumnAgeMarried extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnAgeMarried 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->getBirthDate()->isOK()) {
 			foreach ($individual->getSpouseFamilies() as $family) {
 				foreach ($family->getFacts('MARR', true) as $fact) {

app/Census/CensusOfDenmark1930.php

Indentation +35 added lines, -35 removed lines

@@ -19,40 +19,40 @@
  * Definitions for a census
  */
 class CensusOfDenmark1930 extends CensusOfDenmark implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '05 NOV 1930';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '05 NOV 1930';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnSurnameGivenNames($this, 'Navn', ''),
-			new CensusColumnNull($this, 'Bopæl', ''),
-			new CensusColumnNull($this, 'Andetsteds', 'Hvis den i Rubrik 3 opførte Person har fast Bopæl andetsteds, anføres her den faste Bopæl'),
-			new CensusColumnNull($this, 'Stede', 'Hvis den i Rubrik 3 opførte Person paa Tællingsdagen til Stede paa Tællingsstedet? Ja eller Nej.'),
-			new CensusColumnNull($this, 'Bopæl', 'Bopæl den 5. Novbr. 1929'),
-			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', ''),
-			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 CensusColumnSurnameGivenNames($this, 'Navn', ''),
+            new CensusColumnNull($this, 'Bopæl', ''),
+            new CensusColumnNull($this, 'Andetsteds', 'Hvis den i Rubrik 3 opførte Person har fast Bopæl andetsteds, anføres her den faste Bopæl'),
+            new CensusColumnNull($this, 'Stede', 'Hvis den i Rubrik 3 opførte Person paa Tællingsdagen til Stede paa Tællingsstedet? Ja eller Nej.'),
+            new CensusColumnNull($this, 'Bopæl', 'Bopæl den 5. Novbr. 1929'),
+            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', ''),
+            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 CensusOfDenmark1930 extends CensusOfDenmark implements CensusInterface {
+class CensusOfDenmark1930 extends CensusOfDenmark implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '05 NOV 1930';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnSurnameGivenNames($this, 'Navn', ''),
 			new CensusColumnNull($this, 'Bopæl', ''),

app/Census/CensusOfScotland1891.php

Indentation +29 added lines, -29 removed lines

@@ -19,34 +19,34 @@
  * Definitions for a census
  */
 class CensusOfScotland1891 extends CensusOfScotland implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '05 APR 1891';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '05 APR 1891';
+    }
 
-	/**
-	 * 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 CensusColumnNull($this, 'Empl', 'Employer'),
-			new CensusColumnNull($this, 'Empd', 'Employed'),
-			new CensusColumnNull($this, 'OAC', 'Own account'),
-			new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'),
-			new CensusColumnNull($this, 'Lang', 'Language spoken'),
-			new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, lunatic or imbecile'),
-		);
-	}
+    /**
+     * 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 CensusColumnNull($this, 'Empl', 'Employer'),
+            new CensusColumnNull($this, 'Empd', 'Employed'),
+            new CensusColumnNull($this, 'OAC', 'Own account'),
+            new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'),
+            new CensusColumnNull($this, 'Lang', 'Language spoken'),
+            new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, lunatic or imbecile'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

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

Indentation +13 added lines, -13 removed lines

@@ -21,17 +21,17 @@
  * The individual's religion.
  */
 class CensusColumnReligion extends AbstractCensusColumn implements CensusColumnInterface {
-	/**
-	 * Generate the likely value of this census column, based on available information.
-	 *
-	 * @todo Look for RELI tags (or subtags?)
-	 *
-	 * @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.
+     *
+     * @todo Look for RELI tags (or subtags?)
+     *
+     * @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 @@ 
 /**
  * The individual's religion.
  */
-class CensusColumnReligion extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnReligion extends AbstractCensusColumn implements CensusColumnInterface
+{
 	/**
 	 * Generate the likely value of this census column, based on available information.
 	 *
@@ -31,7 +32,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function generate(Individual $individual, Individual $head = null) {
+	public function generate(Individual $individual, Individual $head = null)
+	{
 		return '';
 	}
 }