Completed
Push — 1.7 ( ce7091...0d97cf )
by Greg
14:14 queued 07:41
created
app/Census/CensusOfDenmark1850.php 2 patches
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -19,32 +19,32 @@
 block discarded – undo
19 19
  * Definitions for a census
20 20
  */
21 21
 class CensusOfDenmark1850 extends CensusOfDenmark implements CensusInterface {
22
-	/**
23
-	 * When did this census occur.
24
-	 *
25
-	 * @return string
26
-	 */
27
-	public function censusDate() {
28
-		return '01 FEB 1850';
29
-	}
22
+    /**
23
+     * When did this census occur.
24
+     *
25
+     * @return string
26
+     */
27
+    public function censusDate() {
28
+        return '01 FEB 1850';
29
+    }
30 30
 
31
-	/**
32
-	 * The columns of the census.
33
-	 *
34
-	 * @return CensusColumnInterface[]
35
-	 */
36
-	public function columns() {
37
-		return array(
38
-			new CensusColumnFullName($this, 'Navn', ''),
39
-			new CensusColumnAge($this, 'Alder', ''),
40
-			new CensusColumnConditionDanish($this, 'Civilstand', ''),
41
-			new CensusColumnOccupation($this, 'Erhverv', ''),
42
-			new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
43
-			new CensusColumnNull($this, '', ''),
44
-			new CensusColumnNull($this, '', ''),
45
-			new CensusColumnNull($this, '', ''),
46
-			new CensusColumnNull($this, '', ''),
47
-			new CensusColumnNull($this, '', ''),
48
-		);
49
-	}
31
+    /**
32
+     * The columns of the census.
33
+     *
34
+     * @return CensusColumnInterface[]
35
+     */
36
+    public function columns() {
37
+        return array(
38
+            new CensusColumnFullName($this, 'Navn', ''),
39
+            new CensusColumnAge($this, 'Alder', ''),
40
+            new CensusColumnConditionDanish($this, 'Civilstand', ''),
41
+            new CensusColumnOccupation($this, 'Erhverv', ''),
42
+            new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
43
+            new CensusColumnNull($this, '', ''),
44
+            new CensusColumnNull($this, '', ''),
45
+            new CensusColumnNull($this, '', ''),
46
+            new CensusColumnNull($this, '', ''),
47
+            new CensusColumnNull($this, '', ''),
48
+        );
49
+    }
50 50
 }
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,13 +18,15 @@  discard block
 block discarded – undo
18 18
 /**
19 19
  * Definitions for a census
20 20
  */
21
-class CensusOfDenmark1850 extends CensusOfDenmark implements CensusInterface {
21
+class CensusOfDenmark1850 extends CensusOfDenmark implements CensusInterface
22
+{
22 23
 	/**
23 24
 	 * When did this census occur.
24 25
 	 *
25 26
 	 * @return string
26 27
 	 */
27
-	public function censusDate() {
28
+	public function censusDate()
29
+	{
28 30
 		return '01 FEB 1850';
29 31
 	}
30 32
 
@@ -33,7 +35,8 @@  discard block
 block discarded – undo
33 35
 	 *
34 36
 	 * @return CensusColumnInterface[]
35 37
 	 */
36
-	public function columns() {
38
+	public function columns()
39
+	{
37 40
 		return array(
38 41
 			new CensusColumnFullName($this, 'Navn', ''),
39 42
 			new CensusColumnAge($this, 'Alder', ''),
Please login to merge, or discard this patch.
app/Census/CensusColumnFatherBirthPlace.php 2 patches
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -21,21 +21,21 @@
 block discarded – undo
21 21
  * Birth place of the individual's fther.
22 22
  */
23 23
 class CensusColumnFatherBirthPlace extends AbstractCensusColumn implements CensusColumnInterface {
24
-	/**
25
-	 * Generate the likely value of this census column, based on available information.
26
-	 *
27
-	 * @param Individual      $individual
28
-	 * @param Individual|null $head
29
-	 *
30
-	 * @return string
31
-	 */
32
-	public function generate(Individual $individual, Individual $head = null) {
33
-		$father = $this->father($individual);
24
+    /**
25
+     * Generate the likely value of this census column, based on available information.
26
+     *
27
+     * @param Individual      $individual
28
+     * @param Individual|null $head
29
+     *
30
+     * @return string
31
+     */
32
+    public function generate(Individual $individual, Individual $head = null) {
33
+        $father = $this->father($individual);
34 34
 
35
-		if ($father) {
36
-			return $this->notCountry($father->getBirthPlace());
37
-		} else {
38
-			return '';
39
-		}
40
-	}
35
+        if ($father) {
36
+            return $this->notCountry($father->getBirthPlace());
37
+        } else {
38
+            return '';
39
+        }
40
+    }
41 41
 }
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,7 +20,8 @@  discard block
 block discarded – undo
20 20
 /**
21 21
  * Birth place of the individual's fther.
22 22
  */
23
-class CensusColumnFatherBirthPlace extends AbstractCensusColumn implements CensusColumnInterface {
23
+class CensusColumnFatherBirthPlace extends AbstractCensusColumn implements CensusColumnInterface
24
+{
24 25
 	/**
25 26
 	 * Generate the likely value of this census column, based on available information.
26 27
 	 *
@@ -29,7 +30,8 @@  discard block
 block discarded – undo
29 30
 	 *
30 31
 	 * @return string
31 32
 	 */
32
-	public function generate(Individual $individual, Individual $head = null) {
33
+	public function generate(Individual $individual, Individual $head = null)
34
+	{
33 35
 		$father = $this->father($individual);
34 36
 
35 37
 		if ($father) {
Please login to merge, or discard this patch.
app/Census/RegisterOfEngland1939.php 2 patches
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -19,30 +19,30 @@
 block discarded – undo
19 19
  * Definitions for a census
20 20
  */
21 21
 class RegisterOfEngland1939 extends CensusOfEngland implements CensusInterface {
22
-	/**
23
-	 * When did this census occur.
24
-	 *
25
-	 * @return string
26
-	 */
27
-	public function censusDate() {
28
-		return '29 SEP 1939';
29
-	}
22
+    /**
23
+     * When did this census occur.
24
+     *
25
+     * @return string
26
+     */
27
+    public function censusDate() {
28
+        return '29 SEP 1939';
29
+    }
30 30
 
31
-	/**
32
-	 * The columns of the census.
33
-	 *
34
-	 * @return CensusColumnInterface[]
35
-	 */
36
-	public function columns() {
37
-		return array(
38
-			new CensusColumnNull($this, 'Schedule', 'Schedule Number'),
39
-			new CensusColumnNull($this, 'SubNum', 'Schedule Sub Number'),
40
-			new CensusColumnSurnameGivenNames($this, 'Name', 'Surname & other names'),
41
-			new CensusColumnNull($this, 'Role', 'For institutions only – for example, Officer, Visitor, Servant, Patient, Inmate'),
42
-			new CensusColumnSexMF($this, 'Sex', 'Male or Female'),
43
-			new CensusColumnBirthDayMonthSlashYear($this, 'DOB', 'Date of birth'),
44
-			new CensusColumnConditionEnglish($this, 'MC', 'Marital Condition - Married, Single, Unmarried, Widowed or Divorced'),
45
-			new CensusColumnOccupation($this, 'Occupation', 'Occupation'),
46
-		);
47
-	}
31
+    /**
32
+     * The columns of the census.
33
+     *
34
+     * @return CensusColumnInterface[]
35
+     */
36
+    public function columns() {
37
+        return array(
38
+            new CensusColumnNull($this, 'Schedule', 'Schedule Number'),
39
+            new CensusColumnNull($this, 'SubNum', 'Schedule Sub Number'),
40
+            new CensusColumnSurnameGivenNames($this, 'Name', 'Surname & other names'),
41
+            new CensusColumnNull($this, 'Role', 'For institutions only – for example, Officer, Visitor, Servant, Patient, Inmate'),
42
+            new CensusColumnSexMF($this, 'Sex', 'Male or Female'),
43
+            new CensusColumnBirthDayMonthSlashYear($this, 'DOB', 'Date of birth'),
44
+            new CensusColumnConditionEnglish($this, 'MC', 'Marital Condition - Married, Single, Unmarried, Widowed or Divorced'),
45
+            new CensusColumnOccupation($this, 'Occupation', 'Occupation'),
46
+        );
47
+    }
48 48
 }
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,13 +18,15 @@  discard block
 block discarded – undo
18 18
 /**
19 19
  * Definitions for a census
20 20
  */
21
-class RegisterOfEngland1939 extends CensusOfEngland implements CensusInterface {
21
+class RegisterOfEngland1939 extends CensusOfEngland implements CensusInterface
22
+{
22 23
 	/**
23 24
 	 * When did this census occur.
24 25
 	 *
25 26
 	 * @return string
26 27
 	 */
27
-	public function censusDate() {
28
+	public function censusDate()
29
+	{
28 30
 		return '29 SEP 1939';
29 31
 	}
30 32
 
@@ -33,7 +35,8 @@  discard block
 block discarded – undo
33 35
 	 *
34 36
 	 * @return CensusColumnInterface[]
35 37
 	 */
36
-	public function columns() {
38
+	public function columns()
39
+	{
37 40
 		return array(
38 41
 			new CensusColumnNull($this, 'Schedule', 'Schedule Number'),
39 42
 			new CensusColumnNull($this, 'SubNum', 'Schedule Sub Number'),
Please login to merge, or discard this patch.
app/Census/CensusOfFrance1936.php 2 patches
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -19,30 +19,30 @@
 block discarded – undo
19 19
  * Definitions for a census
20 20
  */
21 21
 class CensusOfFrance1936 extends CensusOfFrance implements CensusInterface {
22
-	/**
23
-	 * When did this census occur.
24
-	 *
25
-	 * @return string
26
-	 */
27
-	public function censusDate() {
28
-		return '16 JAN 1936';
29
-	}
22
+    /**
23
+     * When did this census occur.
24
+     *
25
+     * @return string
26
+     */
27
+    public function censusDate() {
28
+        return '16 JAN 1936';
29
+    }
30 30
 
31
-	/**
32
-	 * The columns of the census.
33
-	 *
34
-	 * @return CensusColumnInterface[]
35
-	 */
36
-	public function columns() {
37
-		return array(
38
-			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
39
-			new CensusColumnGivenNames($this, 'Prénoms', ''),
40
-			new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),
41
-			new CensusColumnBirthPlace($this, 'Lieu', 'Lieu de naissance'),
42
-			new CensusColumnNationality($this, 'Nationalité', ''),
43
-			new CensusColumnRelationToHead($this, 'Situation', 'Situation par rapport au chef de ménage'),
44
-			new CensusColumnOccupation($this, 'Profession', ''),
45
-			new CensusColumnNull($this, 'Empl', ''),
46
-		);
47
-	}
31
+    /**
32
+     * The columns of the census.
33
+     *
34
+     * @return CensusColumnInterface[]
35
+     */
36
+    public function columns() {
37
+        return array(
38
+            new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
39
+            new CensusColumnGivenNames($this, 'Prénoms', ''),
40
+            new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),
41
+            new CensusColumnBirthPlace($this, 'Lieu', 'Lieu de naissance'),
42
+            new CensusColumnNationality($this, 'Nationalité', ''),
43
+            new CensusColumnRelationToHead($this, 'Situation', 'Situation par rapport au chef de ménage'),
44
+            new CensusColumnOccupation($this, 'Profession', ''),
45
+            new CensusColumnNull($this, 'Empl', ''),
46
+        );
47
+    }
48 48
 }
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,13 +18,15 @@  discard block
 block discarded – undo
18 18
 /**
19 19
  * Definitions for a census
20 20
  */
21
-class CensusOfFrance1936 extends CensusOfFrance implements CensusInterface {
21
+class CensusOfFrance1936 extends CensusOfFrance implements CensusInterface
22
+{
22 23
 	/**
23 24
 	 * When did this census occur.
24 25
 	 *
25 26
 	 * @return string
26 27
 	 */
27
-	public function censusDate() {
28
+	public function censusDate()
29
+	{
28 30
 		return '16 JAN 1936';
29 31
 	}
30 32
 
@@ -33,7 +35,8 @@  discard block
 block discarded – undo
33 35
 	 *
34 36
 	 * @return CensusColumnInterface[]
35 37
 	 */
36
-	public function columns() {
38
+	public function columns()
39
+	{
37 40
 		return array(
38 41
 			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
39 42
 			new CensusColumnGivenNames($this, 'Prénoms', ''),
Please login to merge, or discard this patch.
app/Census/CensusColumnYearsMarried.php 2 patches
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -22,29 +22,29 @@
 block discarded – undo
22 22
  * For how many years has the individual been married.
23 23
  */
24 24
 class CensusColumnYearsMarried extends AbstractCensusColumn implements CensusColumnInterface {
25
-	/**
26
-	 * Generate the likely value of this census column, based on available information.
27
-	 *
28
-	 * @param Individual      $individual
29
-	 * @param Individual|null $head
30
-	 *
31
-	 * @return string
32
-	 */
33
-	public function generate(Individual $individual, Individual $head = null) {
34
-		$marriage_date = null;
25
+    /**
26
+     * Generate the likely value of this census column, based on available information.
27
+     *
28
+     * @param Individual      $individual
29
+     * @param Individual|null $head
30
+     *
31
+     * @return string
32
+     */
33
+    public function generate(Individual $individual, Individual $head = null) {
34
+        $marriage_date = null;
35 35
 
36
-		foreach ($individual->getSpouseFamilies() as $family) {
37
-			foreach ($family->getFacts('MARR', true) as $fact) {
38
-				if ($fact->getDate()->isOK() && Date::compare($fact->getDate(), $this->date()) <= 0) {
39
-					$marriage_date = $fact->getDate();
40
-				}
41
-			}
42
-		}
36
+        foreach ($individual->getSpouseFamilies() as $family) {
37
+            foreach ($family->getFacts('MARR', true) as $fact) {
38
+                if ($fact->getDate()->isOK() && Date::compare($fact->getDate(), $this->date()) <= 0) {
39
+                    $marriage_date = $fact->getDate();
40
+                }
41
+            }
42
+        }
43 43
 
44
-		if ($marriage_date === null) {
45
-			return '';
46
-		} else {
47
-			return (string) Date::getAge($marriage_date, $this->date(), 0);
48
-		}
49
-	}
44
+        if ($marriage_date === null) {
45
+            return '';
46
+        } else {
47
+            return (string) Date::getAge($marriage_date, $this->date(), 0);
48
+        }
49
+    }
50 50
 }
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,7 +21,8 @@  discard block
 block discarded – undo
21 21
 /**
22 22
  * For how many years has the individual been married.
23 23
  */
24
-class CensusColumnYearsMarried extends AbstractCensusColumn implements CensusColumnInterface {
24
+class CensusColumnYearsMarried extends AbstractCensusColumn implements CensusColumnInterface
25
+{
25 26
 	/**
26 27
 	 * Generate the likely value of this census column, based on available information.
27 28
 	 *
@@ -30,7 +31,8 @@  discard block
 block discarded – undo
30 31
 	 *
31 32
 	 * @return string
32 33
 	 */
33
-	public function generate(Individual $individual, Individual $head = null) {
34
+	public function generate(Individual $individual, Individual $head = null)
35
+	{
34 36
 		$marriage_date = null;
35 37
 
36 38
 		foreach ($individual->getSpouseFamilies() as $family) {
Please login to merge, or discard this patch.
app/Census/CensusColumnMonthIfBornWithinYear.php 2 patches
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -21,22 +21,22 @@
 block discarded – undo
21 21
  * The month of birth, if within the last year.
22 22
  */
23 23
 class CensusColumnMonthIfBornWithinYear extends AbstractCensusColumn implements CensusColumnInterface {
24
-	/**
25
-	 * Generate the likely value of this census column, based on available information.
26
-	 *
27
-	 * @param Individual      $individual
28
-	 * @param Individual|null $head
29
-	 *
30
-	 * @return string
31
-	 */
32
-	public function generate(Individual $individual, Individual $head = null) {
33
-		$birth_jd  = $individual->getBirthDate()->julianDay();
34
-		$census_jd = $this->date()->julianDay();
35
-		if ($birth_jd <= $census_jd && $birth_jd >= $census_jd - 365) {
36
-			// Use the GEDCOM month, as we need this in English - for the US census
37
-			return ucfirst(strtolower($individual->getBirthDate()->minimumDate()->format('%O')));
38
-		} else {
39
-			return '';
40
-		}
41
-	}
24
+    /**
25
+     * Generate the likely value of this census column, based on available information.
26
+     *
27
+     * @param Individual      $individual
28
+     * @param Individual|null $head
29
+     *
30
+     * @return string
31
+     */
32
+    public function generate(Individual $individual, Individual $head = null) {
33
+        $birth_jd  = $individual->getBirthDate()->julianDay();
34
+        $census_jd = $this->date()->julianDay();
35
+        if ($birth_jd <= $census_jd && $birth_jd >= $census_jd - 365) {
36
+            // Use the GEDCOM month, as we need this in English - for the US census
37
+            return ucfirst(strtolower($individual->getBirthDate()->minimumDate()->format('%O')));
38
+        } else {
39
+            return '';
40
+        }
41
+    }
42 42
 }
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,7 +20,8 @@  discard block
 block discarded – undo
20 20
 /**
21 21
  * The month of birth, if within the last year.
22 22
  */
23
-class CensusColumnMonthIfBornWithinYear extends AbstractCensusColumn implements CensusColumnInterface {
23
+class CensusColumnMonthIfBornWithinYear extends AbstractCensusColumn implements CensusColumnInterface
24
+{
24 25
 	/**
25 26
 	 * Generate the likely value of this census column, based on available information.
26 27
 	 *
@@ -29,7 +30,8 @@  discard block
 block discarded – undo
29 30
 	 *
30 31
 	 * @return string
31 32
 	 */
32
-	public function generate(Individual $individual, Individual $head = null) {
33
+	public function generate(Individual $individual, Individual $head = null)
34
+	{
33 35
 		$birth_jd  = $individual->getBirthDate()->julianDay();
34 36
 		$census_jd = $this->date()->julianDay();
35 37
 		if ($birth_jd <= $census_jd && $birth_jd >= $census_jd - 365) {
Please login to merge, or discard this patch.
app/Census/CensusOfUnitedStates1930.php 2 patches
Indentation   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -19,50 +19,50 @@
 block discarded – undo
19 19
  * Definitions for a census
20 20
  */
21 21
 class CensusOfUnitedStates1930 extends CensusOfUnitedStates implements CensusInterface {
22
-	/**
23
-	 * When did this census occur.
24
-	 *
25
-	 * @return string
26
-	 */
27
-	public function censusDate() {
28
-		return 'APR 1930';
29
-	}
22
+    /**
23
+     * When did this census occur.
24
+     *
25
+     * @return string
26
+     */
27
+    public function censusDate() {
28
+        return 'APR 1930';
29
+    }
30 30
 
31
-	/**
32
-	 * The columns of the census.
33
-	 *
34
-	 * @return CensusColumnInterface[]
35
-	 */
36
-	public function columns() {
37
-		return array(
38
-			new CensusColumnFullName($this, 'Name', 'Name'),
39
-			new CensusColumnRelationToHead($this, 'Relation', 'Relationship of each person to the head of the family'),
40
-			new CensusColumnNull($this, 'Home', 'Home owned or rented'),
41
-			new CensusColumnNull($this, 'V/R', 'Value of house, if owned, or monthly rental if rented'),
42
-			new CensusColumnNull($this, 'Radio', 'Radio set'),
43
-			new CensusColumnNull($this, 'Farm', 'Does this family live on a farm'),
44
-			new CensusColumnSexMF($this, 'Sex', 'Sex'),
45
-			new CensusColumnNull($this, 'Race', 'Color or race'),
46
-			new CensusColumnAge($this, 'Age', 'Age at last birthday'),
47
-			new CensusColumnConditionUs($this, 'Cond', 'Whether single, married, widowed, or divorced'),
48
-			new CensusColumnAgeMarried($this, 'AM', 'Age at first marriage'),
49
-			new CensusColumnNull($this, 'School', 'Attended school since Sept. 1, 1929'),
50
-			new CensusColumnNull($this, 'R/W', 'Whether able to read and write'),
51
-			new CensusColumnBirthPlaceSimple($this, 'BP', 'Place of birth'),
52
-			new CensusColumnFatherBirthPlaceSimple($this, 'FBP', 'Place of birth of father'),
53
-			new CensusColumnMotherBirthPlaceSimple($this, 'MBP', 'Place of birth of mother'),
54
-			new CensusColumnNull($this, 'Lang', 'Language spoken in home before coming to the United States'),
55
-			new CensusColumnNull($this, 'Imm', 'Year of immigration to the United States'),
56
-			new CensusColumnNull($this, 'Nat', 'Naturalization'),
57
-			new CensusColumnNull($this, 'Eng', 'Whether able to speak English'),
58
-			new CensusColumnOccupation($this, 'Occupation', 'Trade, profession, or particular kind of work done'),
59
-			new CensusColumnNull($this, 'Industry', 'Industry, business of establishment in which at work'),
60
-			new CensusColumnNull($this, 'Code', 'Industry code'),
61
-			new CensusColumnNull($this, 'Emp', 'Class of worker'),
62
-			new CensusColumnNull($this, 'Work', 'Whether normally at work yesterday or the last regular working day'),
63
-			new CensusColumnNull($this, 'Unemp', 'If not, …'),
64
-			new CensusColumnNull($this, 'Vet', 'Whether a veteran of U.S. military or …'),
65
-			new CensusColumnNull($this, 'War', 'What war or …'),
66
-		);
67
-	}
31
+    /**
32
+     * The columns of the census.
33
+     *
34
+     * @return CensusColumnInterface[]
35
+     */
36
+    public function columns() {
37
+        return array(
38
+            new CensusColumnFullName($this, 'Name', 'Name'),
39
+            new CensusColumnRelationToHead($this, 'Relation', 'Relationship of each person to the head of the family'),
40
+            new CensusColumnNull($this, 'Home', 'Home owned or rented'),
41
+            new CensusColumnNull($this, 'V/R', 'Value of house, if owned, or monthly rental if rented'),
42
+            new CensusColumnNull($this, 'Radio', 'Radio set'),
43
+            new CensusColumnNull($this, 'Farm', 'Does this family live on a farm'),
44
+            new CensusColumnSexMF($this, 'Sex', 'Sex'),
45
+            new CensusColumnNull($this, 'Race', 'Color or race'),
46
+            new CensusColumnAge($this, 'Age', 'Age at last birthday'),
47
+            new CensusColumnConditionUs($this, 'Cond', 'Whether single, married, widowed, or divorced'),
48
+            new CensusColumnAgeMarried($this, 'AM', 'Age at first marriage'),
49
+            new CensusColumnNull($this, 'School', 'Attended school since Sept. 1, 1929'),
50
+            new CensusColumnNull($this, 'R/W', 'Whether able to read and write'),
51
+            new CensusColumnBirthPlaceSimple($this, 'BP', 'Place of birth'),
52
+            new CensusColumnFatherBirthPlaceSimple($this, 'FBP', 'Place of birth of father'),
53
+            new CensusColumnMotherBirthPlaceSimple($this, 'MBP', 'Place of birth of mother'),
54
+            new CensusColumnNull($this, 'Lang', 'Language spoken in home before coming to the United States'),
55
+            new CensusColumnNull($this, 'Imm', 'Year of immigration to the United States'),
56
+            new CensusColumnNull($this, 'Nat', 'Naturalization'),
57
+            new CensusColumnNull($this, 'Eng', 'Whether able to speak English'),
58
+            new CensusColumnOccupation($this, 'Occupation', 'Trade, profession, or particular kind of work done'),
59
+            new CensusColumnNull($this, 'Industry', 'Industry, business of establishment in which at work'),
60
+            new CensusColumnNull($this, 'Code', 'Industry code'),
61
+            new CensusColumnNull($this, 'Emp', 'Class of worker'),
62
+            new CensusColumnNull($this, 'Work', 'Whether normally at work yesterday or the last regular working day'),
63
+            new CensusColumnNull($this, 'Unemp', 'If not, …'),
64
+            new CensusColumnNull($this, 'Vet', 'Whether a veteran of U.S. military or …'),
65
+            new CensusColumnNull($this, 'War', 'What war or …'),
66
+        );
67
+    }
68 68
 }
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,13 +18,15 @@  discard block
 block discarded – undo
18 18
 /**
19 19
  * Definitions for a census
20 20
  */
21
-class CensusOfUnitedStates1930 extends CensusOfUnitedStates implements CensusInterface {
21
+class CensusOfUnitedStates1930 extends CensusOfUnitedStates implements CensusInterface
22
+{
22 23
 	/**
23 24
 	 * When did this census occur.
24 25
 	 *
25 26
 	 * @return string
26 27
 	 */
27
-	public function censusDate() {
28
+	public function censusDate()
29
+	{
28 30
 		return 'APR 1930';
29 31
 	}
30 32
 
@@ -33,7 +35,8 @@  discard block
 block discarded – undo
33 35
 	 *
34 36
 	 * @return CensusColumnInterface[]
35 37
 	 */
36
-	public function columns() {
38
+	public function columns()
39
+	{
37 40
 		return array(
38 41
 			new CensusColumnFullName($this, 'Name', 'Name'),
39 42
 			new CensusColumnRelationToHead($this, 'Relation', 'Relationship of each person to the head of the family'),
Please login to merge, or discard this patch.
app/Census/CensusOfScotland1871.php 2 patches
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -19,31 +19,31 @@
 block discarded – undo
19 19
  * Definitions for a census
20 20
  */
21 21
 class CensusOfScotland1871 extends CensusOfScotland implements CensusInterface {
22
-	/**
23
-	 * When did this census occur.
24
-	 *
25
-	 * @return string
26
-	 */
27
-	public function censusDate() {
28
-		return '02 APR 1871';
29
-	}
22
+    /**
23
+     * When did this census occur.
24
+     *
25
+     * @return string
26
+     */
27
+    public function censusDate() {
28
+        return '02 APR 1871';
29
+    }
30 30
 
31
-	/**
32
-	 * The columns of the census.
33
-	 *
34
-	 * @return CensusColumnInterface[]
35
-	 */
36
-	public function columns() {
37
-		return array(
38
-			new CensusColumnFullName($this, 'Name', 'Name and surname'),
39
-			new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'),
40
-			new CensusColumnConditionEnglish($this, 'Condition', 'Condition'),
41
-			new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'),
42
-			new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'),
43
-			new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'),
44
-			new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'),
45
-			new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, imbecile, idiot or lunatic'),
46
-			new CensusColumnNull($this, 'School', 'Number of children between 5 and 13 attending school or educated at home'),
47
-		);
48
-	}
31
+    /**
32
+     * The columns of the census.
33
+     *
34
+     * @return CensusColumnInterface[]
35
+     */
36
+    public function columns() {
37
+        return array(
38
+            new CensusColumnFullName($this, 'Name', 'Name and surname'),
39
+            new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'),
40
+            new CensusColumnConditionEnglish($this, 'Condition', 'Condition'),
41
+            new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'),
42
+            new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'),
43
+            new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'),
44
+            new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'),
45
+            new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, imbecile, idiot or lunatic'),
46
+            new CensusColumnNull($this, 'School', 'Number of children between 5 and 13 attending school or educated at home'),
47
+        );
48
+    }
49 49
 }
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,13 +18,15 @@  discard block
 block discarded – undo
18 18
 /**
19 19
  * Definitions for a census
20 20
  */
21
-class CensusOfScotland1871 extends CensusOfScotland implements CensusInterface {
21
+class CensusOfScotland1871 extends CensusOfScotland implements CensusInterface
22
+{
22 23
 	/**
23 24
 	 * When did this census occur.
24 25
 	 *
25 26
 	 * @return string
26 27
 	 */
27
-	public function censusDate() {
28
+	public function censusDate()
29
+	{
28 30
 		return '02 APR 1871';
29 31
 	}
30 32
 
@@ -33,7 +35,8 @@  discard block
 block discarded – undo
33 35
 	 *
34 36
 	 * @return CensusColumnInterface[]
35 37
 	 */
36
-	public function columns() {
38
+	public function columns()
39
+	{
37 40
 		return array(
38 41
 			new CensusColumnFullName($this, 'Name', 'Name and surname'),
39 42
 			new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'),
Please login to merge, or discard this patch.
app/Census/CensusOfDenmark1880.php 2 patches
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -19,35 +19,35 @@
 block discarded – undo
19 19
  * Definitions for a census
20 20
  */
21 21
 class CensusOfDenmark1880 extends CensusOfDenmark implements CensusInterface {
22
-	/**
23
-	 * When did this census occur.
24
-	 *
25
-	 * @return string
26
-	 */
27
-	public function censusDate() {
28
-		return '01 FEB 1880';
29
-	}
22
+    /**
23
+     * When did this census occur.
24
+     *
25
+     * @return string
26
+     */
27
+    public function censusDate() {
28
+        return '01 FEB 1880';
29
+    }
30 30
 
31
-	/**
32
-	 * The columns of the census.
33
-	 *
34
-	 * @return CensusColumnInterface[]
35
-	 */
36
-	public function columns() {
37
-		return array(
38
-			new CensusColumnFullName($this, 'Navn', ''),
39
-			new CensusColumnSexMK($this, 'Køn', ''),
40
-			new CensusColumnAge($this, 'Alder', ''),
41
-			new CensusColumnConditionDanish($this, 'Civilstand', ''),
42
-			new CensusColumnReligion($this, 'Religion', ''),
43
-			new CensusColumnOccupation($this, 'Erhverv', ''),
44
-			new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
45
-			new CensusColumnNull($this, '', ''),
46
-			new CensusColumnNull($this, '', ''),
47
-			new CensusColumnNull($this, '', ''),
48
-			new CensusColumnNull($this, '', ''),
49
-			new CensusColumnNull($this, '', ''),
50
-			new CensusColumnNull($this, '', ''),
51
-		);
52
-	}
31
+    /**
32
+     * The columns of the census.
33
+     *
34
+     * @return CensusColumnInterface[]
35
+     */
36
+    public function columns() {
37
+        return array(
38
+            new CensusColumnFullName($this, 'Navn', ''),
39
+            new CensusColumnSexMK($this, 'Køn', ''),
40
+            new CensusColumnAge($this, 'Alder', ''),
41
+            new CensusColumnConditionDanish($this, 'Civilstand', ''),
42
+            new CensusColumnReligion($this, 'Religion', ''),
43
+            new CensusColumnOccupation($this, 'Erhverv', ''),
44
+            new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
45
+            new CensusColumnNull($this, '', ''),
46
+            new CensusColumnNull($this, '', ''),
47
+            new CensusColumnNull($this, '', ''),
48
+            new CensusColumnNull($this, '', ''),
49
+            new CensusColumnNull($this, '', ''),
50
+            new CensusColumnNull($this, '', ''),
51
+        );
52
+    }
53 53
 }
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,13 +18,15 @@  discard block
 block discarded – undo
18 18
 /**
19 19
  * Definitions for a census
20 20
  */
21
-class CensusOfDenmark1880 extends CensusOfDenmark implements CensusInterface {
21
+class CensusOfDenmark1880 extends CensusOfDenmark implements CensusInterface
22
+{
22 23
 	/**
23 24
 	 * When did this census occur.
24 25
 	 *
25 26
 	 * @return string
26 27
 	 */
27
-	public function censusDate() {
28
+	public function censusDate()
29
+	{
28 30
 		return '01 FEB 1880';
29 31
 	}
30 32
 
@@ -33,7 +35,8 @@  discard block
 block discarded – undo
33 35
 	 *
34 36
 	 * @return CensusColumnInterface[]
35 37
 	 */
36
-	public function columns() {
38
+	public function columns()
39
+	{
37 40
 		return array(
38 41
 			new CensusColumnFullName($this, 'Navn', ''),
39 42
 			new CensusColumnSexMK($this, 'Køn', ''),
Please login to merge, or discard this patch.