@@ -18,7 +18,8 @@ |
||
| 18 | 18 | /** |
| 19 | 19 | * Marital status. |
| 20 | 20 | */ |
| 21 | -class CensusColumnConditionFrenchHomme extends AbstractCensusColumnCondition { |
|
| 21 | +class CensusColumnConditionFrenchHomme extends AbstractCensusColumnCondition |
|
| 22 | +{ |
|
| 22 | 23 | /* Text to display for married individuals */ |
| 23 | 24 | protected $husband = '1'; |
| 24 | 25 | protected $wife = ''; |
@@ -20,7 +20,8 @@ discard block |
||
| 20 | 20 | /** |
| 21 | 21 | * The individual's father's birth place. |
| 22 | 22 | */ |
| 23 | -class CensusColumnFatherBirthPlaceSimple extends CensusColumnFatherBirthPlace implements CensusColumnInterface { |
|
| 23 | +class CensusColumnFatherBirthPlaceSimple extends CensusColumnFatherBirthPlace 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 | return $this->lastPartOfPlace(parent::generate($individual, $head)); |
| 34 | 36 | } |
| 35 | 37 | } |
@@ -18,13 +18,15 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * Definitions for a census |
| 20 | 20 | */ |
| 21 | -class CensusOfEngland extends Census implements CensusPlaceInterface { |
|
| 21 | +class CensusOfEngland 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 CensusOfEngland1841(), |
| 30 | 32 | new CensusOfEngland1851(), |
@@ -43,7 +45,8 @@ discard block |
||
| 43 | 45 | * |
| 44 | 46 | * @return string |
| 45 | 47 | */ |
| 46 | - public function censusPlace() { |
|
| 48 | + public function censusPlace() |
|
| 49 | + { |
|
| 47 | 50 | return 'England'; |
| 48 | 51 | } |
| 49 | 52 | } |
@@ -18,13 +18,15 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * Definitions for a census |
| 20 | 20 | */ |
| 21 | -class CensusOfDenmark1845 extends CensusOfDenmark implements CensusInterface { |
|
| 21 | +class CensusOfDenmark1845 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 1845'; |
| 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 CensusOfCzechRepublic1921 extends CensusOfCzechRepublic implements CensusInterface { |
|
| 21 | +class CensusOfCzechRepublic1921 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 '15 FEB 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 CensusColumnFullName($this, 'Jméno', ''), |
| 39 | 42 | new CensusColumnRelationToHead($this, 'Vztah', ''), |
@@ -20,7 +20,8 @@ discard block |
||
| 20 | 20 | /** |
| 21 | 21 | * The individual's date of birth. |
| 22 | 22 | */ |
| 23 | -class CensusColumnBirthYear extends AbstractCensusColumn implements CensusColumnInterface { |
|
| 23 | +class CensusColumnBirthYear 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 | return $individual->getEstimatedBirthDate()->minimumDate()->format('%Y'); |
| 34 | 36 | } |
| 35 | 37 | } |
@@ -18,13 +18,15 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * Definitions for a census |
| 20 | 20 | */ |
| 21 | -class CensusOfUnitedStates extends Census implements CensusPlaceInterface { |
|
| 21 | +class CensusOfUnitedStates 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 CensusOfUnitedStates1790(), |
| 30 | 32 | new CensusOfUnitedStates1800(), |
@@ -50,7 +52,8 @@ discard block |
||
| 50 | 52 | * |
| 51 | 53 | * @return string |
| 52 | 54 | */ |
| 53 | - public function censusPlace() { |
|
| 55 | + public function censusPlace() |
|
| 56 | + { |
|
| 54 | 57 | return 'United States'; |
| 55 | 58 | } |
| 56 | 59 | } |
@@ -18,13 +18,15 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * Definitions for a census |
| 20 | 20 | */ |
| 21 | -class CensusOfFrance1906 extends CensusOfFrance implements CensusInterface { |
|
| 21 | +class CensusOfFrance1906 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 1906'; |
| 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,7 +18,8 @@ |
||
| 18 | 18 | /** |
| 19 | 19 | * Marital status. |
| 20 | 20 | */ |
| 21 | -class CensusColumnConditionFrenchFemme extends AbstractCensusColumnCondition { |
|
| 21 | +class CensusColumnConditionFrenchFemme extends AbstractCensusColumnCondition |
|
| 22 | +{ |
|
| 22 | 23 | /* Text to display for married individuals */ |
| 23 | 24 | protected $husband = ''; |
| 24 | 25 | protected $wife = '1'; |