fisharebest / webtrees

app/Census/CensusOfCzechRepublic1880.php

Indentation +31 added lines, -31 removed lines

@@ -19,36 +19,36 @@
  * Definitions for a census
  */
 class CensusOfCzechRepublic1880 extends CensusOfCzechRepublic implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '31 DEC 1880';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '31 DEC 1880';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Jméno', ''),
-			new CensusColumnSexMZ($this, 'Pohlaví', ''),
-			new CensusColumnRelationToHead($this, 'Vztah', ''),
-			new CensusColumnBirthDaySlashMonthYear($this, 'Narození', 'Datum narození'),
-			new CensusColumnBirthPlace($this, 'Místo', 'Místo narození'),
-			new CensusColumnNull($this, 'Přísluší', 'Domovské právo'),
-			new CensusColumnReligion($this, 'Vyznání', ''),
-			new CensusColumnNull($this, 'Stav', 'Rodinný stav'),
-			new CensusColumnNull($this, 'Jazyk', 'Jazyk v obcování'),
-			new CensusColumnOccupation($this, 'Povolání', ''),
-			new CensusColumnNull($this, 'Postavení', 'Postavení v zaměstnání'),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnFullName($this, 'Jméno', ''),
+            new CensusColumnSexMZ($this, 'Pohlaví', ''),
+            new CensusColumnRelationToHead($this, 'Vztah', ''),
+            new CensusColumnBirthDaySlashMonthYear($this, 'Narození', 'Datum narození'),
+            new CensusColumnBirthPlace($this, 'Místo', 'Místo narození'),
+            new CensusColumnNull($this, 'Přísluší', 'Domovské právo'),
+            new CensusColumnReligion($this, 'Vyznání', ''),
+            new CensusColumnNull($this, 'Stav', 'Rodinný stav'),
+            new CensusColumnNull($this, 'Jazyk', 'Jazyk v obcování'),
+            new CensusColumnOccupation($this, 'Povolání', ''),
+            new CensusColumnNull($this, 'Postavení', 'Postavení v zaměstnání'),
+            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 CensusOfCzechRepublic1880 extends CensusOfCzechRepublic implements CensusInterface {
+class CensusOfCzechRepublic1880 extends CensusOfCzechRepublic implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '31 DEC 1880';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnFullName($this, 'Jméno', ''),
 			new CensusColumnSexMZ($this, 'Pohlaví', ''),

app/Census/CensusColumnBirthPlace.php

Indentation +21 added lines, -21 removed lines

@@ -21,27 +21,27 @@
  * The individual's birth place.
  */
 class CensusColumnBirthPlace 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) {
-		$birth_place  = $individual->getBirthPlace();
-		$census_place = $this->place();
+    /**
+     * 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) {
+        $birth_place  = $individual->getBirthPlace();
+        $census_place = $this->place();
 
-		// Ignore the census country
-		if ($birth_place === $census_place) {
-			return '';
-		}
+        // Ignore the census country
+        if ($birth_place === $census_place) {
+            return '';
+        }
 
-		if (substr($birth_place, -strlen($census_place) - 2) === ', ' . $census_place) {
-			return substr($birth_place, 0, -strlen($census_place) - 2);
-		} else {
-			return $birth_place;
-		}
-	}
+        if (substr($birth_place, -strlen($census_place) - 2) === ', ' . $census_place) {
+            return substr($birth_place, 0, -strlen($census_place) - 2);
+        } else {
+            return $birth_place;
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * The individual's birth place.
  */
-class CensusColumnBirthPlace extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnBirthPlace 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)
+	{
 		$birth_place  = $individual->getBirthPlace();
 		$census_place = $this->place();
 

app/Census/CensusOfScotland1911.php

Indentation +34 added lines, -34 removed lines

@@ -19,39 +19,39 @@
  * Definitions for a census
  */
 class CensusOfScotland1911 extends CensusOfScotland implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '02 APR 1911';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '02 APR 1911';
+    }
 
-	/**
-	 * 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 CensusColumnAgeMale($this, 'AgeM', 'Age (males)'),
-			new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'),
-			new CensusColumnNull($this, 'Lang', 'Language spoken'),
-			new CensusColumnConditionEnglish($this, 'Condition', 'Condition'),
-			new CensusColumnYearsMarried($this, 'YrM', 'Years married'),
-			new CensusColumnChildrenBornAlive($this, 'ChA', 'Children born alive'),
-			new CensusColumnChildrenLiving($this, 'ChL', 'Children who are still alive'),
-			new CensusColumnChildrenDied($this, 'ChD', 'Children who have died'),
-			new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'),
-			new CensusColumnNull($this, 'Ind', 'Industry'),
-			new CensusColumnNull($this, 'Emp', 'Employer, worker or own account'),
-			new CensusColumnNull($this, 'Home', 'Working at home'),
-			new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'),
-			new CensusColumnNationality($this, 'Nat', 'Nationality'),
-			new CensusColumnNull($this, 'Infirm', 'Infirmity'),
-		);
-	}
+    /**
+     * 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 CensusColumnAgeMale($this, 'AgeM', 'Age (males)'),
+            new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'),
+            new CensusColumnNull($this, 'Lang', 'Language spoken'),
+            new CensusColumnConditionEnglish($this, 'Condition', 'Condition'),
+            new CensusColumnYearsMarried($this, 'YrM', 'Years married'),
+            new CensusColumnChildrenBornAlive($this, 'ChA', 'Children born alive'),
+            new CensusColumnChildrenLiving($this, 'ChL', 'Children who are still alive'),
+            new CensusColumnChildrenDied($this, 'ChD', 'Children who have died'),
+            new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'),
+            new CensusColumnNull($this, 'Ind', 'Industry'),
+            new CensusColumnNull($this, 'Emp', 'Employer, worker or own account'),
+            new CensusColumnNull($this, 'Home', 'Working at home'),
+            new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'),
+            new CensusColumnNationality($this, 'Nat', 'Nationality'),
+            new CensusColumnNull($this, 'Infirm', 'Infirmity'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

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

Indentation +12 added lines, -12 removed lines

@@ -19,17 +19,17 @@
  * Definitions for a census
  */
 interface CensusPlaceInterface {
-	/**
-	 * All available censuses for this census place.
-	 *
-	 * @return CensusInterface[]
-	 */
-	public function allCensusDates();
+    /**
+     * All available censuses for this census place.
+     *
+     * @return CensusInterface[]
+     */
+    public function allCensusDates();
 
-	/**
-	 * Where did this census occur, in GEDCOM format.
-	 *
-	 * @return string
-	 */
-	public function censusPlace();
+    /**
+     * Where did this census occur, in GEDCOM format.
+     *
+     * @return string
+     */
+    public function censusPlace();
 }

Braces +2 added lines, -1 removed lines

@@ -18,7 +18,8 @@
 /**
  * Definitions for a census
  */
-interface CensusPlaceInterface {
+interface CensusPlaceInterface
+{
 	/**
 	 * All available censuses for this census place.
 	 *

app/Census/CensusOfUnitedStates1860.php

Indentation +29 added lines, -29 removed lines

@@ -19,34 +19,34 @@
  * Definitions for a census
  */
 class CensusOfUnitedStates1860 extends CensusOfUnitedStates implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return 'BET JUN 1860 AND OCT 1860';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return 'BET JUN 1860 AND OCT 1860';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Name', 'Name'),
-			new CensusColumnAge($this, 'Age', 'Age'),
-			new CensusColumnSexMF($this, 'Sex', 'Sex'),
-			new CensusColumnNull($this, 'Color', 'White, black, or mulatto'),
-			new CensusColumnOccupation($this, 'Occupation', 'Profession, occupation, or trade'),
-			new CensusColumnNull($this, 'RE', 'Value of real estate owned'),
-			new CensusColumnNull($this, 'PE', 'Value of personal estate owned'),
-			new CensusColumnBirthPlaceSimple($this, 'Birthplace', 'Place of birth, naming the state, territory, or country'),
-			new CensusColumnMarriedWithinYear($this, 'Mar', 'Married within the year'),
-			new CensusColumnNull($this, 'School', 'Attended school within the year'),
-			new CensusColumnNull($this, 'R+W', 'Persons over 20 years of age who cannot read and write'),
-			new CensusColumnNull($this, 'Infirm', 'Whether deaf and dumb, blind, insane, idiotic, pauper or convict'),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnFullName($this, 'Name', 'Name'),
+            new CensusColumnAge($this, 'Age', 'Age'),
+            new CensusColumnSexMF($this, 'Sex', 'Sex'),
+            new CensusColumnNull($this, 'Color', 'White, black, or mulatto'),
+            new CensusColumnOccupation($this, 'Occupation', 'Profession, occupation, or trade'),
+            new CensusColumnNull($this, 'RE', 'Value of real estate owned'),
+            new CensusColumnNull($this, 'PE', 'Value of personal estate owned'),
+            new CensusColumnBirthPlaceSimple($this, 'Birthplace', 'Place of birth, naming the state, territory, or country'),
+            new CensusColumnMarriedWithinYear($this, 'Mar', 'Married within the year'),
+            new CensusColumnNull($this, 'School', 'Attended school within the year'),
+            new CensusColumnNull($this, 'R+W', 'Persons over 20 years of age who cannot read and write'),
+            new CensusColumnNull($this, 'Infirm', 'Whether deaf and dumb, blind, insane, idiotic, pauper or convict'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfUnitedStates1860 extends CensusOfUnitedStates implements CensusInterface {
+class CensusOfUnitedStates1860 extends CensusOfUnitedStates implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return 'BET JUN 1860 AND OCT 1860';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnFullName($this, 'Name', 'Name'),
 			new CensusColumnAge($this, 'Age', 'Age'),

app/Census/CensusColumnMotherForeign.php

Indentation +16 added lines, -16 removed lines

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

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * Is the individual's mother a foreigner.
  */
-class CensusColumnMotherForeign extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnMotherForeign 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)
+	{
 		$mother = $this->mother($individual);
 
 		if ($mother && $this->lastPartOfPlace($mother->getBirthPlace()) !== $this->place()) {

app/Census/CensusColumnOccupation.php

Indentation +14 added lines, -14 removed lines

@@ -21,19 +21,19 @@
  * The individual's occupation.
  */
 class CensusColumnOccupation 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->getFacts('OCCU') as $fact) {
-			return $fact->getValue();
-		}
+    /**
+     * 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->getFacts('OCCU') as $fact) {
+            return $fact->getValue();
+        }
 
-		return '';
-	}
+        return '';
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * The individual's occupation.
  */
-class CensusColumnOccupation extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnOccupation 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->getFacts('OCCU') as $fact) {
 			return $fact->getValue();
 		}

app/Census/CensusOfWales1861.php

Indentation +25 added lines, -25 removed lines

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

Braces +6 added lines, -3 removed lines

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

app/Census/CensusOfUnitedStates1870.php

Indentation +35 added lines, -35 removed lines

@@ -19,40 +19,40 @@
  * Definitions for a census
  */
 class CensusOfUnitedStates1870 extends CensusOfUnitedStates implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return 'JUN 1870';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return 'JUN 1870';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Name', 'Name'),
-			new CensusColumnAge($this, 'Age', 'Age'),
-			new CensusColumnSexMF($this, 'Sex', 'Sex'),
-			new CensusColumnNull($this, 'Color', 'White, Black, Mulatto, Chinese, Indian'),
-			new CensusColumnOccupation($this, 'Occupation', 'Profession, occupation, or trade'),
-			new CensusColumnNull($this, 'RE', 'Value of real estate owned'),
-			new CensusColumnNull($this, 'PE', 'Value of personal estate owned'),
-			new CensusColumnBirthPlaceSimple($this, 'Birthplace', 'Place of birth, naming the state, territory, or country'),
-			new CensusColumnFatherForeign($this, 'FFB', 'Father of foreign birth'),
-			new CensusColumnMotherForeign($this, 'MFB', 'Mother of foreign birth'),
-			new CensusColumnMonthIfBornWithinYear($this, 'Born', 'If born within the year, state month'),
-			new CensusColumnMonthIfMarriedWithinYear($this, 'Mar', 'If married within the year, state month'),
-			new CensusColumnNull($this, 'School', 'Attended school within the year'),
-			new CensusColumnNull($this, 'Read', 'Cannot read'),
-			new CensusColumnNull($this, 'Write', 'Cannot write'),
-			new CensusColumnNull($this, 'Infirm', 'Whether deaf and dumb, blind, insane, or idiotic'),
-			new CensusColumnNull($this, 'Cit', 'Male citizen of US'),
-			new CensusColumnNull($this, 'Dis', 'Male citizen of US, where right to vote is denied or abridged'),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnFullName($this, 'Name', 'Name'),
+            new CensusColumnAge($this, 'Age', 'Age'),
+            new CensusColumnSexMF($this, 'Sex', 'Sex'),
+            new CensusColumnNull($this, 'Color', 'White, Black, Mulatto, Chinese, Indian'),
+            new CensusColumnOccupation($this, 'Occupation', 'Profession, occupation, or trade'),
+            new CensusColumnNull($this, 'RE', 'Value of real estate owned'),
+            new CensusColumnNull($this, 'PE', 'Value of personal estate owned'),
+            new CensusColumnBirthPlaceSimple($this, 'Birthplace', 'Place of birth, naming the state, territory, or country'),
+            new CensusColumnFatherForeign($this, 'FFB', 'Father of foreign birth'),
+            new CensusColumnMotherForeign($this, 'MFB', 'Mother of foreign birth'),
+            new CensusColumnMonthIfBornWithinYear($this, 'Born', 'If born within the year, state month'),
+            new CensusColumnMonthIfMarriedWithinYear($this, 'Mar', 'If married within the year, state month'),
+            new CensusColumnNull($this, 'School', 'Attended school within the year'),
+            new CensusColumnNull($this, 'Read', 'Cannot read'),
+            new CensusColumnNull($this, 'Write', 'Cannot write'),
+            new CensusColumnNull($this, 'Infirm', 'Whether deaf and dumb, blind, insane, or idiotic'),
+            new CensusColumnNull($this, 'Cit', 'Male citizen of US'),
+            new CensusColumnNull($this, 'Dis', 'Male citizen of US, where right to vote is denied or abridged'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

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