fisharebest / webtrees

app/Census/CensusOfFrance1946.php

Indentation +23 added lines, -23 removed lines

@@ -19,28 +19,28 @@
  * Definitions for a census
  */
 class CensusOfFrance1946 extends CensusOfFrance implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '17 JAN 1946';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '17 JAN 1946';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom usuel'),
-			new CensusColumnRelationToHead($this, 'Parenté', 'Parenté avec le chef de ménage ou situation dans le ménage'),
-			new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),
-			new CensusColumnNationality($this, 'Nationalité', ''),
-			new CensusColumnOccupation($this, 'Profession', ''),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
+            new CensusColumnGivenNames($this, 'Prénom', 'Prénom usuel'),
+            new CensusColumnRelationToHead($this, 'Parenté', 'Parenté avec le chef de ménage ou situation dans le ménage'),
+            new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),
+            new CensusColumnNationality($this, 'Nationalité', ''),
+            new CensusColumnOccupation($this, 'Profession', ''),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfFrance1946 extends CensusOfFrance implements CensusInterface {
+class CensusOfFrance1946 extends CensusOfFrance implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '17 JAN 1946';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
 			new CensusColumnGivenNames($this, 'Prénom', 'Prénom usuel'),

app/Census/CensusOfFrance1866.php

Indentation +27 added lines, -27 removed lines

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

Braces +6 added lines, -3 removed lines

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

Indentation +34 added lines, -34 removed lines

@@ -22,43 +22,43 @@
  * The nationality of the individual.
  */
 class CensusColumnNationality extends AbstractCensusColumn implements CensusColumnInterface {
-	/** @var array Convert a country name to a nationality */
-	private $nationalities = array(
-		'England'     => 'British',
-		'Scotland'    => 'British',
-		'Wales'       => 'British',
-		'Deutschland' => 'Deutsch',
-	);
+    /** @var array Convert a country name to a nationality */
+    private $nationalities = array(
+        'England'     => 'British',
+        'Scotland'    => 'British',
+        'Wales'       => 'British',
+        'Deutschland' => 'Deutsch',
+    );
 
-	/**
-	 * 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) {
-		$place = $individual->getBirthPlace();
+    /**
+     * 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) {
+        $place = $individual->getBirthPlace();
 
-		// No birthplace?  Assume born in the same country.
-		if ($place === '') {
-			$place = $this->place();
-		}
+        // No birthplace?  Assume born in the same country.
+        if ($place === '') {
+            $place = $this->place();
+        }
 
-		// Did we emigrate or naturalise?
-		foreach ($individual->getFacts('IMMI|EMIG|NATU', true) as $fact) {
-			if (Date::compare($fact->getDate(), $this->date()) <= 0) {
-				$place = $fact->getPlace()->getGedcomName();
-			}
-		}
+        // Did we emigrate or naturalise?
+        foreach ($individual->getFacts('IMMI|EMIG|NATU', true) as $fact) {
+            if (Date::compare($fact->getDate(), $this->date()) <= 0) {
+                $place = $fact->getPlace()->getGedcomName();
+            }
+        }
 
-		$place = $this->lastPartOfPlace($place);
+        $place = $this->lastPartOfPlace($place);
 
-		if (array_key_exists($place, $this->nationalities)) {
-			return $this->nationalities[$place];
-		} else {
-			return $place;
-		}
-	}
+        if (array_key_exists($place, $this->nationalities)) {
+            return $this->nationalities[$place];
+        } else {
+            return $place;
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -21,7 +21,8 @@ 
 /**
  * The nationality of the individual.
  */
-class CensusColumnNationality extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnNationality extends AbstractCensusColumn implements CensusColumnInterface
+{
 	/** @var array Convert a country name to a nationality */
 	private $nationalities = array(
 		'England'     => 'British',
@@ -38,7 +39,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function generate(Individual $individual, Individual $head = null) {
+	public function generate(Individual $individual, Individual $head = null)
+	{
 		$place = $individual->getBirthPlace();
 
 		// No birthplace?  Assume born in the same country.

app/Census/CensusOfFrance1926.php

Indentation +25 added lines, -25 removed lines

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

Indentation +27 added lines, -27 removed lines

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

Braces +6 added lines, -3 removed lines

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

Indentation +41 added lines, -41 removed lines

@@ -19,46 +19,46 @@
  * Definitions for a census
  */
 class CensusOfUnitedStates1890 extends CensusOfUnitedStates implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '02 JUN 1890';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '02 JUN 1890';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnGivenNameInitial($this, 'Name', 'Christian name in full, and initial of middle name'),
-			new CensusColumnSurname($this, 'Surname', 'Surname'),
-			new CensusColumnNull($this, 'CW', 'Whether a soldier, sailor or marine during the civil war (U.S. or Conf.), or widow of such person'),
-			new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of family'),
-			new CensusColumnNull($this, 'Race', 'Whether white, black, mulatto, quadroon, octoroon, Chinese, Japanese, or Indian'),
-			new CensusColumnSexMF($this, 'Sex', 'Sex'),
-			new CensusColumnAge($this, 'Age', 'Age at nearest birthday. If under one year, give age in months'),
-			new CensusColumnConditionUs($this, 'Cond', 'Whether single, married, widowed, or divorced'),
-			new CensusColumnMonthIfMarriedWithinYear($this, 'Mar', 'Whether married duirng the census year (June 1, 1889, to May 31, 1890)'),
-			new CensusColumnNull($this, 'Chil', 'Mother of how many children, and number of these children living'),
-			new CensusColumnBirthPlaceSimple($this, 'BP', 'Place of birth'),
-			new CensusColumnFatherBirthPlaceSimple($this, 'FBP', 'Place of birth of father'),
-			new CensusColumnFatherBirthPlaceSimple($this, 'MBP', 'Place of birth of mother'),
-			new CensusColumnNull($this, 'US', 'Number of years in the United States'),
-			new CensusColumnNull($this, 'Nat', 'Whether naturalized'),
-			new CensusColumnNull($this, 'Papers', 'Whether naturalization papers have been taken out'),
-			new CensusColumnOccupation($this, 'Occupation', 'Profession, trade, occupation'),
-			new CensusColumnNull($this, 'Unemp', 'Months unemployed during the census year (June 1, 1889, to May 31, 1890)'),
-			new CensusColumnNull($this, 'Read', 'Able to read'),
-			new CensusColumnNull($this, 'Write', 'Able to write'),
-			new CensusColumnNull($this, 'Eng', 'Able to speak English. If not the language or dialect spoken'),
-			new CensusColumnNull($this, 'Disease', 'Whether suffering from acute or chronic disease, with name of disease and length of time afflicted'),
-			new CensusColumnNull($this, 'Infirm', 'Whether defective in mind, sight, hearing, or speech, or whether crippled, maimed, or deformed, with name of defect'),
-			new CensusColumnNull($this, 'Prisoner', 'Whether a prisoner, convict, homeless child, or pauper'),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnGivenNameInitial($this, 'Name', 'Christian name in full, and initial of middle name'),
+            new CensusColumnSurname($this, 'Surname', 'Surname'),
+            new CensusColumnNull($this, 'CW', 'Whether a soldier, sailor or marine during the civil war (U.S. or Conf.), or widow of such person'),
+            new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of family'),
+            new CensusColumnNull($this, 'Race', 'Whether white, black, mulatto, quadroon, octoroon, Chinese, Japanese, or Indian'),
+            new CensusColumnSexMF($this, 'Sex', 'Sex'),
+            new CensusColumnAge($this, 'Age', 'Age at nearest birthday. If under one year, give age in months'),
+            new CensusColumnConditionUs($this, 'Cond', 'Whether single, married, widowed, or divorced'),
+            new CensusColumnMonthIfMarriedWithinYear($this, 'Mar', 'Whether married duirng the census year (June 1, 1889, to May 31, 1890)'),
+            new CensusColumnNull($this, 'Chil', 'Mother of how many children, and number of these children living'),
+            new CensusColumnBirthPlaceSimple($this, 'BP', 'Place of birth'),
+            new CensusColumnFatherBirthPlaceSimple($this, 'FBP', 'Place of birth of father'),
+            new CensusColumnFatherBirthPlaceSimple($this, 'MBP', 'Place of birth of mother'),
+            new CensusColumnNull($this, 'US', 'Number of years in the United States'),
+            new CensusColumnNull($this, 'Nat', 'Whether naturalized'),
+            new CensusColumnNull($this, 'Papers', 'Whether naturalization papers have been taken out'),
+            new CensusColumnOccupation($this, 'Occupation', 'Profession, trade, occupation'),
+            new CensusColumnNull($this, 'Unemp', 'Months unemployed during the census year (June 1, 1889, to May 31, 1890)'),
+            new CensusColumnNull($this, 'Read', 'Able to read'),
+            new CensusColumnNull($this, 'Write', 'Able to write'),
+            new CensusColumnNull($this, 'Eng', 'Able to speak English. If not the language or dialect spoken'),
+            new CensusColumnNull($this, 'Disease', 'Whether suffering from acute or chronic disease, with name of disease and length of time afflicted'),
+            new CensusColumnNull($this, 'Infirm', 'Whether defective in mind, sight, hearing, or speech, or whether crippled, maimed, or deformed, with name of defect'),
+            new CensusColumnNull($this, 'Prisoner', 'Whether a prisoner, convict, homeless child, or pauper'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfUnitedStates1890 extends CensusOfUnitedStates implements CensusInterface {
+class CensusOfUnitedStates1890 extends CensusOfUnitedStates implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '02 JUN 1890';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnGivenNameInitial($this, 'Name', 'Christian name in full, and initial of middle name'),
 			new CensusColumnSurname($this, 'Surname', 'Surname'),

app/Census/CensusOfFrance1891.php

Indentation +23 added lines, -23 removed lines

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

Indentation +29 added lines, -29 removed lines

@@ -19,35 +19,35 @@
  * Definitions for a census
  */
 class CensusOfDenmark1835 extends CensusOfDenmark implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '18 FEB 1835';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '18 FEB 1835';
+    }
 
-	/**
-	 * Where did this census occur, in GEDCOM format.
-	 *
-	 * @return string
-	 */
-	public function censusPlace() {
-		return 'Schleswig-Holstein, Deutschland';
-	}
+    /**
+     * Where did this census occur, in GEDCOM format.
+     *
+     * @return string
+     */
+    public function censusPlace() {
+        return 'Schleswig-Holstein, Deutschland';
+    }
 
-	/**
-	 * 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 CensusColumnRelationToHead($this, 'Stilling i familien', ''),
-		);
-	}
+    /**
+     * 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 CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+        );
+    }
 }

Braces +8 added lines, -4 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfDenmark1835 extends CensusOfDenmark implements CensusInterface {
+class CensusOfDenmark1835 extends CensusOfDenmark implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '18 FEB 1835';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function censusPlace() {
+	public function censusPlace()
+	{
 		return 'Schleswig-Holstein, Deutschland';
 	}
 
@@ -42,7 +45,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnFullName($this, 'Navn', ''),
 			new CensusColumnAge($this, 'Alder', ''),

app/Census/AbstractCensusColumn.php

Indentation +146 added lines, -146 removed lines

@@ -23,150 +23,150 @@
  * Definitions for a census column
  */
 class AbstractCensusColumn {
-	/** @var CensusInterface */
-	private $census;
-
-	/** @var string */
-	private $abbr;
-
-	/** @var string */
-	private $title;
-
-	/**
-	 * Create a column for a census
-	 *
-	 * @param CensusInterface $census - The census to which this column forms part.
-	 * @param string          $abbr   - The abbrievated on-screen name "BiC"
-	 * @param string          $title  - The full column heading "Born in the county"
-	 */
-	public function __construct(CensusInterface $census, $abbr, $title) {
-		$this->census = $census;
-		$this->abbr   = $abbr;
-		$this->title  = $title;
-	}
-
-	/**
-	 * A short version of the column's name.
-	 *
-	 * @return string
-	 */
-	public function abbreviation() {
-		return $this->abbr;
-	}
-
-	/**
-	 * Extract the country (last part) of a place name.
-	 *
-	 * @param string $place - e.g. "London, England"
-	 *
-	 * @return string - e.g. "England"
-	 */
-	protected function lastPartOfPlace($place) {
-		$place = explode(', ', $place);
-
-		return end($place);
-	}
-
-	/**
-	 * When did this census occur
-	 *
-	 * @return Date
-	 */
-	public function date() {
-		return new Date($this->census->censusDate());
-	}
-
-	/**
-	 * Find the father of an individual
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Individual|null
-	 */
-	public function father(Individual $individual) {
-		$family = $individual->getPrimaryChildFamily();
-
-		if ($family) {
-			return $family->getHusband();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Find the mother of an individual
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Individual|null
-	 */
-	public function mother(Individual $individual) {
-		$family = $individual->getPrimaryChildFamily();
-
-		if ($family) {
-			return $family->getWife();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Remove the country of a place name, where it is the same as the census place
-	 *
-	 * @param string $place - e.g. "London, England"
-	 *
-	 * @return string - e.g. "London" (for census of England) and "London, England" elsewhere
-	 */
-	protected function notCountry($place) {
-		$parts = explode(', ', $place);
-
-		if (end($parts) === $this->place()) {
-			return implode(', ', array_slice($parts, 0, -1));
-		} else {
-			return $place;
-		}
-	}
-
-	/**
-	 * Where did this census occur
-	 *
-	 * @return string
-	 */
-	public function place() {
-		return $this->census->censusPlace();
-	}
-
-	/**
-	 * Find the current spouse family of an individual
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Family|null
-	 */
-	public function spouseFamily(Individual $individual) {
-		// Exclude families that were created after this census date
-		$families = array();
-		foreach ($individual->getSpouseFamilies() as $family) {
-			if (Date::compare($family->getMarriageDate(), $this->date()) <= 0) {
-				$families[] = $family;
-			}
-		}
-
-		if (empty($families)) {
-			return null;
-		} else {
-			usort($families, function (Family $x, Family $y) { return Date::compare($x->getMarriageDate(), $y->getMarriageDate()); });
-
-			return end($families);
-		}
-	}
-
-	/**
-	 * The full version of the column's name.
-	 *
-	 * @return string
-	 */
-	public function title() {
-		return $this->title;
-	}
+    /** @var CensusInterface */
+    private $census;
+
+    /** @var string */
+    private $abbr;
+
+    /** @var string */
+    private $title;
+
+    /**
+     * Create a column for a census
+     *
+     * @param CensusInterface $census - The census to which this column forms part.
+     * @param string          $abbr   - The abbrievated on-screen name "BiC"
+     * @param string          $title  - The full column heading "Born in the county"
+     */
+    public function __construct(CensusInterface $census, $abbr, $title) {
+        $this->census = $census;
+        $this->abbr   = $abbr;
+        $this->title  = $title;
+    }
+
+    /**
+     * A short version of the column's name.
+     *
+     * @return string
+     */
+    public function abbreviation() {
+        return $this->abbr;
+    }
+
+    /**
+     * Extract the country (last part) of a place name.
+     *
+     * @param string $place - e.g. "London, England"
+     *
+     * @return string - e.g. "England"
+     */
+    protected function lastPartOfPlace($place) {
+        $place = explode(', ', $place);
+
+        return end($place);
+    }
+
+    /**
+     * When did this census occur
+     *
+     * @return Date
+     */
+    public function date() {
+        return new Date($this->census->censusDate());
+    }
+
+    /**
+     * Find the father of an individual
+     *
+     * @param Individual $individual
+     *
+     * @return Individual|null
+     */
+    public function father(Individual $individual) {
+        $family = $individual->getPrimaryChildFamily();
+
+        if ($family) {
+            return $family->getHusband();
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Find the mother of an individual
+     *
+     * @param Individual $individual
+     *
+     * @return Individual|null
+     */
+    public function mother(Individual $individual) {
+        $family = $individual->getPrimaryChildFamily();
+
+        if ($family) {
+            return $family->getWife();
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Remove the country of a place name, where it is the same as the census place
+     *
+     * @param string $place - e.g. "London, England"
+     *
+     * @return string - e.g. "London" (for census of England) and "London, England" elsewhere
+     */
+    protected function notCountry($place) {
+        $parts = explode(', ', $place);
+
+        if (end($parts) === $this->place()) {
+            return implode(', ', array_slice($parts, 0, -1));
+        } else {
+            return $place;
+        }
+    }
+
+    /**
+     * Where did this census occur
+     *
+     * @return string
+     */
+    public function place() {
+        return $this->census->censusPlace();
+    }
+
+    /**
+     * Find the current spouse family of an individual
+     *
+     * @param Individual $individual
+     *
+     * @return Family|null
+     */
+    public function spouseFamily(Individual $individual) {
+        // Exclude families that were created after this census date
+        $families = array();
+        foreach ($individual->getSpouseFamilies() as $family) {
+            if (Date::compare($family->getMarriageDate(), $this->date()) <= 0) {
+                $families[] = $family;
+            }
+        }
+
+        if (empty($families)) {
+            return null;
+        } else {
+            usort($families, function (Family $x, Family $y) { return Date::compare($x->getMarriageDate(), $y->getMarriageDate()); });
+
+            return end($families);
+        }
+    }
+
+    /**
+     * The full version of the column's name.
+     *
+     * @return string
+     */
+    public function title() {
+        return $this->title;
+    }
 }

Braces +22 added lines, -11 removed lines

@@ -22,7 +22,8 @@ 
 /**
  * Definitions for a census column
  */
-class AbstractCensusColumn {
+class AbstractCensusColumn
+{
 	/** @var CensusInterface */
 	private $census;
 
@@ -39,7 +40,8 @@ 
 	 * @param string          $abbr   - The abbrievated on-screen name "BiC"
 	 * @param string          $title  - The full column heading "Born in the county"
 	 */
-	public function __construct(CensusInterface $census, $abbr, $title) {
+	public function __construct(CensusInterface $census, $abbr, $title)
+	{
 		$this->census = $census;
 		$this->abbr   = $abbr;
 		$this->title  = $title;
@@ -50,7 +52,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function abbreviation() {
+	public function abbreviation()
+	{
 		return $this->abbr;
 	}
 
@@ -61,7 +64,8 @@ 
 	 *
 	 * @return string - e.g. "England"
 	 */
-	protected function lastPartOfPlace($place) {
+	protected function lastPartOfPlace($place)
+	{
 		$place = explode(', ', $place);
 
 		return end($place);
@@ -72,7 +76,8 @@ 
 	 *
 	 * @return Date
 	 */
-	public function date() {
+	public function date()
+	{
 		return new Date($this->census->censusDate());
 	}
 
@@ -83,7 +88,8 @@ 
 	 *
 	 * @return Individual|null
 	 */
-	public function father(Individual $individual) {
+	public function father(Individual $individual)
+	{
 		$family = $individual->getPrimaryChildFamily();
 
 		if ($family) {
@@ -100,7 +106,8 @@ 
 	 *
 	 * @return Individual|null
 	 */
-	public function mother(Individual $individual) {
+	public function mother(Individual $individual)
+	{
 		$family = $individual->getPrimaryChildFamily();
 
 		if ($family) {
@@ -117,7 +124,8 @@ 
 	 *
 	 * @return string - e.g. "London" (for census of England) and "London, England" elsewhere
 	 */
-	protected function notCountry($place) {
+	protected function notCountry($place)
+	{
 		$parts = explode(', ', $place);
 
 		if (end($parts) === $this->place()) {
@@ -132,7 +140,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function place() {
+	public function place()
+	{
 		return $this->census->censusPlace();
 	}
 
@@ -143,7 +152,8 @@ 
 	 *
 	 * @return Family|null
 	 */
-	public function spouseFamily(Individual $individual) {
+	public function spouseFamily(Individual $individual)
+	{
 		// Exclude families that were created after this census date
 		$families = array();
 		foreach ($individual->getSpouseFamilies() as $family) {
@@ -166,7 +176,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function title() {
+	public function title()
+	{
 		return $this->title;
 	}
 }