@@ -21,33 +21,33 @@ |
||
21 | 21 | * Was the individual born in "foreign parts". |
22 | 22 | */ |
23 | 23 | class CensusColumnBornForeignParts extends AbstractCensusColumn implements CensusColumnInterface { |
24 | - /** |
|
25 | - * Generate the likely value of this census column, based on available information. |
|
26 | - * |
|
27 | - * @param Individual $individual |
|
28 | - * @param Individual|null $head |
|
29 | - * |
|
30 | - * @return string |
|
31 | - */ |
|
32 | - public function generate(Individual $individual, Individual $head = null) { |
|
33 | - $birth_place = explode(', ', $individual->getBirthPlace()); |
|
34 | - $birth_place = end($birth_place); |
|
35 | - $census_place = $this->place(); |
|
24 | + /** |
|
25 | + * Generate the likely value of this census column, based on available information. |
|
26 | + * |
|
27 | + * @param Individual $individual |
|
28 | + * @param Individual|null $head |
|
29 | + * |
|
30 | + * @return string |
|
31 | + */ |
|
32 | + public function generate(Individual $individual, Individual $head = null) { |
|
33 | + $birth_place = explode(', ', $individual->getBirthPlace()); |
|
34 | + $birth_place = end($birth_place); |
|
35 | + $census_place = $this->place(); |
|
36 | 36 | |
37 | - if ($birth_place === 'Wales') { |
|
38 | - $birth_place = 'England'; |
|
39 | - } |
|
37 | + if ($birth_place === 'Wales') { |
|
38 | + $birth_place = 'England'; |
|
39 | + } |
|
40 | 40 | |
41 | - if ($census_place === 'Wales') { |
|
42 | - $census_place = 'England'; |
|
43 | - } |
|
41 | + if ($census_place === 'Wales') { |
|
42 | + $census_place = 'England'; |
|
43 | + } |
|
44 | 44 | |
45 | - if ($birth_place === $census_place || $birth_place === '') { |
|
46 | - return ''; |
|
47 | - } elseif ($birth_place === 'England' || $birth_place === 'Scotland' || $birth_place === 'Ireland') { |
|
48 | - return substr($birth_place, 0, 1); |
|
49 | - } else { |
|
50 | - return 'F'; |
|
51 | - } |
|
52 | - } |
|
45 | + if ($birth_place === $census_place || $birth_place === '') { |
|
46 | + return ''; |
|
47 | + } elseif ($birth_place === 'England' || $birth_place === 'Scotland' || $birth_place === 'Ireland') { |
|
48 | + return substr($birth_place, 0, 1); |
|
49 | + } else { |
|
50 | + return 'F'; |
|
51 | + } |
|
52 | + } |
|
53 | 53 | } |
@@ -20,7 +20,8 @@ discard block |
||
20 | 20 | /** |
21 | 21 | * Was the individual born in "foreign parts". |
22 | 22 | */ |
23 | -class CensusColumnBornForeignParts extends AbstractCensusColumn implements CensusColumnInterface { |
|
23 | +class CensusColumnBornForeignParts 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 = explode(', ', $individual->getBirthPlace()); |
34 | 36 | $birth_place = end($birth_place); |
35 | 37 | $census_place = $this->place(); |
@@ -19,27 +19,27 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfDenmark1801 extends CensusOfDenmark implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '01 FEB 1801'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '01 FEB 1801'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * The columns of the census. |
|
33 | - * |
|
34 | - * @return CensusColumnInterface[] |
|
35 | - */ |
|
36 | - public function columns() { |
|
37 | - return array( |
|
38 | - new CensusColumnFullName($this, 'Navn', ''), |
|
39 | - new CensusColumnRelationToHead($this, 'Stilling i familien', ''), |
|
40 | - new CensusColumnAge($this, 'Alder', ''), |
|
41 | - new CensusColumnConditionDanish($this, 'Civilstand', ''), |
|
42 | - new CensusColumnOccupation($this, 'Erhverv', ''), |
|
43 | - ); |
|
44 | - } |
|
31 | + /** |
|
32 | + * The columns of the census. |
|
33 | + * |
|
34 | + * @return CensusColumnInterface[] |
|
35 | + */ |
|
36 | + public function columns() { |
|
37 | + return array( |
|
38 | + new CensusColumnFullName($this, 'Navn', ''), |
|
39 | + new CensusColumnRelationToHead($this, 'Stilling i familien', ''), |
|
40 | + new CensusColumnAge($this, 'Alder', ''), |
|
41 | + new CensusColumnConditionDanish($this, 'Civilstand', ''), |
|
42 | + new CensusColumnOccupation($this, 'Erhverv', ''), |
|
43 | + ); |
|
44 | + } |
|
45 | 45 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfDenmark1801 extends CensusOfDenmark implements CensusInterface { |
|
21 | +class CensusOfDenmark1801 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 1801'; |
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', ''), |
@@ -19,23 +19,23 @@ |
||
19 | 19 | * Marital status. |
20 | 20 | */ |
21 | 21 | class CensusColumnConditionFrenchHomme extends AbstractCensusColumnCondition { |
22 | - /* Text to display for married individuals */ |
|
23 | - protected $husband = '1'; |
|
24 | - protected $wife = ''; |
|
22 | + /* Text to display for married individuals */ |
|
23 | + protected $husband = '1'; |
|
24 | + protected $wife = ''; |
|
25 | 25 | |
26 | - /* Text to display for unmarried individuals */ |
|
27 | - protected $bachelor = ''; |
|
28 | - protected $spinster = ''; |
|
26 | + /* Text to display for unmarried individuals */ |
|
27 | + protected $bachelor = ''; |
|
28 | + protected $spinster = ''; |
|
29 | 29 | |
30 | - /* Text to display for children */ |
|
31 | - protected $boy = ''; |
|
32 | - protected $girl = ''; |
|
30 | + /* Text to display for children */ |
|
31 | + protected $boy = ''; |
|
32 | + protected $girl = ''; |
|
33 | 33 | |
34 | - /* Text to display for divorced individuals */ |
|
35 | - protected $divorce = '1'; |
|
36 | - protected $divorcee = ''; |
|
34 | + /* Text to display for divorced individuals */ |
|
35 | + protected $divorce = '1'; |
|
36 | + protected $divorcee = ''; |
|
37 | 37 | |
38 | - /* Text to display for widowed individuals (not yet implemented) */ |
|
39 | - protected $widower = ''; |
|
40 | - protected $widow = ''; |
|
38 | + /* Text to display for widowed individuals (not yet implemented) */ |
|
39 | + protected $widower = ''; |
|
40 | + protected $widow = ''; |
|
41 | 41 | } |
@@ -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 = ''; |
@@ -21,15 +21,15 @@ |
||
21 | 21 | * The individual's father's birth place. |
22 | 22 | */ |
23 | 23 | class CensusColumnFatherBirthPlaceSimple extends CensusColumnFatherBirthPlace implements CensusColumnInterface { |
24 | - /** |
|
25 | - * Generate the likely value of this census column, based on available information. |
|
26 | - * |
|
27 | - * @param Individual $individual |
|
28 | - * @param Individual|null $head |
|
29 | - * |
|
30 | - * @return string |
|
31 | - */ |
|
32 | - public function generate(Individual $individual, Individual $head = null) { |
|
33 | - return $this->lastPartOfPlace(parent::generate($individual, $head)); |
|
34 | - } |
|
24 | + /** |
|
25 | + * Generate the likely value of this census column, based on available information. |
|
26 | + * |
|
27 | + * @param Individual $individual |
|
28 | + * @param Individual|null $head |
|
29 | + * |
|
30 | + * @return string |
|
31 | + */ |
|
32 | + public function generate(Individual $individual, Individual $head = null) { |
|
33 | + return $this->lastPartOfPlace(parent::generate($individual, $head)); |
|
34 | + } |
|
35 | 35 | } |
@@ -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 | } |
@@ -19,31 +19,31 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfEngland extends Census implements CensusPlaceInterface { |
22 | - /** |
|
23 | - * All available censuses for this census place. |
|
24 | - * |
|
25 | - * @return CensusInterface[] |
|
26 | - */ |
|
27 | - public function allCensusDates() { |
|
28 | - return array( |
|
29 | - new CensusOfEngland1841(), |
|
30 | - new CensusOfEngland1851(), |
|
31 | - new CensusOfEngland1861(), |
|
32 | - new CensusOfEngland1871(), |
|
33 | - new CensusOfEngland1881(), |
|
34 | - new CensusOfEngland1891(), |
|
35 | - new CensusOfEngland1901(), |
|
36 | - new CensusOfEngland1911(), |
|
37 | - new RegisterOfEngland1939(), |
|
38 | - ); |
|
39 | - } |
|
22 | + /** |
|
23 | + * All available censuses for this census place. |
|
24 | + * |
|
25 | + * @return CensusInterface[] |
|
26 | + */ |
|
27 | + public function allCensusDates() { |
|
28 | + return array( |
|
29 | + new CensusOfEngland1841(), |
|
30 | + new CensusOfEngland1851(), |
|
31 | + new CensusOfEngland1861(), |
|
32 | + new CensusOfEngland1871(), |
|
33 | + new CensusOfEngland1881(), |
|
34 | + new CensusOfEngland1891(), |
|
35 | + new CensusOfEngland1901(), |
|
36 | + new CensusOfEngland1911(), |
|
37 | + new RegisterOfEngland1939(), |
|
38 | + ); |
|
39 | + } |
|
40 | 40 | |
41 | - /** |
|
42 | - * Where did this census occur, in GEDCOM format. |
|
43 | - * |
|
44 | - * @return string |
|
45 | - */ |
|
46 | - public function censusPlace() { |
|
47 | - return 'England'; |
|
48 | - } |
|
41 | + /** |
|
42 | + * Where did this census occur, in GEDCOM format. |
|
43 | + * |
|
44 | + * @return string |
|
45 | + */ |
|
46 | + public function censusPlace() { |
|
47 | + return 'England'; |
|
48 | + } |
|
49 | 49 | } |
@@ -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 | } |
@@ -19,29 +19,29 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfDenmark1845 extends CensusOfDenmark implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '01 FEB 1845'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '01 FEB 1845'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * The columns of the census. |
|
33 | - * |
|
34 | - * @return CensusColumnInterface[] |
|
35 | - */ |
|
36 | - public function columns() { |
|
37 | - return array( |
|
38 | - new CensusColumnFullName($this, 'Navn', ''), |
|
39 | - new CensusColumnAge($this, 'Alder', ''), |
|
40 | - new CensusColumnConditionDanish($this, 'Civilstand', ''), |
|
41 | - new CensusColumnOccupation($this, 'Erhverv', ''), |
|
42 | - new CensusColumnRelationToHead($this, 'Stilling i familien', ''), |
|
43 | - new CensusColumnNull($this, '', ''), |
|
44 | - new CensusColumnNull($this, '', ''), |
|
45 | - ); |
|
46 | - } |
|
31 | + /** |
|
32 | + * The columns of the census. |
|
33 | + * |
|
34 | + * @return CensusColumnInterface[] |
|
35 | + */ |
|
36 | + public function columns() { |
|
37 | + return array( |
|
38 | + new CensusColumnFullName($this, 'Navn', ''), |
|
39 | + new CensusColumnAge($this, 'Alder', ''), |
|
40 | + new CensusColumnConditionDanish($this, 'Civilstand', ''), |
|
41 | + new CensusColumnOccupation($this, 'Erhverv', ''), |
|
42 | + new CensusColumnRelationToHead($this, 'Stilling i familien', ''), |
|
43 | + new CensusColumnNull($this, '', ''), |
|
44 | + new CensusColumnNull($this, '', ''), |
|
45 | + ); |
|
46 | + } |
|
47 | 47 | } |
@@ -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', ''), |
@@ -19,36 +19,36 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfCzechRepublic1921 extends CensusOfCzechRepublic implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '15 FEB 1921'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '15 FEB 1921'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * The columns of the census. |
|
33 | - * |
|
34 | - * @return CensusColumnInterface[] |
|
35 | - */ |
|
36 | - public function columns() { |
|
37 | - return array( |
|
38 | - new CensusColumnFullName($this, 'Jméno', ''), |
|
39 | - new CensusColumnRelationToHead($this, 'Vztah', ''), |
|
40 | - new CensusColumnSexMZ($this, 'Pohlaví', ''), |
|
41 | - new CensusColumnNull($this, 'Stav', 'Rodinný stav'), |
|
42 | - new CensusColumnBirthDaySlashMonthYear($this, 'Narození', 'Datum narození'), |
|
43 | - new CensusColumnBirthPlace($this, 'Místo', 'Místo narození'), |
|
44 | - new CensusColumnNull($this, 'Přísluší', 'Domovské právo'), |
|
45 | - new CensusColumnNull($this, 'Jazyk', 'Jazyk v obcování'), |
|
46 | - new CensusColumnReligion($this, 'Vyznání', ''), |
|
47 | - new CensusColumnOccupation($this, 'Povolání', ''), |
|
48 | - new CensusColumnNull($this, 'Postavení', 'Postavení v zaměstnání'), |
|
49 | - new CensusColumnNull($this, '', ''), |
|
50 | - new CensusColumnNull($this, '', ''), |
|
51 | - new CensusColumnNull($this, '', ''), |
|
52 | - ); |
|
53 | - } |
|
31 | + /** |
|
32 | + * The columns of the census. |
|
33 | + * |
|
34 | + * @return CensusColumnInterface[] |
|
35 | + */ |
|
36 | + public function columns() { |
|
37 | + return array( |
|
38 | + new CensusColumnFullName($this, 'Jméno', ''), |
|
39 | + new CensusColumnRelationToHead($this, 'Vztah', ''), |
|
40 | + new CensusColumnSexMZ($this, 'Pohlaví', ''), |
|
41 | + new CensusColumnNull($this, 'Stav', 'Rodinný stav'), |
|
42 | + new CensusColumnBirthDaySlashMonthYear($this, 'Narození', 'Datum narození'), |
|
43 | + new CensusColumnBirthPlace($this, 'Místo', 'Místo narození'), |
|
44 | + new CensusColumnNull($this, 'Přísluší', 'Domovské právo'), |
|
45 | + new CensusColumnNull($this, 'Jazyk', 'Jazyk v obcování'), |
|
46 | + new CensusColumnReligion($this, 'Vyznání', ''), |
|
47 | + new CensusColumnOccupation($this, 'Povolání', ''), |
|
48 | + new CensusColumnNull($this, 'Postavení', 'Postavení v zaměstnání'), |
|
49 | + new CensusColumnNull($this, '', ''), |
|
50 | + new CensusColumnNull($this, '', ''), |
|
51 | + new CensusColumnNull($this, '', ''), |
|
52 | + ); |
|
53 | + } |
|
54 | 54 | } |
@@ -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', ''), |
@@ -21,15 +21,15 @@ |
||
21 | 21 | * The individual's date of birth. |
22 | 22 | */ |
23 | 23 | class CensusColumnBirthYear extends AbstractCensusColumn implements CensusColumnInterface { |
24 | - /** |
|
25 | - * Generate the likely value of this census column, based on available information. |
|
26 | - * |
|
27 | - * @param Individual $individual |
|
28 | - * @param Individual|null $head |
|
29 | - * |
|
30 | - * @return string |
|
31 | - */ |
|
32 | - public function generate(Individual $individual, Individual $head = null) { |
|
33 | - return $individual->getEstimatedBirthDate()->minimumDate()->format('%Y'); |
|
34 | - } |
|
24 | + /** |
|
25 | + * Generate the likely value of this census column, based on available information. |
|
26 | + * |
|
27 | + * @param Individual $individual |
|
28 | + * @param Individual|null $head |
|
29 | + * |
|
30 | + * @return string |
|
31 | + */ |
|
32 | + public function generate(Individual $individual, Individual $head = null) { |
|
33 | + return $individual->getEstimatedBirthDate()->minimumDate()->format('%Y'); |
|
34 | + } |
|
35 | 35 | } |
@@ -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 | } |
@@ -19,38 +19,38 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfUnitedStates extends Census implements CensusPlaceInterface { |
22 | - /** |
|
23 | - * All available censuses for this census place. |
|
24 | - * |
|
25 | - * @return CensusInterface[] |
|
26 | - */ |
|
27 | - public function allCensusDates() { |
|
28 | - return array( |
|
29 | - new CensusOfUnitedStates1790(), |
|
30 | - new CensusOfUnitedStates1800(), |
|
31 | - new CensusOfUnitedStates1810(), |
|
32 | - new CensusOfUnitedStates1820(), |
|
33 | - new CensusOfUnitedStates1830(), |
|
34 | - new CensusOfUnitedStates1840(), |
|
35 | - new CensusOfUnitedStates1850(), |
|
36 | - new CensusOfUnitedStates1860(), |
|
37 | - new CensusOfUnitedStates1870(), |
|
38 | - new CensusOfUnitedStates1880(), |
|
39 | - new CensusOfUnitedStates1890(), |
|
40 | - new CensusOfUnitedStates1900(), |
|
41 | - new CensusOfUnitedStates1910(), |
|
42 | - new CensusOfUnitedStates1920(), |
|
43 | - new CensusOfUnitedStates1930(), |
|
44 | - new CensusOfUnitedStates1940(), |
|
45 | - ); |
|
46 | - } |
|
22 | + /** |
|
23 | + * All available censuses for this census place. |
|
24 | + * |
|
25 | + * @return CensusInterface[] |
|
26 | + */ |
|
27 | + public function allCensusDates() { |
|
28 | + return array( |
|
29 | + new CensusOfUnitedStates1790(), |
|
30 | + new CensusOfUnitedStates1800(), |
|
31 | + new CensusOfUnitedStates1810(), |
|
32 | + new CensusOfUnitedStates1820(), |
|
33 | + new CensusOfUnitedStates1830(), |
|
34 | + new CensusOfUnitedStates1840(), |
|
35 | + new CensusOfUnitedStates1850(), |
|
36 | + new CensusOfUnitedStates1860(), |
|
37 | + new CensusOfUnitedStates1870(), |
|
38 | + new CensusOfUnitedStates1880(), |
|
39 | + new CensusOfUnitedStates1890(), |
|
40 | + new CensusOfUnitedStates1900(), |
|
41 | + new CensusOfUnitedStates1910(), |
|
42 | + new CensusOfUnitedStates1920(), |
|
43 | + new CensusOfUnitedStates1930(), |
|
44 | + new CensusOfUnitedStates1940(), |
|
45 | + ); |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * Where did this census occur, in GEDCOM format. |
|
50 | - * |
|
51 | - * @return string |
|
52 | - */ |
|
53 | - public function censusPlace() { |
|
54 | - return 'United States'; |
|
55 | - } |
|
48 | + /** |
|
49 | + * Where did this census occur, in GEDCOM format. |
|
50 | + * |
|
51 | + * @return string |
|
52 | + */ |
|
53 | + public function censusPlace() { |
|
54 | + return 'United States'; |
|
55 | + } |
|
56 | 56 | } |
@@ -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 | } |