@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfEngland1841 extends CensusOfEngland implements CensusInterface { |
|
21 | +class CensusOfEngland1841 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 '06 JUN 1841'; |
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 CensusColumnAgeMale5Years($this, 'AgeM', 'Age (males)'), |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfFrance1831 extends CensusOfFrance implements CensusInterface { |
|
21 | +class CensusOfFrance1831 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 1831'; |
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', ''), |
@@ -21,7 +21,8 @@ discard block |
||
21 | 21 | /** |
22 | 22 | * The individual's full name. |
23 | 23 | */ |
24 | -class CensusColumnFullName extends AbstractCensusColumn implements CensusColumnInterface { |
|
24 | +class CensusColumnFullName 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 | $name = $this->nameAtCensusDate($individual, $this->date()); |
35 | 37 | |
36 | 38 | return strip_tags($name['full']); |
@@ -45,7 +47,8 @@ discard block |
||
45 | 47 | * |
46 | 48 | * @return string[] |
47 | 49 | */ |
48 | - protected function nameAtCensusDate(Individual $individual, Date $census_date) { |
|
50 | + protected function nameAtCensusDate(Individual $individual, Date $census_date) |
|
51 | + { |
|
49 | 52 | $names = $individual->getAllNames(); |
50 | 53 | $name = $names[0]; |
51 | 54 |
@@ -20,7 +20,8 @@ discard block |
||
20 | 20 | /** |
21 | 21 | * Is the individual's father a foreigner. |
22 | 22 | */ |
23 | -class CensusColumnFatherForeign extends AbstractCensusColumn implements CensusColumnInterface { |
|
23 | +class CensusColumnFatherForeign 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 | $father = $this->father($individual); |
34 | 36 | |
35 | 37 | if ($father && $this->lastPartOfPlace($father->getBirthPlace()) !== $this->place()) { |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfWales extends Census implements CensusPlaceInterface { |
|
21 | +class CensusOfWales 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 CensusOfWales1841(), |
30 | 32 | new CensusOfWales1851(), |
@@ -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 'Wales'; |
48 | 51 | } |
49 | 52 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfFrance1856 extends CensusOfFrance implements CensusInterface { |
|
21 | +class CensusOfFrance1856 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 '17 JAN 1856'; |
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 CensusOfUnitedStates1880 extends CensusOfUnitedStates implements CensusInterface { |
|
21 | +class CensusOfUnitedStates1880 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 'JUN 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, 'Name', 'Name'), |
39 | 42 | new CensusColumnAge($this, 'Age', 'Age'), |
@@ -18,11 +18,13 @@ |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class Census { |
|
21 | +class Census |
|
22 | +{ |
|
22 | 23 | /** |
23 | 24 | * @return CensusPlaceInterface[] |
24 | 25 | */ |
25 | - public static function allCensusPlaces() { |
|
26 | + public static function allCensusPlaces() |
|
27 | + { |
|
26 | 28 | return array( |
27 | 29 | new CensusOfCzechRepublic, |
28 | 30 | new CensusOfDenmark, |
@@ -18,7 +18,8 @@ |
||
18 | 18 | /** |
19 | 19 | * Marital status. |
20 | 20 | */ |
21 | -class CensusColumnConditionEnglish extends AbstractCensusColumnCondition { |
|
21 | +class CensusColumnConditionEnglish extends AbstractCensusColumnCondition |
|
22 | +{ |
|
22 | 23 | /* Text to display for married individuals */ |
23 | 24 | protected $husband = 'Mar'; |
24 | 25 | protected $wife = 'Mar'; |