@@ -18,7 +18,8 @@ |
||
18 | 18 | /** |
19 | 19 | * Marital status. |
20 | 20 | */ |
21 | -class CensusColumnConditionUs extends CensusColumnConditionEnglish { |
|
21 | +class CensusColumnConditionUs extends CensusColumnConditionEnglish |
|
22 | +{ |
|
22 | 23 | /* Text to display for married individuals */ |
23 | 24 | protected $husband = 'M'; |
24 | 25 | protected $wife = 'M'; |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfDenmark extends Census implements CensusPlaceInterface { |
|
21 | +class CensusOfDenmark extends Census implements CensusPlaceInterface |
|
22 | +{ |
|
22 | 23 | /** |
23 | 24 | * All available censuses for this census place. |
24 | 25 | * |
25 | 26 | * @return CensusInterface[] |
26 | 27 | */ |
27 | - public function allCensusDates() { |
|
28 | + public function allCensusDates() |
|
29 | + { |
|
28 | 30 | return array( |
29 | 31 | new CensusOfDenmark1787(), |
30 | 32 | new CensusOfDenmark1801(), |
@@ -56,7 +58,8 @@ discard block |
||
56 | 58 | * |
57 | 59 | * @return string |
58 | 60 | */ |
59 | - public function censusPlace() { |
|
61 | + public function censusPlace() |
|
62 | + { |
|
60 | 63 | return 'Danmark'; |
61 | 64 | } |
62 | 65 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfWales1851 extends CensusOfWales implements CensusInterface { |
|
21 | +class CensusOfWales1851 extends CensusOfWales 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 |
||
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'), |
@@ -21,7 +21,8 @@ discard block |
||
21 | 21 | /** |
22 | 22 | * Relationshiop to head of household. |
23 | 23 | */ |
24 | -class CensusColumnRelationToHead extends AbstractCensusColumn implements CensusColumnInterface { |
|
24 | +class CensusColumnRelationToHead 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 |
||
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 | if ($head === null) { |
35 | 37 | return ''; |
36 | 38 | } elseif ($individual == $head) { |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfEngland1851 extends CensusOfEngland implements CensusInterface { |
|
21 | +class CensusOfEngland1851 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 '30 MAR 1851'; |
29 | 31 | } |
30 | 32 | |
@@ -33,7 +35,8 @@ discard block |
||
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'), |
@@ -21,7 +21,8 @@ |
||
21 | 21 | /** |
22 | 22 | * Definitions for a census column |
23 | 23 | */ |
24 | -interface CensusColumnInterface { |
|
24 | +interface CensusColumnInterface |
|
25 | +{ |
|
25 | 26 | /** |
26 | 27 | * A short version of the column's name. |
27 | 28 | * |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfDenmark1870 extends CensusOfDenmark implements CensusInterface { |
|
21 | +class CensusOfDenmark1870 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 1870'; |
29 | 31 | } |
30 | 32 | |
@@ -33,7 +35,8 @@ discard block |
||
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', ''), |
@@ -21,7 +21,8 @@ discard block |
||
21 | 21 | /** |
22 | 22 | * The age of a male individual (rounded down to the nearest 5 years). |
23 | 23 | */ |
24 | -class CensusColumnAgeMale5Years extends AbstractCensusColumn implements CensusColumnInterface { |
|
24 | +class CensusColumnAgeMale5Years 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 |
||
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 | if ($individual->getSex() === 'F') { |
35 | 37 | return ''; |
36 | 38 | } else { |
@@ -20,7 +20,8 @@ discard block |
||
20 | 20 | /** |
21 | 21 | * The month of marriage, if within the last year. |
22 | 22 | */ |
23 | -class CensusColumnMonthIfMarriedWithinYear extends AbstractCensusColumn implements CensusColumnInterface { |
|
23 | +class CensusColumnMonthIfMarriedWithinYear 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 |
||
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->getSpouseFamilies() as $family) { |
34 | 36 | foreach ($family->getFacts('MARR') as $fact) { |
35 | 37 | $marriage_jd = $fact->getDate()->julianDay(); |