Completed
Push — 1.7 ( ce7091...0d97cf )
by Greg
14:14 queued 07:41
created
app/Census/CensusOfScotland1851.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 CensusOfScotland1851 extends CensusOfScotland implements CensusInterface {
22
-	/**
23
-	 * When did this census occur.
24
-	 *
25
-	 * @return string
26
-	 */
27
-	public function censusDate() {
28
-		return '30 MAR 1851';
29
-	}
22
+    /**
23
+     * When did this census occur.
24
+     *
25
+     * @return string
26
+     */
27
+    public function censusDate() {
28
+        return '30 MAR 1851';
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 blind or deaf-and-dumb'),
46
-		);
47
-	}
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 blind or deaf-and-dumb'),
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 CensusOfScotland1851 extends CensusOfScotland implements CensusInterface {
21
+class CensusOfScotland1851 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 '30 MAR 1851';
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/CensusOfFrance1921.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 CensusOfFrance1921 extends CensusOfFrance implements CensusInterface {
22
-	/**
23
-	 * When did this census occur.
24
-	 *
25
-	 * @return string
26
-	 */
27
-	public function censusDate() {
28
-		return '20 JAN 1921';
29
-	}
22
+    /**
23
+     * When did this census occur.
24
+     *
25
+     * @return string
26
+     */
27
+    public function censusDate() {
28
+        return '20 JAN 1921';
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 CensusOfFrance1921 extends CensusOfFrance implements CensusInterface {
21
+class CensusOfFrance1921 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 '20 JAN 1921';
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/CensusOfDenmark1787.php 2 patches
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -19,27 +19,27 @@
 block discarded – undo
19 19
  * Definitions for a census
20 20
  */
21 21
 class CensusOfDenmark1787 extends CensusOfDenmark implements CensusInterface {
22
-	/**
23
-	 * When did this census occur.
24
-	 *
25
-	 * @return string
26
-	 */
27
-	public function censusDate() {
28
-		return '01 JUL 1787';
29
-	}
22
+    /**
23
+     * When did this census occur.
24
+     *
25
+     * @return string
26
+     */
27
+    public function censusDate() {
28
+        return '01 JUL 1787';
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 CensusColumnRelationToHead($this, 'Stilling i familien', ''),
40
-			new CensusColumnAge($this, 'Alder', ''),
41
-			new CensusColumnConditionDanish($this, 'Civilstand', ''),
42
-			new CensusColumnOccupation($this, 'Erhverv', ''),
43
-		);
44
-	}
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 CensusColumnRelationToHead($this, 'Stilling i familien', ''),
40
+            new CensusColumnAge($this, 'Alder', ''),
41
+            new CensusColumnConditionDanish($this, 'Civilstand', ''),
42
+            new CensusColumnOccupation($this, 'Erhverv', ''),
43
+        );
44
+    }
45 45
 }
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 CensusOfDenmark1787 extends CensusOfDenmark implements CensusInterface {
21
+class CensusOfDenmark1787 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 JUL 1787';
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 CensusColumnRelationToHead($this, 'Stilling i familien', ''),
Please login to merge, or discard this patch.
app/Census/CensusColumnConditionFrenchVeuf.php 2 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -19,23 +19,23 @@
 block discarded – undo
19 19
  * Marital status.
20 20
  */
21 21
 class CensusColumnConditionFrenchVeuf extends AbstractCensusColumnCondition {
22
-	/* Text to display for married individuals */
23
-	protected $husband = '';
24
-	protected $wife    = '';
22
+    /* Text to display for married individuals */
23
+    protected $husband = '';
24
+    protected $wife    = '';
25 25
 
26
-	/* Text to display for unmarried individuals */
27
-	protected $bachelor = '';
28
-	protected $spinster = '';
26
+    /* Text to display for unmarried individuals */
27
+    protected $bachelor = '';
28
+    protected $spinster = '';
29 29
 
30
-	/* Text to display for children */
31
-	protected $boy  = '';
32
-	protected $girl = '';
30
+    /* Text to display for children */
31
+    protected $boy  = '';
32
+    protected $girl = '';
33 33
 
34
-	/* Text to display for divorced individuals */
35
-	protected $divorce  = '';
36
-	protected $divorcee = '';
34
+    /* Text to display for divorced individuals */
35
+    protected $divorce  = '';
36
+    protected $divorcee = '';
37 37
 
38
-	/* Text to display for widowed individuals (not yet implemented) */
39
-	protected $widower = '1';
40
-	protected $widow   = '';
38
+    /* Text to display for widowed individuals (not yet implemented) */
39
+    protected $widower = '1';
40
+    protected $widow   = '';
41 41
 }
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,8 @@
 block discarded – undo
18 18
 /**
19 19
  * Marital status.
20 20
  */
21
-class CensusColumnConditionFrenchVeuf extends AbstractCensusColumnCondition {
21
+class CensusColumnConditionFrenchVeuf extends AbstractCensusColumnCondition
22
+{
22 23
 	/* Text to display for married individuals */
23 24
 	protected $husband = '';
24 25
 	protected $wife    = '';
Please login to merge, or discard this patch.
app/Census/CensusColumnBirthDay.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -21,15 +21,15 @@
 block discarded – undo
21 21
  * The individual's date of birth.
22 22
  */
23 23
 class CensusColumnBirthDay 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
-		return $individual->getEstimatedBirthDate()->minimumDate()->format('%j');
34
-	}
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
+        return $individual->getEstimatedBirthDate()->minimumDate()->format('%j');
34
+    }
35 35
 }
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 individual's date of birth.
22 22
  */
23
-class CensusColumnBirthDay extends AbstractCensusColumn implements CensusColumnInterface {
23
+class CensusColumnBirthDay 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
 		return $individual->getEstimatedBirthDate()->minimumDate()->format('%j');
34 36
 	}
35 37
 }
Please login to merge, or discard this patch.
app/Census/CensusColumnSurname.php 2 patches
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -21,19 +21,19 @@
 block discarded – undo
21 21
  * The individual's full name.
22 22
  */
23 23
 class CensusColumnSurname 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
-		foreach ($individual->getAllNames() as $name) {
34
-			return $name['surname'];
35
-		}
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
+        foreach ($individual->getAllNames() as $name) {
34
+            return $name['surname'];
35
+        }
36 36
 
37
-		return '';
38
-	}
37
+        return '';
38
+    }
39 39
 }
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 individual's full name.
22 22
  */
23
-class CensusColumnSurname extends AbstractCensusColumn implements CensusColumnInterface {
23
+class CensusColumnSurname 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
 		foreach ($individual->getAllNames() as $name) {
34 36
 			return $name['surname'];
35 37
 		}
Please login to merge, or discard this patch.
app/Census/CensusOfFrance1872.php 2 patches
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -19,33 +19,33 @@
 block discarded – undo
19 19
  * Definitions for a census
20 20
  */
21 21
 class CensusOfFrance1872 extends CensusOfFrance implements CensusInterface {
22
-	/**
23
-	 * When did this census occur.
24
-	 *
25
-	 * @return string
26
-	 */
27
-	public function censusDate() {
28
-		return '18 JAN 1872';
29
-	}
22
+    /**
23
+     * When did this census occur.
24
+     *
25
+     * @return string
26
+     */
27
+    public function censusDate() {
28
+        return '18 JAN 1872';
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 CensusColumnOccupation($this, 'Titres', 'Titres, qualifications, état ou profession et fonctions'),
41
-			new CensusColumnConditionFrenchGarcon($this, 'Garçons', ''),
42
-			new CensusColumnConditionFrenchHomme($this, 'Hommes', 'Hommes mariés'),
43
-			new CensusColumnConditionFrenchVeuf($this, 'Veufs', ''),
44
-			new CensusColumnConditionFrenchFille($this, 'Filles', ''),
45
-			new CensusColumnConditionFrenchFemme($this, 'Femmes', 'Femmes mariées'),
46
-			new CensusColumnConditionFrenchVeuve($this, 'Veuves', ''),
47
-			new CensusColumnAge($this, 'Âge', ''),
48
-			new CensusColumnBirthPlace($this, 'Nationalité', 'Nationalité - Lieu de naissance'),
49
-		);
50
-	}
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 CensusColumnOccupation($this, 'Titres', 'Titres, qualifications, état ou profession et fonctions'),
41
+            new CensusColumnConditionFrenchGarcon($this, 'Garçons', ''),
42
+            new CensusColumnConditionFrenchHomme($this, 'Hommes', 'Hommes mariés'),
43
+            new CensusColumnConditionFrenchVeuf($this, 'Veufs', ''),
44
+            new CensusColumnConditionFrenchFille($this, 'Filles', ''),
45
+            new CensusColumnConditionFrenchFemme($this, 'Femmes', 'Femmes mariées'),
46
+            new CensusColumnConditionFrenchVeuve($this, 'Veuves', ''),
47
+            new CensusColumnAge($this, 'Âge', ''),
48
+            new CensusColumnBirthPlace($this, 'Nationalité', 'Nationalité - Lieu de naissance'),
49
+        );
50
+    }
51 51
 }
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 CensusOfFrance1872 extends CensusOfFrance implements CensusInterface {
21
+class CensusOfFrance1872 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 '18 JAN 1872';
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/CensusColumnBirthMonth.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -21,15 +21,15 @@
 block discarded – undo
21 21
  * The individual's date of birth.
22 22
  */
23 23
 class CensusColumnBirthMonth 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
-		return $individual->getEstimatedBirthDate()->minimumDate()->format('%M');
34
-	}
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
+        return $individual->getEstimatedBirthDate()->minimumDate()->format('%M');
34
+    }
35 35
 }
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 individual's date of birth.
22 22
  */
23
-class CensusColumnBirthMonth extends AbstractCensusColumn implements CensusColumnInterface {
23
+class CensusColumnBirthMonth 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
 		return $individual->getEstimatedBirthDate()->minimumDate()->format('%M');
34 36
 	}
35 37
 }
Please login to merge, or discard this patch.
app/Census/CensusOfDenmark1940.php 2 patches
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -19,37 +19,37 @@
 block discarded – undo
19 19
  * Definitions for a census
20 20
  */
21 21
 class CensusOfDenmark1940 extends CensusOfDenmark implements CensusInterface {
22
-	/**
23
-	 * When did this census occur.
24
-	 *
25
-	 * @return string
26
-	 */
27
-	public function censusDate() {
28
-		return '05 NOV 1940';
29
-	}
22
+    /**
23
+     * When did this census occur.
24
+     *
25
+     * @return string
26
+     */
27
+    public function censusDate() {
28
+        return '05 NOV 1940';
29
+    }
30 30
 
31
-	/**
32
-	 * The columns of the census.
33
-	 *
34
-	 * @return CensusColumnInterface[]
35
-	 */
36
-	public function columns() {
37
-		return array(
38
-			new CensusColumnSurnameGivenNames($this, 'Navn', ''),
39
-			new CensusColumnNull($this, 'Nærværende', 'Hvis den i Rubrik 1 opførte Person er midleritidg nærværende d.v.s. har fast Bopæl ????? (er optaget under en anden Address i Folkeregistret), anføres her den faste Bopæls Adresse (Kommunens Navn og den fuldstændige Adresse i denne; for Udlændinge dog kun Landets Navn).'),
40
-			new CensusColumnNull($this, 'Fraværende', 'Hvis den i Rubrik 1 opførte Person er midleritidg fraværende d.v.s. har fast Bopæl paa Tællingsstedet (er optaget underdenne Address i Folkeregistret), men den 5. Novemer ikke er til Stede paa Tællingsstedet, anføres her „fraværende“ og Adressen paa det midlertidige Opholdssted (ved Ophold i Udlandet anføres jun Landets Navn).'),
41
-			new CensusColumnSexMK($this, 'Køn', 'Køn Mand (M) Kvinde (K)'),
42
-			new CensusColumnBirthDaySlashMonth($this, 'Fødselsdag', ''),
43
-			new CensusColumnBirthYear($this, 'Fødselsaar', ''),
44
-			new CensusColumnBirthPlace($this, 'Fødested', ''),
45
-			new CensusColumnNull($this, 'Statsbergerferhold', ''),
46
-			new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U), Gift (G), Enkemand eller Enke (E), Separeret (S), Fraskilt (F).'),
47
-			new CensusColumnNull($this, 'Indgaaelse', 'Date for det nuværende Ægteskabs Indgaaelse. NB." RUbrikken udfyldes ikke al Enkemaend, Enker, Separerede eller Fraskilte.'),
48
-			new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
49
-			new CensusColumnOccupation($this, 'Erhverv', ''),
50
-			new CensusColumnNull($this, 'Virksomhedens', 'Virksomhedens (Branchens) Art'),
51
-			new CensusColumnNull($this, 'Hustruen', 'Besvares kun af Hustruen og hjemmeboende Børn over 14 Aar'),
52
-			new CensusColumnNull($this, 'Døtre', 'Besvares kun af hjemmeboende Døtre over 14 Aar'),
53
-		);
54
-	}
31
+    /**
32
+     * The columns of the census.
33
+     *
34
+     * @return CensusColumnInterface[]
35
+     */
36
+    public function columns() {
37
+        return array(
38
+            new CensusColumnSurnameGivenNames($this, 'Navn', ''),
39
+            new CensusColumnNull($this, 'Nærværende', 'Hvis den i Rubrik 1 opførte Person er midleritidg nærværende d.v.s. har fast Bopæl ????? (er optaget under en anden Address i Folkeregistret), anføres her den faste Bopæls Adresse (Kommunens Navn og den fuldstændige Adresse i denne; for Udlændinge dog kun Landets Navn).'),
40
+            new CensusColumnNull($this, 'Fraværende', 'Hvis den i Rubrik 1 opførte Person er midleritidg fraværende d.v.s. har fast Bopæl paa Tællingsstedet (er optaget underdenne Address i Folkeregistret), men den 5. Novemer ikke er til Stede paa Tællingsstedet, anføres her „fraværende“ og Adressen paa det midlertidige Opholdssted (ved Ophold i Udlandet anføres jun Landets Navn).'),
41
+            new CensusColumnSexMK($this, 'Køn', 'Køn Mand (M) Kvinde (K)'),
42
+            new CensusColumnBirthDaySlashMonth($this, 'Fødselsdag', ''),
43
+            new CensusColumnBirthYear($this, 'Fødselsaar', ''),
44
+            new CensusColumnBirthPlace($this, 'Fødested', ''),
45
+            new CensusColumnNull($this, 'Statsbergerferhold', ''),
46
+            new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U), Gift (G), Enkemand eller Enke (E), Separeret (S), Fraskilt (F).'),
47
+            new CensusColumnNull($this, 'Indgaaelse', 'Date for det nuværende Ægteskabs Indgaaelse. NB." RUbrikken udfyldes ikke al Enkemaend, Enker, Separerede eller Fraskilte.'),
48
+            new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
49
+            new CensusColumnOccupation($this, 'Erhverv', ''),
50
+            new CensusColumnNull($this, 'Virksomhedens', 'Virksomhedens (Branchens) Art'),
51
+            new CensusColumnNull($this, 'Hustruen', 'Besvares kun af Hustruen og hjemmeboende Børn over 14 Aar'),
52
+            new CensusColumnNull($this, 'Døtre', 'Besvares kun af hjemmeboende Døtre over 14 Aar'),
53
+        );
54
+    }
55 55
 }
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 CensusOfDenmark1940 extends CensusOfDenmark implements CensusInterface {
21
+class CensusOfDenmark1940 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 '05 NOV 1940';
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 CensusColumnSurnameGivenNames($this, 'Navn', ''),
39 42
 			new CensusColumnNull($this, 'Nærværende', 'Hvis den i Rubrik 1 opførte Person er midleritidg nærværende d.v.s. har fast Bopæl ????? (er optaget under en anden Address i Folkeregistret), anføres her den faste Bopæls Adresse (Kommunens Navn og den fuldstændige Adresse i denne; for Udlændinge dog kun Landets Navn).'),
Please login to merge, or discard this patch.