@@ -22,19 +22,19 @@ |
||
22 | 22 | * The age of a female individual. |
23 | 23 | */ |
24 | 24 | class CensusColumnAgeFemale extends AbstractCensusColumn implements CensusColumnInterface { |
25 | - /** |
|
26 | - * Generate the likely value of this census column, based on available information. |
|
27 | - * |
|
28 | - * @param Individual $individual |
|
29 | - * @param Individual|null $head |
|
30 | - * |
|
31 | - * @return string |
|
32 | - */ |
|
33 | - public function generate(Individual $individual, Individual $head = null) { |
|
34 | - if ($individual->getSex() === 'M') { |
|
35 | - return ''; |
|
36 | - } else { |
|
37 | - return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0); |
|
38 | - } |
|
39 | - } |
|
25 | + /** |
|
26 | + * Generate the likely value of this census column, based on available information. |
|
27 | + * |
|
28 | + * @param Individual $individual |
|
29 | + * @param Individual|null $head |
|
30 | + * |
|
31 | + * @return string |
|
32 | + */ |
|
33 | + public function generate(Individual $individual, Individual $head = null) { |
|
34 | + if ($individual->getSex() === 'M') { |
|
35 | + return ''; |
|
36 | + } else { |
|
37 | + return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0); |
|
38 | + } |
|
39 | + } |
|
40 | 40 | } |
@@ -21,7 +21,8 @@ discard block |
||
21 | 21 | /** |
22 | 22 | * The age of a female individual. |
23 | 23 | */ |
24 | -class CensusColumnAgeFemale extends AbstractCensusColumn implements CensusColumnInterface { |
|
24 | +class CensusColumnAgeFemale 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() === 'M') { |
35 | 37 | return ''; |
36 | 38 | } else { |
@@ -19,48 +19,48 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfDeutschland1919 extends CensusOfDeutschland implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '08 OCT 1919'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '08 OCT 1919'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * Where did this census occur, in GEDCOM format. |
|
33 | - * |
|
34 | - * @return string |
|
35 | - */ |
|
36 | - public function censusPlace() { |
|
37 | - return 'Mecklenburg-Schwerin, Deutschland'; |
|
38 | - } |
|
31 | + /** |
|
32 | + * Where did this census occur, in GEDCOM format. |
|
33 | + * |
|
34 | + * @return string |
|
35 | + */ |
|
36 | + public function censusPlace() { |
|
37 | + return 'Mecklenburg-Schwerin, Deutschland'; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * The columns of the census. |
|
42 | - * |
|
43 | - * @return CensusColumnInterface[] |
|
44 | - */ |
|
45 | - public function columns() { |
|
46 | - return array( |
|
47 | - new CensusColumnNull($this, 'Nummer', 'Laufende Nummer'), |
|
48 | - new CensusColumnGivenNames($this, 'Vorname', 'Vorname'), |
|
49 | - new CensusColumnSurname($this, 'Familienname', 'Familienname'), |
|
50 | - new CensusColumnRelationToHeadGerman($this, 'Stellung im Haushalt', 'Stellung im Haushalt'), |
|
51 | - new CensusColumnNull($this, 'männlich', 'Geschlecht männlich'), |
|
52 | - new CensusColumnNull($this, 'weiblich', 'Geschlecht weiblich'), |
|
53 | - new CensusColumnNull($this, 'Familienstand', 'Familienstand'), |
|
54 | - new CensusColumnBirthDay($this, 'Geburts-Tag', 'Geburts-Tag'), |
|
55 | - new CensusColumnBirthMonth($this, 'Geburts-Monat', 'Geburts-Monat'), |
|
56 | - new CensusColumnBirthYear($this, 'Geburts-Jahr', 'Geburts-Jahr'), |
|
57 | - new CensusColumnBirthPlace($this, 'Geburtsort', 'Name des Geburtsorts'), |
|
58 | - new CensusColumnNull($this, 'Amt, Kreis, Bezirk', 'Amt, Kreis oder sonstiger obrigkeitlicher Bezirk'), |
|
59 | - new CensusColumnNull($this, 'StA', 'Staatsangehörigkeit'), |
|
60 | - new CensusColumnNull($this, 'Gemeinde Brotversorgung', 'Gemeinde der Brotversorgung'), |
|
61 | - new CensusColumnNull($this, 'Wohn-/ Aufenthaltsort', 'Wohnort bei nur vorübergehend Anwesenden. Aufenthaltsort bei vorübergehend Abwesenden'), |
|
62 | - new CensusColumnNull($this, 'Dienstgrad', 'Für Militärpersonen: Angabe des Dienstgrades'), |
|
63 | - new CensusColumnNull($this, 'Kriegsgefangener', 'Angabe ob Kriegsgefangener'), |
|
64 | - ); |
|
65 | - } |
|
40 | + /** |
|
41 | + * The columns of the census. |
|
42 | + * |
|
43 | + * @return CensusColumnInterface[] |
|
44 | + */ |
|
45 | + public function columns() { |
|
46 | + return array( |
|
47 | + new CensusColumnNull($this, 'Nummer', 'Laufende Nummer'), |
|
48 | + new CensusColumnGivenNames($this, 'Vorname', 'Vorname'), |
|
49 | + new CensusColumnSurname($this, 'Familienname', 'Familienname'), |
|
50 | + new CensusColumnRelationToHeadGerman($this, 'Stellung im Haushalt', 'Stellung im Haushalt'), |
|
51 | + new CensusColumnNull($this, 'männlich', 'Geschlecht männlich'), |
|
52 | + new CensusColumnNull($this, 'weiblich', 'Geschlecht weiblich'), |
|
53 | + new CensusColumnNull($this, 'Familienstand', 'Familienstand'), |
|
54 | + new CensusColumnBirthDay($this, 'Geburts-Tag', 'Geburts-Tag'), |
|
55 | + new CensusColumnBirthMonth($this, 'Geburts-Monat', 'Geburts-Monat'), |
|
56 | + new CensusColumnBirthYear($this, 'Geburts-Jahr', 'Geburts-Jahr'), |
|
57 | + new CensusColumnBirthPlace($this, 'Geburtsort', 'Name des Geburtsorts'), |
|
58 | + new CensusColumnNull($this, 'Amt, Kreis, Bezirk', 'Amt, Kreis oder sonstiger obrigkeitlicher Bezirk'), |
|
59 | + new CensusColumnNull($this, 'StA', 'Staatsangehörigkeit'), |
|
60 | + new CensusColumnNull($this, 'Gemeinde Brotversorgung', 'Gemeinde der Brotversorgung'), |
|
61 | + new CensusColumnNull($this, 'Wohn-/ Aufenthaltsort', 'Wohnort bei nur vorübergehend Anwesenden. Aufenthaltsort bei vorübergehend Abwesenden'), |
|
62 | + new CensusColumnNull($this, 'Dienstgrad', 'Für Militärpersonen: Angabe des Dienstgrades'), |
|
63 | + new CensusColumnNull($this, 'Kriegsgefangener', 'Angabe ob Kriegsgefangener'), |
|
64 | + ); |
|
65 | + } |
|
66 | 66 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfDeutschland1919 extends CensusOfDeutschland implements CensusInterface { |
|
21 | +class CensusOfDeutschland1919 extends CensusOfDeutschland 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 '08 OCT 1919'; |
29 | 31 | } |
30 | 32 | |
@@ -33,7 +35,8 @@ discard block |
||
33 | 35 | * |
34 | 36 | * @return string |
35 | 37 | */ |
36 | - public function censusPlace() { |
|
38 | + public function censusPlace() |
|
39 | + { |
|
37 | 40 | return 'Mecklenburg-Schwerin, Deutschland'; |
38 | 41 | } |
39 | 42 | |
@@ -42,7 +45,8 @@ discard block |
||
42 | 45 | * |
43 | 46 | * @return CensusColumnInterface[] |
44 | 47 | */ |
45 | - public function columns() { |
|
48 | + public function columns() |
|
49 | + { |
|
46 | 50 | return array( |
47 | 51 | new CensusColumnNull($this, 'Nummer', 'Laufende Nummer'), |
48 | 52 | new CensusColumnGivenNames($this, 'Vorname', 'Vorname'), |
@@ -19,33 +19,33 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfScotland1901 extends CensusOfScotland implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '31 MAR 1901'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '31 MAR 1901'; |
|
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, 'Name', 'Name and surname'), |
|
39 | - new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), |
|
40 | - new CensusColumnConditionEnglish($this, 'Condition', 'Condition'), |
|
41 | - new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), |
|
42 | - new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), |
|
43 | - new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), |
|
44 | - new CensusColumnNull($this, 'Emp', 'Employer, worker or own account'), |
|
45 | - new CensusColumnNull($this, 'Home', 'Working at home'), |
|
46 | - new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), |
|
47 | - new CensusColumnNull($this, 'Lang', 'Language spoken'), |
|
48 | - new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, lunatic, imbecile, feeble-minded'), |
|
49 | - ); |
|
50 | - } |
|
31 | + /** |
|
32 | + * The columns of the census. |
|
33 | + * |
|
34 | + * @return CensusColumnInterface[] |
|
35 | + */ |
|
36 | + public function columns() { |
|
37 | + return array( |
|
38 | + new CensusColumnFullName($this, 'Name', 'Name and surname'), |
|
39 | + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), |
|
40 | + new CensusColumnConditionEnglish($this, 'Condition', 'Condition'), |
|
41 | + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), |
|
42 | + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), |
|
43 | + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), |
|
44 | + new CensusColumnNull($this, 'Emp', 'Employer, worker or own account'), |
|
45 | + new CensusColumnNull($this, 'Home', 'Working at home'), |
|
46 | + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), |
|
47 | + new CensusColumnNull($this, 'Lang', 'Language spoken'), |
|
48 | + new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, lunatic, imbecile, feeble-minded'), |
|
49 | + ); |
|
50 | + } |
|
51 | 51 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfScotland1901 extends CensusOfScotland implements CensusInterface { |
|
21 | +class CensusOfScotland1901 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 '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'), |
@@ -19,28 +19,28 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfScotland1841 extends CensusOfScotland implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '06 JUN 1841'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '06 JUN 1841'; |
|
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, 'Name', 'Name'), |
|
39 | - new CensusColumnAgeMale5Years($this, 'AgeM', 'Age (males)'), |
|
40 | - new CensusColumnAgeFemale5Years($this, 'AgeF', 'Age (females)'), |
|
41 | - new CensusColumnOccupation($this, 'Occupation', 'Profession, trade, employment or of independent means'), |
|
42 | - new CensusColumnNull($this, 'BiC', 'Born in same county'), |
|
43 | - new CensusColumnBornForeignParts($this, 'EIF', 'Born in England, Ireland or foreign parts'), |
|
44 | - ); |
|
45 | - } |
|
31 | + /** |
|
32 | + * The columns of the census. |
|
33 | + * |
|
34 | + * @return CensusColumnInterface[] |
|
35 | + */ |
|
36 | + public function columns() { |
|
37 | + return array( |
|
38 | + new CensusColumnFullName($this, 'Name', 'Name'), |
|
39 | + new CensusColumnAgeMale5Years($this, 'AgeM', 'Age (males)'), |
|
40 | + new CensusColumnAgeFemale5Years($this, 'AgeF', 'Age (females)'), |
|
41 | + new CensusColumnOccupation($this, 'Occupation', 'Profession, trade, employment or of independent means'), |
|
42 | + new CensusColumnNull($this, 'BiC', 'Born in same county'), |
|
43 | + new CensusColumnBornForeignParts($this, 'EIF', 'Born in England, Ireland or foreign parts'), |
|
44 | + ); |
|
45 | + } |
|
46 | 46 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfScotland1841 extends CensusOfScotland implements CensusInterface { |
|
21 | +class CensusOfScotland1841 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 '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)'), |
@@ -19,44 +19,44 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfDeutschland1819 extends CensusOfDeutschland implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return 'AUG 1819'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return 'AUG 1819'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * Where did this census occur, in GEDCOM format. |
|
33 | - * |
|
34 | - * @return string |
|
35 | - */ |
|
36 | - public function censusPlace() { |
|
37 | - return 'Mecklenburg-Schwerin, Deutschland'; |
|
38 | - } |
|
31 | + /** |
|
32 | + * Where did this census occur, in GEDCOM format. |
|
33 | + * |
|
34 | + * @return string |
|
35 | + */ |
|
36 | + public function censusPlace() { |
|
37 | + return 'Mecklenburg-Schwerin, Deutschland'; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * The columns of the census. |
|
42 | - * |
|
43 | - * @return CensusColumnInterface[] |
|
44 | - */ |
|
45 | - public function columns() { |
|
46 | - return array( |
|
47 | - new CensusColumnNull($this, 'Nr.', 'Laufende Num̅er.'), |
|
48 | - new CensusColumnNull($this, 'Geschlecht', 'Ob männlichen oder weiblichen Geschlechts.'), |
|
49 | - new CensusColumnFullName($this, 'Name', 'Vor- und Zuname.'), |
|
50 | - new CensusColumnBirthYear($this, 'Geburtsdatum', 'Jahr und Tag der Geburt.'), |
|
51 | - new CensusColumnBirthPlace($this, 'Geburtsort', 'Geburtsort.'), |
|
52 | - new CensusColumnNull($this, 'Kirchspiel', 'Kirchspiel, wohin der Geburtsort gehört.'), |
|
53 | - new CensusColumnNull($this, '', 'leere Spalte'), |
|
54 | - new CensusColumnOccupation($this, 'Stand/Beruf', 'Stand und Gewerbe.'), |
|
55 | - new CensusColumnNull($this, 'Besitz', 'Grundbesitz.'), |
|
56 | - new CensusColumnNull($this, 'hier seit', 'Wie lange er schon hier ist.'), |
|
57 | - new CensusColumnNull($this, 'Familienstand', 'Ob ledig oder verheirathet.'), |
|
58 | - new CensusColumnReligion($this, 'Religion', 'Religion.'), |
|
59 | - new CensusColumnNull($this, 'Bemerkungen', 'Allgemeine Bemerkungen.'), |
|
60 | - ); |
|
61 | - } |
|
40 | + /** |
|
41 | + * The columns of the census. |
|
42 | + * |
|
43 | + * @return CensusColumnInterface[] |
|
44 | + */ |
|
45 | + public function columns() { |
|
46 | + return array( |
|
47 | + new CensusColumnNull($this, 'Nr.', 'Laufende Num̅er.'), |
|
48 | + new CensusColumnNull($this, 'Geschlecht', 'Ob männlichen oder weiblichen Geschlechts.'), |
|
49 | + new CensusColumnFullName($this, 'Name', 'Vor- und Zuname.'), |
|
50 | + new CensusColumnBirthYear($this, 'Geburtsdatum', 'Jahr und Tag der Geburt.'), |
|
51 | + new CensusColumnBirthPlace($this, 'Geburtsort', 'Geburtsort.'), |
|
52 | + new CensusColumnNull($this, 'Kirchspiel', 'Kirchspiel, wohin der Geburtsort gehört.'), |
|
53 | + new CensusColumnNull($this, '', 'leere Spalte'), |
|
54 | + new CensusColumnOccupation($this, 'Stand/Beruf', 'Stand und Gewerbe.'), |
|
55 | + new CensusColumnNull($this, 'Besitz', 'Grundbesitz.'), |
|
56 | + new CensusColumnNull($this, 'hier seit', 'Wie lange er schon hier ist.'), |
|
57 | + new CensusColumnNull($this, 'Familienstand', 'Ob ledig oder verheirathet.'), |
|
58 | + new CensusColumnReligion($this, 'Religion', 'Religion.'), |
|
59 | + new CensusColumnNull($this, 'Bemerkungen', 'Allgemeine Bemerkungen.'), |
|
60 | + ); |
|
61 | + } |
|
62 | 62 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfDeutschland1819 extends CensusOfDeutschland implements CensusInterface { |
|
21 | +class CensusOfDeutschland1819 extends CensusOfDeutschland 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 'AUG 1819'; |
29 | 31 | } |
30 | 32 | |
@@ -33,7 +35,8 @@ discard block |
||
33 | 35 | * |
34 | 36 | * @return string |
35 | 37 | */ |
36 | - public function censusPlace() { |
|
38 | + public function censusPlace() |
|
39 | + { |
|
37 | 40 | return 'Mecklenburg-Schwerin, Deutschland'; |
38 | 41 | } |
39 | 42 | |
@@ -42,7 +45,8 @@ discard block |
||
42 | 45 | * |
43 | 46 | * @return CensusColumnInterface[] |
44 | 47 | */ |
45 | - public function columns() { |
|
48 | + public function columns() |
|
49 | + { |
|
46 | 50 | return array( |
47 | 51 | new CensusColumnNull($this, 'Nr.', 'Laufende Num̅er.'), |
48 | 52 | new CensusColumnNull($this, 'Geschlecht', 'Ob männlichen oder weiblichen Geschlechts.'), |
@@ -21,21 +21,21 @@ |
||
21 | 21 | * The individual's date of birth. |
22 | 22 | */ |
23 | 23 | class CensusColumnBirthDayDotMonthYear 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_date = $individual->getBirthDate(); |
|
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_date = $individual->getBirthDate(); |
|
34 | 34 | |
35 | - if ($birth_date->minimumJulianDay() === $birth_date->maximumJulianDay()) { |
|
36 | - return $birth_date->minimumDate()->format('%j. %F %Y'); |
|
37 | - } else { |
|
38 | - return ''; |
|
39 | - } |
|
40 | - } |
|
35 | + if ($birth_date->minimumJulianDay() === $birth_date->maximumJulianDay()) { |
|
36 | + return $birth_date->minimumDate()->format('%j. %F %Y'); |
|
37 | + } else { |
|
38 | + return ''; |
|
39 | + } |
|
40 | + } |
|
41 | 41 | } |
@@ -20,7 +20,8 @@ discard block |
||
20 | 20 | /** |
21 | 21 | * The individual's date of birth. |
22 | 22 | */ |
23 | -class CensusColumnBirthDayDotMonthYear extends AbstractCensusColumn implements CensusColumnInterface { |
|
23 | +class CensusColumnBirthDayDotMonthYear 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()) { |
@@ -19,26 +19,26 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfDenmark1834 extends CensusOfDenmark implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '18 FEB 1834'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '18 FEB 1834'; |
|
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 CensusColumnRelationToHead($this, 'Stilling i familien', ''), |
|
42 | - ); |
|
43 | - } |
|
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 CensusColumnRelationToHead($this, 'Stilling i familien', ''), |
|
42 | + ); |
|
43 | + } |
|
44 | 44 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfDenmark1834 extends CensusOfDenmark implements CensusInterface { |
|
21 | +class CensusOfDenmark1834 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 '18 FEB 1834'; |
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,30 +19,30 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfScotland 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 CensusOfScotland1841(), |
|
30 | - new CensusOfScotland1851(), |
|
31 | - new CensusOfScotland1861(), |
|
32 | - new CensusOfScotland1871(), |
|
33 | - new CensusOfScotland1881(), |
|
34 | - new CensusOfScotland1891(), |
|
35 | - new CensusOfScotland1901(), |
|
36 | - new CensusOfScotland1911(), |
|
37 | - ); |
|
38 | - } |
|
22 | + /** |
|
23 | + * All available censuses for this census place. |
|
24 | + * |
|
25 | + * @return CensusInterface[] |
|
26 | + */ |
|
27 | + public function allCensusDates() { |
|
28 | + return array( |
|
29 | + new CensusOfScotland1841(), |
|
30 | + new CensusOfScotland1851(), |
|
31 | + new CensusOfScotland1861(), |
|
32 | + new CensusOfScotland1871(), |
|
33 | + new CensusOfScotland1881(), |
|
34 | + new CensusOfScotland1891(), |
|
35 | + new CensusOfScotland1901(), |
|
36 | + new CensusOfScotland1911(), |
|
37 | + ); |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * Where did this census occur, in GEDCOM format. |
|
42 | - * |
|
43 | - * @return string |
|
44 | - */ |
|
45 | - public function censusPlace() { |
|
46 | - return 'Scotland'; |
|
47 | - } |
|
40 | + /** |
|
41 | + * Where did this census occur, in GEDCOM format. |
|
42 | + * |
|
43 | + * @return string |
|
44 | + */ |
|
45 | + public function censusPlace() { |
|
46 | + return 'Scotland'; |
|
47 | + } |
|
48 | 48 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfScotland extends Census implements CensusPlaceInterface { |
|
21 | +class CensusOfScotland 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 CensusOfScotland1841(), |
30 | 32 | new CensusOfScotland1851(), |
@@ -42,7 +44,8 @@ discard block |
||
42 | 44 | * |
43 | 45 | * @return string |
44 | 46 | */ |
45 | - public function censusPlace() { |
|
47 | + public function censusPlace() |
|
48 | + { |
|
46 | 49 | return 'Scotland'; |
47 | 50 | } |
48 | 51 | } |
@@ -19,24 +19,24 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfCzechRepublic 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 CensusOfCzechRepublic1880(), |
|
30 | - new CensusOfCzechRepublic1921(), |
|
31 | - ); |
|
32 | - } |
|
22 | + /** |
|
23 | + * All available censuses for this census place. |
|
24 | + * |
|
25 | + * @return CensusInterface[] |
|
26 | + */ |
|
27 | + public function allCensusDates() { |
|
28 | + return array( |
|
29 | + new CensusOfCzechRepublic1880(), |
|
30 | + new CensusOfCzechRepublic1921(), |
|
31 | + ); |
|
32 | + } |
|
33 | 33 | |
34 | - /** |
|
35 | - * Where did this census occur, in GEDCOM format. |
|
36 | - * |
|
37 | - * @return string |
|
38 | - */ |
|
39 | - public function censusPlace() { |
|
40 | - return 'Česko'; |
|
41 | - } |
|
34 | + /** |
|
35 | + * Where did this census occur, in GEDCOM format. |
|
36 | + * |
|
37 | + * @return string |
|
38 | + */ |
|
39 | + public function censusPlace() { |
|
40 | + return 'Česko'; |
|
41 | + } |
|
42 | 42 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfCzechRepublic extends Census implements CensusPlaceInterface { |
|
21 | +class CensusOfCzechRepublic 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 CensusOfCzechRepublic1880(), |
30 | 32 | new CensusOfCzechRepublic1921(), |
@@ -36,7 +38,8 @@ discard block |
||
36 | 38 | * |
37 | 39 | * @return string |
38 | 40 | */ |
39 | - public function censusPlace() { |
|
41 | + public function censusPlace() |
|
42 | + { |
|
40 | 43 | return 'Česko'; |
41 | 44 | } |
42 | 45 | } |