fisharebest / webtrees

app/Census/CensusOfDenmark1787.php

Indentation +22 added lines, -22 removed lines

@@ -19,27 +19,27 @@
  * Definitions for a census
  */
 class CensusOfDenmark1787 extends CensusOfDenmark implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '01 JUL 1787';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '01 JUL 1787';
+    }
 
-	/**
-	 * 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 +6 added lines, -3 removed lines

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

app/Census/CensusColumnConditionFrenchVeuf.php

Indentation +15 added lines, -15 removed lines

@@ -19,23 +19,23 @@
  * Marital status.
  */
 class CensusColumnConditionFrenchVeuf extends AbstractCensusColumnCondition {
-	/* Text to display for married individuals */
-	protected $husband = '';
-	protected $wife    = '';
+    /* Text to display for married individuals */
+    protected $husband = '';
+    protected $wife    = '';
 
-	/* 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 = '';
+    /* Text to display for divorced individuals */
+    protected $divorce  = '';
+    protected $divorcee = '';
 
-	/* Text to display for widowed individuals (not yet implemented) */
-	protected $widower = '1';
-	protected $widow   = '';
+    /* Text to display for widowed individuals (not yet implemented) */
+    protected $widower = '1';
+    protected $widow   = '';
 }

Braces +2 added lines, -1 removed lines

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

app/Census/CensusColumnBirthDay.php

Indentation +11 added lines, -11 removed lines

@@ -21,15 +21,15 @@
  * The individual's date of birth.
  */
 class CensusColumnBirthDay 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');
-	}
+    /**
+     * 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');
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * The individual's date of birth.
  */
-class CensusColumnBirthDay extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnBirthDay 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');
 	}
 }

app/Census/CensusColumnSurname.php

Indentation +14 added lines, -14 removed lines

@@ -21,19 +21,19 @@
  * The individual's full name.
  */
 class CensusColumnSurname 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->getAllNames() as $name) {
-			return $name['surname'];
-		}
+    /**
+     * 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->getAllNames() as $name) {
+            return $name['surname'];
+        }
 
-		return '';
-	}
+        return '';
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * The individual's full name.
  */
-class CensusColumnSurname extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnSurname 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->getAllNames() as $name) {
 			return $name['surname'];
 		}

app/Census/CensusOfFrance1872.php

Indentation +28 added lines, -28 removed lines

@@ -19,33 +19,33 @@
  * Definitions for a census
  */
 class CensusOfFrance1872 extends CensusOfFrance implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '18 JAN 1872';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '18 JAN 1872';
+    }
 
-	/**
-	 * 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', ''),
-			new CensusColumnBirthPlace($this, 'Nationalité', 'Nationalité - Lieu de naissance'),
-		);
-	}
+    /**
+     * 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', ''),
+            new CensusColumnBirthPlace($this, 'Nationalité', 'Nationalité - Lieu de naissance'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

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

Indentation +11 added lines, -11 removed lines

@@ -21,15 +21,15 @@
  * The individual's date of birth.
  */
 class CensusColumnBirthMonth 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('%M');
-	}
+    /**
+     * 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('%M');
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * The individual's date of birth.
  */
-class CensusColumnBirthMonth extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnBirthMonth 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('%M');
 	}
 }

app/Census/CensusOfDenmark1940.php

Indentation +32 added lines, -32 removed lines

@@ -19,37 +19,37 @@
  * Definitions for a census
  */
 class CensusOfDenmark1940 extends CensusOfDenmark implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '05 NOV 1940';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '05 NOV 1940';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnSurnameGivenNames($this, 'Navn', ''),
-			new CensusColumnNull($this, 'Nærværende', 'Hvis den i Rubrik 1 opførte Person er midleritidg nærværende d.v.s. har fast Bopæl ????? (er optaget under en anden Address i Folkeregistret), anføres her den faste Bopæls Adresse (Kommunens Navn og den fuldstændige Adresse i denne; for Udlændinge dog kun Landets Navn).'),
-			new CensusColumnNull($this, 'Fraværende', 'Hvis den i Rubrik 1 opførte Person er midleritidg fraværende d.v.s. har fast Bopæl paa Tællingsstedet (er optaget underdenne Address i Folkeregistret), men den 5. Novemer ikke er til Stede paa Tællingsstedet, anføres her „fraværende“ og Adressen paa det midlertidige Opholdssted (ved Ophold i Udlandet anføres jun Landets Navn).'),
-			new CensusColumnSexMK($this, 'Køn', 'Køn Mand (M) Kvinde (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 CensusColumnNull($this, 'Indgaaelse', 'Date for det nuværende Ægteskabs Indgaaelse. NB." RUbrikken udfyldes ikke al Enkemaend, Enker, Separerede eller Fraskilte.'),
-			new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
-			new CensusColumnOccupation($this, 'Erhverv', ''),
-			new CensusColumnNull($this, 'Virksomhedens', 'Virksomhedens (Branchens) Art'),
-			new CensusColumnNull($this, 'Hustruen', 'Besvares kun af Hustruen og hjemmeboende Børn over 14 Aar'),
-			new CensusColumnNull($this, 'Døtre', 'Besvares kun af hjemmeboende Døtre over 14 Aar'),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnSurnameGivenNames($this, 'Navn', ''),
+            new CensusColumnNull($this, 'Nærværende', 'Hvis den i Rubrik 1 opførte Person er midleritidg nærværende d.v.s. har fast Bopæl ????? (er optaget under en anden Address i Folkeregistret), anføres her den faste Bopæls Adresse (Kommunens Navn og den fuldstændige Adresse i denne; for Udlændinge dog kun Landets Navn).'),
+            new CensusColumnNull($this, 'Fraværende', 'Hvis den i Rubrik 1 opførte Person er midleritidg fraværende d.v.s. har fast Bopæl paa Tællingsstedet (er optaget underdenne Address i Folkeregistret), men den 5. Novemer ikke er til Stede paa Tællingsstedet, anføres her „fraværende“ og Adressen paa det midlertidige Opholdssted (ved Ophold i Udlandet anføres jun Landets Navn).'),
+            new CensusColumnSexMK($this, 'Køn', 'Køn Mand (M) Kvinde (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 CensusColumnNull($this, 'Indgaaelse', 'Date for det nuværende Ægteskabs Indgaaelse. NB." RUbrikken udfyldes ikke al Enkemaend, Enker, Separerede eller Fraskilte.'),
+            new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+            new CensusColumnOccupation($this, 'Erhverv', ''),
+            new CensusColumnNull($this, 'Virksomhedens', 'Virksomhedens (Branchens) Art'),
+            new CensusColumnNull($this, 'Hustruen', 'Besvares kun af Hustruen og hjemmeboende Børn over 14 Aar'),
+            new CensusColumnNull($this, 'Døtre', 'Besvares kun af hjemmeboende Døtre over 14 Aar'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfDenmark1940 extends CensusOfDenmark implements CensusInterface {
+class CensusOfDenmark1940 extends CensusOfDenmark implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '05 NOV 1940';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnSurnameGivenNames($this, 'Navn', ''),
 			new CensusColumnNull($this, 'Nærværende', 'Hvis den i Rubrik 1 opførte Person er midleritidg nærværende d.v.s. har fast Bopæl ????? (er optaget under en anden Address i Folkeregistret), anføres her den faste Bopæls Adresse (Kommunens Navn og den fuldstændige Adresse i denne; for Udlændinge dog kun Landets Navn).'),

app/Census/CensusOfDenmark1855.php

Indentation +27 added lines, -27 removed lines

@@ -19,32 +19,32 @@
  * Definitions for a census
  */
 class CensusOfDenmark1855 extends CensusOfDenmark implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '01 FEB 1855';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '01 FEB 1855';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Navn', ''),
-			new CensusColumnAge($this, 'Alder', ''),
-			new CensusColumnConditionDanish($this, 'Civilstand', ''),
-			new CensusColumnOccupation($this, 'Erhverv', ''),
-			new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
-			new CensusColumnNull($this, '', ''), // Religion?
-			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 CensusColumnAge($this, 'Alder', ''),
+            new CensusColumnConditionDanish($this, 'Civilstand', ''),
+            new CensusColumnOccupation($this, 'Erhverv', ''),
+            new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+            new CensusColumnNull($this, '', ''), // Religion?
+            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 CensusOfDenmark1855 extends CensusOfDenmark implements CensusInterface {
+class CensusOfDenmark1855 extends CensusOfDenmark implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '01 FEB 1855';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnFullName($this, 'Navn', ''),
 			new CensusColumnAge($this, 'Alder', ''),

app/Census/CensusOfUnitedStates1900.php

Indentation +43 added lines, -43 removed lines

@@ -19,48 +19,48 @@
  * Definitions for a census
  */
 class CensusOfUnitedStates1900 extends CensusOfUnitedStates implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '01 JUN 1900';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '01 JUN 1900';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Name', 'Name'),
-			new CensusColumnRelationToHead($this, 'Relation', 'Relationship of each person to the head of the family'),
-			new CensusColumnNull($this, 'Race', 'Color or race'),
-			new CensusColumnSexMF($this, 'Sex', 'Sex'),
-			new CensusColumnBirthMonth($this, 'Month', 'Month of birth'),
-			new CensusColumnBirthYear($this, 'Year', 'Year of birth'),
-			new CensusColumnAge($this, 'Age', 'Age at last birthday'),
-			new CensusColumnConditionUs($this, 'Cond', 'Whether single, married, widowed, or divorced'),
-			new CensusColumnYearsMarried($this, 'Marr', 'Number of years married'),
-			new CensusColumnChildrenBornAlive($this, 'Chil', 'Mother of how many children'),
-			new CensusColumnChildrenLiving($this, 'Chil', 'Number of these children living'),
-			new CensusColumnBirthPlaceSimple($this, 'BP', 'Place of birth of this person'),
-			new CensusColumnFatherBirthPlaceSimple($this, 'FBP', 'Place of birth of father of this person'),
-			new CensusColumnMotherBirthPlaceSimple($this, 'MBP', 'Place of birth of mother of this person'),
-			new CensusColumnNull($this, 'Imm', 'Year of immigration to the United States'),
-			new CensusColumnNull($this, 'US', 'Number of years in the United States'),
-			new CensusColumnNull($this, 'Nat', 'Naturalization'),
-			new CensusColumnOccupation($this, 'Occupation', 'Occupation, trade of profession'),
-			new CensusColumnNull($this, 'Unemp', 'Months not unemployed'),
-			new CensusColumnNull($this, 'School', 'Attended school (in months)'),
-			new CensusColumnNull($this, 'Read', 'Can read'),
-			new CensusColumnNull($this, 'Write', 'Can write'),
-			new CensusColumnNull($this, 'Eng', 'Can speak English'),
-			new CensusColumnNull($this, 'Home', 'Owned or rented'),
-			new CensusColumnNull($this, 'Mort', 'Owned free or mortgaged'),
-			new CensusColumnNull($this, 'Farm', 'Farm or house'),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnFullName($this, 'Name', 'Name'),
+            new CensusColumnRelationToHead($this, 'Relation', 'Relationship of each person to the head of the family'),
+            new CensusColumnNull($this, 'Race', 'Color or race'),
+            new CensusColumnSexMF($this, 'Sex', 'Sex'),
+            new CensusColumnBirthMonth($this, 'Month', 'Month of birth'),
+            new CensusColumnBirthYear($this, 'Year', 'Year of birth'),
+            new CensusColumnAge($this, 'Age', 'Age at last birthday'),
+            new CensusColumnConditionUs($this, 'Cond', 'Whether single, married, widowed, or divorced'),
+            new CensusColumnYearsMarried($this, 'Marr', 'Number of years married'),
+            new CensusColumnChildrenBornAlive($this, 'Chil', 'Mother of how many children'),
+            new CensusColumnChildrenLiving($this, 'Chil', 'Number of these children living'),
+            new CensusColumnBirthPlaceSimple($this, 'BP', 'Place of birth of this person'),
+            new CensusColumnFatherBirthPlaceSimple($this, 'FBP', 'Place of birth of father of this person'),
+            new CensusColumnMotherBirthPlaceSimple($this, 'MBP', 'Place of birth of mother of this person'),
+            new CensusColumnNull($this, 'Imm', 'Year of immigration to the United States'),
+            new CensusColumnNull($this, 'US', 'Number of years in the United States'),
+            new CensusColumnNull($this, 'Nat', 'Naturalization'),
+            new CensusColumnOccupation($this, 'Occupation', 'Occupation, trade of profession'),
+            new CensusColumnNull($this, 'Unemp', 'Months not unemployed'),
+            new CensusColumnNull($this, 'School', 'Attended school (in months)'),
+            new CensusColumnNull($this, 'Read', 'Can read'),
+            new CensusColumnNull($this, 'Write', 'Can write'),
+            new CensusColumnNull($this, 'Eng', 'Can speak English'),
+            new CensusColumnNull($this, 'Home', 'Owned or rented'),
+            new CensusColumnNull($this, 'Mort', 'Owned free or mortgaged'),
+            new CensusColumnNull($this, 'Farm', 'Farm or house'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

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