@@ -18,13 +18,15 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * Definitions for a census |
| 20 | 20 | */ |
| 21 | -class CensusOfUnitedStates1830 extends CensusOfUnitedStates implements CensusInterface { |
|
| 21 | +class CensusOfUnitedStates1830 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 1830'; |
| 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 of head of family'), |
| 39 | 42 | new CensusColumnNull($this, 'M0', 'Free white males 0-5 years'), |
@@ -18,13 +18,15 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * Definitions for a census |
| 20 | 20 | */ |
| 21 | -class CensusOfUnitedStates1800 extends CensusOfUnitedStates implements CensusInterface { |
|
| 21 | +class CensusOfUnitedStates1800 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 '04 AUG 1800'; |
| 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 of head of family'), |
| 39 | 42 | new CensusColumnNull($this, 'M0-10', 'Free white males 0-10 years'), |
@@ -18,7 +18,8 @@ |
||
| 18 | 18 | /** |
| 19 | 19 | * Marital status. |
| 20 | 20 | */ |
| 21 | -class CensusColumnConditionFrenchVeuve extends AbstractCensusColumnCondition { |
|
| 21 | +class CensusColumnConditionFrenchVeuve extends AbstractCensusColumnCondition |
|
| 22 | +{ |
|
| 22 | 23 | /* Text to display for married individuals */ |
| 23 | 24 | protected $husband = ''; |
| 24 | 25 | protected $wife = ''; |
@@ -20,7 +20,8 @@ discard block |
||
| 20 | 20 | /** |
| 21 | 21 | * The individual's sex. |
| 22 | 22 | */ |
| 23 | -class CensusColumnSexMF extends AbstractCensusColumn implements CensusColumnInterface { |
|
| 23 | +class CensusColumnSexMF extends AbstractCensusColumn implements CensusColumnInterface |
|
| 24 | +{ |
|
| 24 | 25 | /* Text to display for male individuals */ |
| 25 | 26 | protected $male = 'M'; |
| 26 | 27 | |
@@ -35,7 +36,8 @@ discard block |
||
| 35 | 36 | * |
| 36 | 37 | * @return string |
| 37 | 38 | */ |
| 38 | - public function generate(Individual $individual, Individual $head = null) { |
|
| 39 | + public function generate(Individual $individual, Individual $head = null) |
|
| 40 | + { |
|
| 39 | 41 | switch ($individual->getSex()) { |
| 40 | 42 | case 'M': |
| 41 | 43 | return $this->male; |
@@ -21,7 +21,8 @@ discard block |
||
| 21 | 21 | /** |
| 22 | 22 | * Relationshiop to head of household. |
| 23 | 23 | */ |
| 24 | -class CensusColumnRelationToHeadGerman extends AbstractCensusColumn implements CensusColumnInterface { |
|
| 24 | +class CensusColumnRelationToHeadGerman 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 CensusOfScotland1881 extends CensusOfScotland implements CensusInterface { |
|
| 21 | +class CensusOfScotland1881 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 '03 APR 1881'; |
| 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 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 |
||
| 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 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 |
||
| 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', ''), |
@@ -18,13 +18,15 @@ discard block |
||
| 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 |
||
| 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', ''), |