fisharebest / webtrees

app/Census/CensusColumnMotherBirthPlaceSimple.php

Indentation +11 added lines, -11 removed lines

@@ -21,15 +21,15 @@
  * The individual's mother's birth place.
  */
 class CensusColumnMotherBirthPlaceSimple extends CensusColumnMotherBirthPlace implements CensusColumnInterface {
-	/**
-	 * Generate the likely value of this census column, based on available information.
-	 *
-	 * @param Individual      $individual
-	 * @param Individual|null $head
-	 *
-	 * @return string
-	 */
-	public function generate(Individual $individual, Individual $head = null) {
-		return $this->lastPartOfPlace(parent::generate($individual, $head));
-	}
+    /**
+     * Generate the likely value of this census column, based on available information.
+     *
+     * @param Individual      $individual
+     * @param Individual|null $head
+     *
+     * @return string
+     */
+    public function generate(Individual $individual, Individual $head = null) {
+        return $this->lastPartOfPlace(parent::generate($individual, $head));
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * The individual's mother's birth place.
  */
-class CensusColumnMotherBirthPlaceSimple extends CensusColumnMotherBirthPlace implements CensusColumnInterface {
+class CensusColumnMotherBirthPlaceSimple extends CensusColumnMotherBirthPlace implements CensusColumnInterface
+{
 	/**
 	 * Generate the likely value of this census column, based on available information.
 	 *
@@ -29,7 +30,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function generate(Individual $individual, Individual $head = null) {
+	public function generate(Individual $individual, Individual $head = null)
+	{
 		return $this->lastPartOfPlace(parent::generate($individual, $head));
 	}
 }

app/Census/CensusOfEngland1891.php

Indentation +28 added lines, -28 removed lines

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

Braces +6 added lines, -3 removed lines

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

app/Census/CensusColumnSurnameGivenNameInitial.php

Indentation +17 added lines, -17 removed lines

@@ -21,21 +21,21 @@
  * The individual's full name.
  */
 class CensusColumnSurnameGivenNameInitial extends CensusColumnFullName {
-	/**
-	 * 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) {
-		$name  = $this->nameAtCensusDate($individual, $this->date());
-		$given = $name['givn'];
-		if (strpos($given, ' ') === false) {
-			return $name['surname'] . ', ' . $given;
-		} else {
-			return $name['surname'] . ', ' . substr($given, 0, strpos($given, ' ') + 2);
-		}
-	}
+    /**
+     * 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) {
+        $name  = $this->nameAtCensusDate($individual, $this->date());
+        $given = $name['givn'];
+        if (strpos($given, ' ') === false) {
+            return $name['surname'] . ', ' . $given;
+        } else {
+            return $name['surname'] . ', ' . substr($given, 0, strpos($given, ' ') + 2);
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * The individual's full name.
  */
-class CensusColumnSurnameGivenNameInitial extends CensusColumnFullName {
+class CensusColumnSurnameGivenNameInitial extends CensusColumnFullName
+{
 	/**
 	 * 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)
+	{
 		$name  = $this->nameAtCensusDate($individual, $this->date());
 		$given = $name['givn'];
 		if (strpos($given, ' ') === false) {

app/Census/CensusOfUnitedStates1810.php

Indentation +31 added lines, -31 removed lines

@@ -19,37 +19,37 @@
  * Definitions for a census
  */
 class CensusOfUnitedStates1810 extends CensusOfUnitedStates implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '06 AUG 1810';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '06 AUG 1810';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Name', 'Name of head of family'),
-			new CensusColumnNull($this, 'M0-10', 'Free white males 0-10 years'),
-			new CensusColumnNull($this, 'M10-16', 'Free white males 10-16 years'),
-			new CensusColumnNull($this, 'M16-26', 'Free white males 16-26 years'),
-			new CensusColumnNull($this, 'M26-45', 'Free white males 26-45 years'),
-			new CensusColumnNull($this, 'M45+', 'Free white males 45+ years'),
-			new CensusColumnNull($this, 'F0-10', 'Free white females 0-10 years'),
-			new CensusColumnNull($this, 'F10-16', 'Free white females 10-16 years'),
-			new CensusColumnNull($this, 'F16-26', 'Free white females 16-26 years'),
-			new CensusColumnNull($this, 'F26-45', 'Free white females 26-45 years'),
-			new CensusColumnNull($this, 'F45+', 'Free white females 45+ years'),
-			new CensusColumnNull($this, 'Free', 'All other free persons, except Indians not taxed'),
-			new CensusColumnNull($this, 'Slaves', 'Number of slaves'),
-			new CensusColumnNull($this, 'Total', 'Total number of individuals'),
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnFullName($this, 'Name', 'Name of head of family'),
+            new CensusColumnNull($this, 'M0-10', 'Free white males 0-10 years'),
+            new CensusColumnNull($this, 'M10-16', 'Free white males 10-16 years'),
+            new CensusColumnNull($this, 'M16-26', 'Free white males 16-26 years'),
+            new CensusColumnNull($this, 'M26-45', 'Free white males 26-45 years'),
+            new CensusColumnNull($this, 'M45+', 'Free white males 45+ years'),
+            new CensusColumnNull($this, 'F0-10', 'Free white females 0-10 years'),
+            new CensusColumnNull($this, 'F10-16', 'Free white females 10-16 years'),
+            new CensusColumnNull($this, 'F16-26', 'Free white females 16-26 years'),
+            new CensusColumnNull($this, 'F26-45', 'Free white females 26-45 years'),
+            new CensusColumnNull($this, 'F45+', 'Free white females 45+ years'),
+            new CensusColumnNull($this, 'Free', 'All other free persons, except Indians not taxed'),
+            new CensusColumnNull($this, 'Slaves', 'Number of slaves'),
+            new CensusColumnNull($this, 'Total', 'Total number of individuals'),
 
-		);
-	}
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfUnitedStates1810 extends CensusOfUnitedStates implements CensusInterface {
+class CensusOfUnitedStates1810 extends CensusOfUnitedStates implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '06 AUG 1810';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnFullName($this, 'Name', 'Name of head of family'),
 			new CensusColumnNull($this, 'M0-10', 'Free white males 0-10 years'),

app/Census/CensusOfFrance1846.php

Indentation +27 added lines, -27 removed lines

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

Indentation +16 added lines, -16 removed lines

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

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * The individual's date of birth.
  */
-class CensusColumnBirthDayMonthSlashYear extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnBirthDayMonthSlashYear 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_date = $individual->getBirthDate();
 
 		if ($birth_date->minimumJulianDay() === $birth_date->maximumJulianDay()) {

app/Census/CensusOfWales1871.php

Indentation +25 added lines, -25 removed lines

@@ -19,30 +19,30 @@
  * Definitions for a census
  */
 class CensusOfWales1871 extends CensusOfWales implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '02 APR 1871';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '02 APR 1871';
+    }
 
-	/**
-	 * 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 deaf-and-dumb, blind, imbecile, idiot or lunatic'),
-		);
-	}
+    /**
+     * 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 deaf-and-dumb, blind, imbecile, idiot or lunatic'),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

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

Indentation +19 added lines, -19 removed lines

@@ -21,24 +21,24 @@
  * The individual's full name.
  */
 class CensusColumnGivenNameInitial 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) {
-			$given = $name['givn'];
-			if (strpos($given, ' ') === false) {
-				return $given;
-			} else {
-				return substr($given, 0, strpos($given, ' ') + 2);
-			}
-		}
+    /**
+     * 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) {
+            $given = $name['givn'];
+            if (strpos($given, ' ') === false) {
+                return $given;
+            } else {
+                return substr($given, 0, strpos($given, ' ') + 2);
+            }
+        }
 
-		return '';
-	}
+        return '';
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * The individual's full name.
  */
-class CensusColumnGivenNameInitial extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnGivenNameInitial 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) {
 			$given = $name['givn'];
 			if (strpos($given, ' ') === false) {

app/Census/CensusColumnConditionFrenchGarcon.php

Indentation +15 added lines, -15 removed lines

@@ -19,23 +19,23 @@
  * Marital status.
  */
 class CensusColumnConditionFrenchGarcon 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 = '1';
-	protected $spinster = '';
+    /* Text to display for unmarried individuals */
+    protected $bachelor = '1';
+    protected $spinster = '';
 
-	/* Text to display for children */
-	protected $boy  = '1';
-	protected $girl = '';
+    /* Text to display for children */
+    protected $boy  = '1';
+    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 = '';
-	protected $widow   = '';
+    /* Text to display for widowed individuals (not yet implemented) */
+    protected $widower = '';
+    protected $widow   = '';
 }

Braces +2 added lines, -1 removed lines

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