@@ -20,7 +20,8 @@ discard block |
||
| 20 | 20 | /** |
| 21 | 21 | * The individual's date of birth. |
| 22 | 22 | */ |
| 23 | -class CensusColumnBirthDaySlashMonthYear extends AbstractCensusColumn implements CensusColumnInterface { |
|
| 23 | +class CensusColumnBirthDaySlashMonthYear 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 | $birth_date = $individual->getBirthDate(); |
| 34 | 36 | |
| 35 | 37 | if ($birth_date->minimumJulianDay() === $birth_date->maximumJulianDay()) { |
@@ -18,13 +18,15 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * Definitions for a census |
| 20 | 20 | */ |
| 21 | -class CensusOfUnitedStates1850 extends CensusOfUnitedStates implements CensusInterface { |
|
| 21 | +class CensusOfUnitedStates1850 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 '01 JUN 1850'; |
| 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'), |
| 39 | 42 | new CensusColumnAge($this, 'Age', 'Age'), |
@@ -18,13 +18,15 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * Definitions for a census |
| 20 | 20 | */ |
| 21 | -class CensusOfWales1901 extends CensusOfWales implements CensusInterface { |
|
| 21 | +class CensusOfWales1901 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 '31 MAR 1901'; |
| 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'), |
@@ -18,13 +18,15 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * Definitions for a census |
| 20 | 20 | */ |
| 21 | -class CensusOfDenmark1916 extends CensusOfDenmark implements CensusInterface { |
|
| 21 | +class CensusOfDenmark1916 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 1916'; |
| 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', 'Samtlige Personers Navn (ogsaa Fornavn). Ved Børn, endnu uden Navn, sættes „Dreng“ eller „Pige“. Midlertidig fraværerade Personer anføres ikke her, men paa Skemaeta Bagside)'), |
| 39 | 42 | new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M) eller Kvindekøn (K).'), |
@@ -21,7 +21,8 @@ discard block |
||
| 21 | 21 | /** |
| 22 | 22 | * The number of children who are still living. |
| 23 | 23 | */ |
| 24 | -class CensusColumnChildrenLiving extends AbstractCensusColumn implements CensusColumnInterface { |
|
| 24 | +class CensusColumnChildrenLiving 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 | } |
@@ -18,13 +18,15 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * Definitions for a census |
| 20 | 20 | */ |
| 21 | -class CensusOfDenmark1840 extends CensusOfDenmark implements CensusInterface { |
|
| 21 | +class CensusOfDenmark1840 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 1840'; |
| 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 CensusColumnAge($this, 'Alder', ''), |
@@ -18,13 +18,15 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * Definitions for a census |
| 20 | 20 | */ |
| 21 | -class CensusOfCzechRepublic1880 extends CensusOfCzechRepublic implements CensusInterface { |
|
| 21 | +class CensusOfCzechRepublic1880 extends CensusOfCzechRepublic 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 '31 DEC 1880'; |
| 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, 'Jméno', ''), |
| 39 | 42 | new CensusColumnSexMZ($this, 'Pohlaví', ''), |
@@ -20,7 +20,8 @@ discard block |
||
| 20 | 20 | /** |
| 21 | 21 | * The individual's birth place. |
| 22 | 22 | */ |
| 23 | -class CensusColumnBirthPlace extends AbstractCensusColumn implements CensusColumnInterface { |
|
| 23 | +class CensusColumnBirthPlace 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 | $birth_place = $individual->getBirthPlace(); |
| 34 | 36 | $census_place = $this->place(); |
| 35 | 37 | |
@@ -18,13 +18,15 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * Definitions for a census |
| 20 | 20 | */ |
| 21 | -class CensusOfScotland1911 extends CensusOfScotland implements CensusInterface { |
|
| 21 | +class CensusOfScotland1911 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 1911'; |
| 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'), |