fisharebest / webtrees

app/Census/CensusOfFrance1856.php

Indentation +27 added lines, -27 removed lines

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

app/Census/CensusOfUnitedStates1880.php

Indentation +40 added lines, -40 removed lines

@@ -19,45 +19,45 @@
  * Definitions for a census
  */
 class CensusOfUnitedStates1880 extends CensusOfUnitedStates implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return 'JUN 1880';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return 'JUN 1880';
+    }
 
-	/**
-	 * 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 CensusColumnMonthIfBornWithinYear($this, 'Mon', 'If born within the year, state month'),
-			new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'),
-			new CensusColumnNull($this, 'S', 'Single'),
-			new CensusColumnNull($this, 'M', 'Married'),
-			new CensusColumnNull($this, 'W/D', 'Widowed, Divorced'),
-			new CensusColumnMarriedWithinYear($this, 'MY', 'Married during census year'),
-			new CensusColumnOccupation($this, 'Occupation', 'Profession, occupation, or trade'),
-			new CensusColumnNull($this, 'UnEm', 'Number of months the person has been unemployed during the census year'),
-			new CensusColumnNull($this, 'Sick', 'Sickness or disability'),
-			new CensusColumnNull($this, 'Blind', 'Blind'),
-			new CensusColumnNull($this, 'DD', 'Deaf and dumb'),
-			new CensusColumnNull($this, 'Idiotic', 'Idiotic'),
-			new CensusColumnNull($this, 'Insane', 'Insane'),
-			new CensusColumnNull($this, 'Disabled', 'Maimed, crippled, bedridden or otherwise disabled'),
-			new CensusColumnNull($this, 'School', 'Attended school within the census year'),
-			new CensusColumnNull($this, 'Read', 'Cannot read'),
-			new CensusColumnNull($this, 'Write', 'Cannot write'),
-			new CensusColumnBirthPlaceSimple($this, 'BP', 'Place of birth, naming the state, territory, or country'),
-			new CensusColumnFatherBirthPlaceSimple($this, 'FBP', 'Place of birth of father, naming the state, territory, or country'),
-			new CensusColumnMotherBirthPlaceSimple($this, 'MBP', 'Place of birth of mother, naming the state, territory, or country'),
-		);
-	}
+    /**
+     * 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 CensusColumnMonthIfBornWithinYear($this, 'Mon', 'If born within the year, state month'),
+            new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'),
+            new CensusColumnNull($this, 'S', 'Single'),
+            new CensusColumnNull($this, 'M', 'Married'),
+            new CensusColumnNull($this, 'W/D', 'Widowed, Divorced'),
+            new CensusColumnMarriedWithinYear($this, 'MY', 'Married during census year'),
+            new CensusColumnOccupation($this, 'Occupation', 'Profession, occupation, or trade'),
+            new CensusColumnNull($this, 'UnEm', 'Number of months the person has been unemployed during the census year'),
+            new CensusColumnNull($this, 'Sick', 'Sickness or disability'),
+            new CensusColumnNull($this, 'Blind', 'Blind'),
+            new CensusColumnNull($this, 'DD', 'Deaf and dumb'),
+            new CensusColumnNull($this, 'Idiotic', 'Idiotic'),
+            new CensusColumnNull($this, 'Insane', 'Insane'),
+            new CensusColumnNull($this, 'Disabled', 'Maimed, crippled, bedridden or otherwise disabled'),
+            new CensusColumnNull($this, 'School', 'Attended school within the census year'),
+            new CensusColumnNull($this, 'Read', 'Cannot read'),
+            new CensusColumnNull($this, 'Write', 'Cannot write'),
+            new CensusColumnBirthPlaceSimple($this, 'BP', 'Place of birth, naming the state, territory, or country'),
+            new CensusColumnFatherBirthPlaceSimple($this, 'FBP', 'Place of birth of father, naming the state, territory, or country'),
+            new CensusColumnMotherBirthPlaceSimple($this, 'MBP', 'Place of birth of mother, naming the state, territory, or country'),
+        );
+    }
 }

app/Census/Census.php

Indentation +15 added lines, -15 removed lines

@@ -19,19 +19,19 @@
  * Definitions for a census
  */
 class Census {
-	/**
-	 * @return CensusPlaceInterface[]
-	 */
-	public static function allCensusPlaces() {
-		return array(
-			new CensusOfCzechRepublic,
-			new CensusOfDenmark,
-			new CensusOfDeutschland,
-			new CensusOfEngland,
-			new CensusOfFrance,
-			new CensusOfScotland,
-			new CensusOfUnitedStates,
-			new CensusOfWales,
-		);
-	}
+    /**
+     * @return CensusPlaceInterface[]
+     */
+    public static function allCensusPlaces() {
+        return array(
+            new CensusOfCzechRepublic,
+            new CensusOfDenmark,
+            new CensusOfDeutschland,
+            new CensusOfEngland,
+            new CensusOfFrance,
+            new CensusOfScotland,
+            new CensusOfUnitedStates,
+            new CensusOfWales,
+        );
+    }
 }

app/Census/CensusColumnConditionEnglish.php

Indentation +12 added lines, -12 removed lines

@@ -19,19 +19,19 @@
  * Marital status.
  */
 class CensusColumnConditionEnglish extends AbstractCensusColumnCondition {
-	/* Text to display for married individuals */
-	protected $husband = 'Mar';
-	protected $wife    = 'Mar';
+    /* Text to display for married individuals */
+    protected $husband = 'Mar';
+    protected $wife    = 'Mar';
 
-	/* Text to display for unmarried individuals */
-	protected $bachelor = 'Unm';
-	protected $spinster = 'Unm';
+    /* Text to display for unmarried individuals */
+    protected $bachelor = 'Unm';
+    protected $spinster = 'Unm';
 
-	/* Text to display for divorced individuals */
-	protected $divorce  = 'Div';
-	protected $divorcee = 'Div';
+    /* Text to display for divorced individuals */
+    protected $divorce  = 'Div';
+    protected $divorcee = 'Div';
 
-	/* Text to display for widowed individuals (not yet implemented) */
-	protected $widower = 'Wid';
-	protected $widow   = 'Wid';
+    /* Text to display for widowed individuals (not yet implemented) */
+    protected $widower = 'Wid';
+    protected $widow   = 'Wid';
 }

app/Census/AbstractCensusColumnCondition.php

Indentation +161 added lines, -161 removed lines

@@ -22,165 +22,165 @@
  * Marital status.
  */
 abstract class AbstractCensusColumnCondition extends AbstractCensusColumn implements CensusColumnInterface {
-	/* Text to display for married males */
-	protected $husband = '';
-
-	/* Text to display for married females */
-	protected $wife    = '';
-
-	/* Text to display for unmarried males */
-	protected $bachelor = '';
-
-	/* Text to display for unmarried females */
-	protected $spinster = '';
-
-	/* Text to display for male children */
-	protected $boy  = '';
-
-	/* Text to display for female children */
-	protected $girl = '';
-
-	/* Text to display for divorced males */
-	protected $divorce  = '';
-
-	/* Text to display for divorced females */
-	protected $divorcee = '';
-
-	/* Text to display for widowed males */
-	protected $widower = '';
-
-	/* Text to display for widowed females */
-	protected $widow   = '';
-
-	/* At what age is this individual recorded as an adult */
-	protected $age_adult = 15;
-
-	/**
-	 * 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) {
-		$family = $this->spouseFamily($individual);
-		$sex    = $individual->getSex();
-
-		if ($family === null || count($family->getFacts('_NMR')) > 0) {
-			if ($this->isChild($individual)) {
-				return $this->conditionChild($sex);
-			} else {
-				return $this->conditionSingle($sex);
-			}
-		} elseif (count($family->getFacts('DIV')) > 0) {
-			return $this->conditionDivorced($sex);
-		} else {
-			$spouse = $family->getSpouse($individual);
-			if ($spouse instanceof Individual && $this->isDead($spouse)) {
-				return $this->conditionWidowed($sex);
-			} else {
-				return $this->conditionMarried($sex);
-			}
-		}
-	}
-
-	/**
-	 * How is this condition written in a census column.
-	 *
-	 * @param string $sex
-	 *
-	 * @return string
-	 */
-	private function conditionChild($sex) {
-		if ($sex === 'F') {
-			return $this->girl;
-		} else {
-			return $this->boy;
-		}
-	}
-
-	/**
-	 * How is this condition written in a census column.
-	 *
-	 * @param string $sex
-	 *
-	 * @return string
-	 */
-	private function conditionDivorced($sex) {
-		if ($sex === 'F') {
-			return $this->divorcee;
-		} else {
-			return $this->divorce;
-		}
-	}
-
-	/**
-	 * How is this condition written in a census column.
-	 *
-	 * @param string $sex
-	 *
-	 * @return string
-	 */
-	private function conditionMarried($sex) {
-		if ($sex === 'F') {
-			return $this->wife;
-		} else {
-			return $this->husband;
-		}
-	}
-
-	/**
-	 * How is this condition written in a census column.
-	 *
-	 * @param string $sex
-	 *
-	 * @return string
-	 */
-	private function conditionSingle($sex) {
-		if ($sex === 'F') {
-			return $this->spinster;
-		} else {
-			return $this->bachelor;
-		}
-	}
-
-	/**
-	 * How is this condition written in a census column.
-	 *
-	 * @param string $sex
-	 *
-	 * @return string
-	 */
-	private function conditionWidowed($sex) {
-		if ($sex === 'F') {
-			return $this->widow;
-		} else {
-			return $this->widower;
-		}
-	}
-
-	/**
-	 * Is the individual a child.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return bool
-	 */
-	private function isChild(Individual $individual) {
-		$age = (int) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
-
-		return $age < $this->age_adult;
-	}
-
-	/**
-	 * Is the individual dead.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return bool
-	 */
-	private function isDead(Individual $individual) {
-		return $individual->getDeathDate()->isOK() && Date::compare($individual->getDeathDate(), $this->date()) < 0;
-	}
+    /* Text to display for married males */
+    protected $husband = '';
+
+    /* Text to display for married females */
+    protected $wife    = '';
+
+    /* Text to display for unmarried males */
+    protected $bachelor = '';
+
+    /* Text to display for unmarried females */
+    protected $spinster = '';
+
+    /* Text to display for male children */
+    protected $boy  = '';
+
+    /* Text to display for female children */
+    protected $girl = '';
+
+    /* Text to display for divorced males */
+    protected $divorce  = '';
+
+    /* Text to display for divorced females */
+    protected $divorcee = '';
+
+    /* Text to display for widowed males */
+    protected $widower = '';
+
+    /* Text to display for widowed females */
+    protected $widow   = '';
+
+    /* At what age is this individual recorded as an adult */
+    protected $age_adult = 15;
+
+    /**
+     * 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) {
+        $family = $this->spouseFamily($individual);
+        $sex    = $individual->getSex();
+
+        if ($family === null || count($family->getFacts('_NMR')) > 0) {
+            if ($this->isChild($individual)) {
+                return $this->conditionChild($sex);
+            } else {
+                return $this->conditionSingle($sex);
+            }
+        } elseif (count($family->getFacts('DIV')) > 0) {
+            return $this->conditionDivorced($sex);
+        } else {
+            $spouse = $family->getSpouse($individual);
+            if ($spouse instanceof Individual && $this->isDead($spouse)) {
+                return $this->conditionWidowed($sex);
+            } else {
+                return $this->conditionMarried($sex);
+            }
+        }
+    }
+
+    /**
+     * How is this condition written in a census column.
+     *
+     * @param string $sex
+     *
+     * @return string
+     */
+    private function conditionChild($sex) {
+        if ($sex === 'F') {
+            return $this->girl;
+        } else {
+            return $this->boy;
+        }
+    }
+
+    /**
+     * How is this condition written in a census column.
+     *
+     * @param string $sex
+     *
+     * @return string
+     */
+    private function conditionDivorced($sex) {
+        if ($sex === 'F') {
+            return $this->divorcee;
+        } else {
+            return $this->divorce;
+        }
+    }
+
+    /**
+     * How is this condition written in a census column.
+     *
+     * @param string $sex
+     *
+     * @return string
+     */
+    private function conditionMarried($sex) {
+        if ($sex === 'F') {
+            return $this->wife;
+        } else {
+            return $this->husband;
+        }
+    }
+
+    /**
+     * How is this condition written in a census column.
+     *
+     * @param string $sex
+     *
+     * @return string
+     */
+    private function conditionSingle($sex) {
+        if ($sex === 'F') {
+            return $this->spinster;
+        } else {
+            return $this->bachelor;
+        }
+    }
+
+    /**
+     * How is this condition written in a census column.
+     *
+     * @param string $sex
+     *
+     * @return string
+     */
+    private function conditionWidowed($sex) {
+        if ($sex === 'F') {
+            return $this->widow;
+        } else {
+            return $this->widower;
+        }
+    }
+
+    /**
+     * Is the individual a child.
+     *
+     * @param Individual $individual
+     *
+     * @return bool
+     */
+    private function isChild(Individual $individual) {
+        $age = (int) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
+
+        return $age < $this->age_adult;
+    }
+
+    /**
+     * Is the individual dead.
+     *
+     * @param Individual $individual
+     *
+     * @return bool
+     */
+    private function isDead(Individual $individual) {
+        return $individual->getDeathDate()->isOK() && Date::compare($individual->getDeathDate(), $this->date()) < 0;
+    }
 }

app/Census/CensusColumnBirthDaySlashMonth.php

Indentation +16 added lines, -16 removed lines

@@ -21,21 +21,21 @@
  * The individual's date of birth.
  */
 class CensusColumnBirthDaySlashMonth 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_date = $individual->getBirthDate();
+    /**
+     * 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_date = $individual->getBirthDate();
 
-		if ($birth_date->minimumJulianDay() === $birth_date->maximumJulianDay()) {
-			return $birth_date->minimumDate()->format('%j/%n');
-		} else {
-			return '';
-		}
-	}
+        if ($birth_date->minimumJulianDay() === $birth_date->maximumJulianDay()) {
+            return $birth_date->minimumDate()->format('%j/%n');
+        } else {
+            return '';
+        }
+    }
 }

app/Census/CensusOfDenmark1921.php

Indentation +31 added lines, -31 removed lines

@@ -19,36 +19,36 @@
  * Definitions for a census
  */
 class CensusOfDenmark1921 extends CensusOfDenmark implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '01 FEB 1921';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '01 FEB 1921';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Navn', 'Samtlige Personers Navn (ogsaa Fornavn). Ved Børn, endnu uden Navn, sættes „Dreng“ eller „Pige“. Midlertidig fraværerade Personer anføres ikke her, men paa Skemaeta Bagside)'),
-			new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M) eller Kvindekøn (K).'),
-			new CensusColumnBirthDaySlashMonth($this, 'Fødselsdag', ''),
-			new CensusColumnBirthYear($this, 'Fødselsaar', ''),
-			new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U), Gift (G), Enkemand eller Enke (E), Separeret (S), Fraskilt (F).'),
-			new CensusColumnBirthPlace($this, 'Fødested', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnReligion($this, 'Trossamfund', 'Trossamfund (Folkekirken eller Navnet paa det Trossamfund, man tilhører, eller „udenfor Trossamfund“).'),
-			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, 'Anmærkninger', 'Anmærkninger.'),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnFullName($this, 'Navn', 'Samtlige Personers Navn (ogsaa Fornavn). Ved Børn, endnu uden Navn, sættes „Dreng“ eller „Pige“. Midlertidig fraværerade Personer anføres ikke her, men paa Skemaeta Bagside)'),
+            new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M) eller Kvindekøn (K).'),
+            new CensusColumnBirthDaySlashMonth($this, 'Fødselsdag', ''),
+            new CensusColumnBirthYear($this, 'Fødselsaar', ''),
+            new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U), Gift (G), Enkemand eller Enke (E), Separeret (S), Fraskilt (F).'),
+            new CensusColumnBirthPlace($this, 'Fødested', ''),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnReligion($this, 'Trossamfund', 'Trossamfund (Folkekirken eller Navnet paa det Trossamfund, man tilhører, eller „udenfor Trossamfund“).'),
+            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, 'Anmærkninger', 'Anmærkninger.'),
+        );
+    }
 }

app/Census/CensusOfEngland1861.php

Indentation +25 added lines, -25 removed lines

@@ -19,30 +19,30 @@
  * Definitions for a census
  */
 class CensusOfEngland1861 extends CensusOfEngland 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'),
+        );
+    }
 }

app/Census/CensusOfUnitedStates1910.php

Indentation +46 added lines, -46 removed lines

@@ -19,51 +19,51 @@
  * Definitions for a census
  */
 class CensusOfUnitedStates1910 extends CensusOfUnitedStates implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '15 APR 1910';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '15 APR 1910';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnSurnameGivenNameInitial($this, 'Name', 'Name'),
-			new CensusColumnRelationToHead($this, 'Relation', 'Relationship of each person to the head of the family'),
-			new CensusColumnSexMF($this, 'Sex', 'Sex'),
-			new CensusColumnNull($this, 'Race', 'Color or race'),
-			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 of present marriage'),
-			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, 'Nat', 'Whether naturalized or alien'),
-			new CensusColumnNull($this, 'Lang', 'Whether able to speak English, of if not, give language spoken'),
-			new CensusColumnOccupation($this, 'Occupation', 'Trade or profession of, or particular kind of work done by this person'),
-			new CensusColumnNull($this, 'Ind', 'General nature of industry'),
-			new CensusColumnNull($this, 'Emp', 'Whether an employer, employee, or work on own account'),
-			new CensusColumnNull($this, 'Unemp', 'Whether out of work on April 15, 1910'),
-			new CensusColumnNull($this, 'Unemp', 'Number of weeks out of work in 1909'),
-			new CensusColumnNull($this, 'R', 'Whether able to read'),
-			new CensusColumnNull($this, 'W', 'Whether able to write'),
-			new CensusColumnNull($this, 'Sch', 'Attended school since September 1, 1909'),
-			new CensusColumnNull($this, 'Home', 'Owned or rented'),
-			new CensusColumnNull($this, 'Mort', 'Owned free or mortgaged'),
-			new CensusColumnNull($this, 'Farm', 'Farm or house'),
-			new CensusColumnNull($this, 'CW', 'Whether a survivor of the Union or Confederate Army or Navy'),
-			new CensusColumnNull($this, 'Blind', 'Whether blind (both eyes)'),
-			new CensusColumnNull($this, 'Deaf', 'Whether deaf and dumb'),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnSurnameGivenNameInitial($this, 'Name', 'Name'),
+            new CensusColumnRelationToHead($this, 'Relation', 'Relationship of each person to the head of the family'),
+            new CensusColumnSexMF($this, 'Sex', 'Sex'),
+            new CensusColumnNull($this, 'Race', 'Color or race'),
+            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 of present marriage'),
+            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, 'Nat', 'Whether naturalized or alien'),
+            new CensusColumnNull($this, 'Lang', 'Whether able to speak English, of if not, give language spoken'),
+            new CensusColumnOccupation($this, 'Occupation', 'Trade or profession of, or particular kind of work done by this person'),
+            new CensusColumnNull($this, 'Ind', 'General nature of industry'),
+            new CensusColumnNull($this, 'Emp', 'Whether an employer, employee, or work on own account'),
+            new CensusColumnNull($this, 'Unemp', 'Whether out of work on April 15, 1910'),
+            new CensusColumnNull($this, 'Unemp', 'Number of weeks out of work in 1909'),
+            new CensusColumnNull($this, 'R', 'Whether able to read'),
+            new CensusColumnNull($this, 'W', 'Whether able to write'),
+            new CensusColumnNull($this, 'Sch', 'Attended school since September 1, 1909'),
+            new CensusColumnNull($this, 'Home', 'Owned or rented'),
+            new CensusColumnNull($this, 'Mort', 'Owned free or mortgaged'),
+            new CensusColumnNull($this, 'Farm', 'Farm or house'),
+            new CensusColumnNull($this, 'CW', 'Whether a survivor of the Union or Confederate Army or Navy'),
+            new CensusColumnNull($this, 'Blind', 'Whether blind (both eyes)'),
+            new CensusColumnNull($this, 'Deaf', 'Whether deaf and dumb'),
+        );
+    }
 }