@@ -19,30 +19,30 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfFrance1931 extends CensusOfFrance implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '15 JAN 1931'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '15 JAN 1931'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * The columns of the census. |
|
33 | - * |
|
34 | - * @return CensusColumnInterface[] |
|
35 | - */ |
|
36 | - public function columns() { |
|
37 | - return array( |
|
38 | - new CensusColumnSurname($this, 'Noms', 'Noms de famille'), |
|
39 | - new CensusColumnGivenNames($this, 'Prénoms', ''), |
|
40 | - new CensusColumnBirthYear($this, 'Année', 'Année de naissance'), |
|
41 | - new CensusColumnBirthPlace($this, 'Lieu', 'Lieu de naissance'), |
|
42 | - new CensusColumnNationality($this, 'Nationalité', ''), |
|
43 | - new CensusColumnRelationToHead($this, 'Situation', 'Situation par rapport au chef de ménage'), |
|
44 | - new CensusColumnOccupation($this, 'Profession', ''), |
|
45 | - new CensusColumnNull($this, 'Empl', ''), |
|
46 | - ); |
|
47 | - } |
|
31 | + /** |
|
32 | + * The columns of the census. |
|
33 | + * |
|
34 | + * @return CensusColumnInterface[] |
|
35 | + */ |
|
36 | + public function columns() { |
|
37 | + return array( |
|
38 | + new CensusColumnSurname($this, 'Noms', 'Noms de famille'), |
|
39 | + new CensusColumnGivenNames($this, 'Prénoms', ''), |
|
40 | + new CensusColumnBirthYear($this, 'Année', 'Année de naissance'), |
|
41 | + new CensusColumnBirthPlace($this, 'Lieu', 'Lieu de naissance'), |
|
42 | + new CensusColumnNationality($this, 'Nationalité', ''), |
|
43 | + new CensusColumnRelationToHead($this, 'Situation', 'Situation par rapport au chef de ménage'), |
|
44 | + new CensusColumnOccupation($this, 'Profession', ''), |
|
45 | + new CensusColumnNull($this, 'Empl', ''), |
|
46 | + ); |
|
47 | + } |
|
48 | 48 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfFrance1931 extends CensusOfFrance implements CensusInterface { |
|
21 | +class CensusOfFrance1931 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 '15 JAN 1931'; |
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', ''), |
@@ -19,44 +19,44 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfFrance 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 CensusOfFrance1831(), |
|
30 | - new CensusOfFrance1836(), |
|
31 | - new CensusOfFrance1841(), |
|
32 | - new CensusOfFrance1846(), |
|
33 | - new CensusOfFrance1851(), |
|
34 | - new CensusOfFrance1856(), |
|
35 | - new CensusOfFrance1861(), |
|
36 | - new CensusOfFrance1866(), |
|
37 | - new CensusOfFrance1872(), |
|
38 | - new CensusOfFrance1876(), |
|
39 | - new CensusOfFrance1881(), |
|
40 | - new CensusOfFrance1886(), |
|
41 | - new CensusOfFrance1891(), |
|
42 | - new CensusOfFrance1896(), |
|
43 | - new CensusOfFrance1901(), |
|
44 | - new CensusOfFrance1906(), |
|
45 | - new CensusOfFrance1911(), |
|
46 | - new CensusOfFrance1921(), |
|
47 | - new CensusOfFrance1926(), |
|
48 | - new CensusOfFrance1931(), |
|
49 | - new CensusOfFrance1936(), |
|
50 | - new CensusOfFrance1946(), |
|
51 | - ); |
|
52 | - } |
|
22 | + /** |
|
23 | + * All available censuses for this census place. |
|
24 | + * |
|
25 | + * @return CensusInterface[] |
|
26 | + */ |
|
27 | + public function allCensusDates() { |
|
28 | + return array( |
|
29 | + new CensusOfFrance1831(), |
|
30 | + new CensusOfFrance1836(), |
|
31 | + new CensusOfFrance1841(), |
|
32 | + new CensusOfFrance1846(), |
|
33 | + new CensusOfFrance1851(), |
|
34 | + new CensusOfFrance1856(), |
|
35 | + new CensusOfFrance1861(), |
|
36 | + new CensusOfFrance1866(), |
|
37 | + new CensusOfFrance1872(), |
|
38 | + new CensusOfFrance1876(), |
|
39 | + new CensusOfFrance1881(), |
|
40 | + new CensusOfFrance1886(), |
|
41 | + new CensusOfFrance1891(), |
|
42 | + new CensusOfFrance1896(), |
|
43 | + new CensusOfFrance1901(), |
|
44 | + new CensusOfFrance1906(), |
|
45 | + new CensusOfFrance1911(), |
|
46 | + new CensusOfFrance1921(), |
|
47 | + new CensusOfFrance1926(), |
|
48 | + new CensusOfFrance1931(), |
|
49 | + new CensusOfFrance1936(), |
|
50 | + new CensusOfFrance1946(), |
|
51 | + ); |
|
52 | + } |
|
53 | 53 | |
54 | - /** |
|
55 | - * Where did this census occur, in GEDCOM format. |
|
56 | - * |
|
57 | - * @return string |
|
58 | - */ |
|
59 | - public function censusPlace() { |
|
60 | - return 'France'; |
|
61 | - } |
|
54 | + /** |
|
55 | + * Where did this census occur, in GEDCOM format. |
|
56 | + * |
|
57 | + * @return string |
|
58 | + */ |
|
59 | + public function censusPlace() { |
|
60 | + return 'France'; |
|
61 | + } |
|
62 | 62 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfFrance extends Census implements CensusPlaceInterface { |
|
21 | +class CensusOfFrance 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 CensusOfFrance1831(), |
30 | 32 | new CensusOfFrance1836(), |
@@ -56,7 +58,8 @@ discard block |
||
56 | 58 | * |
57 | 59 | * @return string |
58 | 60 | */ |
59 | - public function censusPlace() { |
|
61 | + public function censusPlace() |
|
62 | + { |
|
60 | 63 | return 'France'; |
61 | 64 | } |
62 | 65 | } |
@@ -22,19 +22,19 @@ |
||
22 | 22 | * The age of a male individual. |
23 | 23 | */ |
24 | 24 | class CensusColumnAgeMale 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() === 'F') { |
|
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() === 'F') { |
|
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 male individual. |
23 | 23 | */ |
24 | -class CensusColumnAgeMale extends AbstractCensusColumn implements CensusColumnInterface { |
|
24 | +class CensusColumnAgeMale 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() === 'F') { |
35 | 37 | return ''; |
36 | 38 | } else { |
@@ -19,38 +19,38 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfEngland1911 extends CensusOfEngland implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '02 APR 1911'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '02 APR 1911'; |
|
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 CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), |
|
41 | - new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), |
|
42 | - new CensusColumnConditionEnglish($this, 'Condition', 'Condition'), |
|
43 | - new CensusColumnYearsMarried($this, 'YrM', 'Years married'), |
|
44 | - new CensusColumnChildrenBornAlive($this, 'ChA', 'Children born alive'), |
|
45 | - new CensusColumnChildrenLiving($this, 'ChL', 'Children who are still alive'), |
|
46 | - new CensusColumnChildrenDied($this, 'ChD', 'Children who have died'), |
|
47 | - new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), |
|
48 | - new CensusColumnNull($this, 'Ind', 'Industry'), |
|
49 | - new CensusColumnNull($this, 'Emp', 'Employer, worker or own account'), |
|
50 | - new CensusColumnNull($this, 'Home', 'Working at home'), |
|
51 | - new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), |
|
52 | - new CensusColumnNationality($this, 'Nat', 'Nationality'), |
|
53 | - new CensusColumnNull($this, 'Infirm', 'Infirmity'), |
|
54 | - ); |
|
55 | - } |
|
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 CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), |
|
41 | + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), |
|
42 | + new CensusColumnConditionEnglish($this, 'Condition', 'Condition'), |
|
43 | + new CensusColumnYearsMarried($this, 'YrM', 'Years married'), |
|
44 | + new CensusColumnChildrenBornAlive($this, 'ChA', 'Children born alive'), |
|
45 | + new CensusColumnChildrenLiving($this, 'ChL', 'Children who are still alive'), |
|
46 | + new CensusColumnChildrenDied($this, 'ChD', 'Children who have died'), |
|
47 | + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), |
|
48 | + new CensusColumnNull($this, 'Ind', 'Industry'), |
|
49 | + new CensusColumnNull($this, 'Emp', 'Employer, worker or own account'), |
|
50 | + new CensusColumnNull($this, 'Home', 'Working at home'), |
|
51 | + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), |
|
52 | + new CensusColumnNationality($this, 'Nat', 'Nationality'), |
|
53 | + new CensusColumnNull($this, 'Infirm', 'Infirmity'), |
|
54 | + ); |
|
55 | + } |
|
56 | 56 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfEngland1911 extends CensusOfEngland implements CensusInterface { |
|
21 | +class CensusOfEngland1911 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 '02 APR 1911'; |
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,49 +19,49 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfDeutschlandNL1867 extends CensusOfDeutschland implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '03 DEC 1867'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '03 DEC 1867'; |
|
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 (Nachtragsliste), 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 (Nachtragsliste), 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, '1.Nr.', 'Ordnungs-Nummer.'), |
|
48 | - new CensusColumnGivenNames($this, '2.Vorname', 'I. Vor- und Familienname jeder Person. Vorname.'), |
|
49 | - new CensusColumnSurname($this, '3.Familienname', 'I. Vor- und Familienname jeder Person. Familienname.'), |
|
50 | - new CensusColumnNull($this, '4.männlich', 'II. Geschlecht männlich.'), |
|
51 | - new CensusColumnNull($this, '5.weiblich', 'II. Geschlecht weiblich.'), |
|
52 | - new CensusColumnBirthYear($this, '6.Geburtsjahr', 'III. Alter.'), |
|
53 | - new CensusColumnReligion($this, '7.Religion', 'IV. Religionsbekenntnis.'), |
|
54 | - new CensusColumnNull($this, '8.ledig', 'V. Familienstand. ledig.'), |
|
55 | - new CensusColumnNull($this, '9.verehelicht', 'V. Familienstand. verehelicht.'), |
|
56 | - new CensusColumnNull($this, '10.verwittwet', 'V. Familienstand. verwittwet.'), |
|
57 | - new CensusColumnNull($this, '11.geschieden', 'V. Familienstand. geschieden.'), |
|
58 | - new CensusColumnNull($this, '12.StA_M-S', 'VI. Staatsangehörigkeit. Mecklenburg-Schwerinscher Unterthan.'), |
|
59 | - new CensusColumnNull($this, '13.StA', 'VI. Staatsangehörigkeit. Anderen Staaten angehörig. Welchem Staat?'), |
|
60 | - new CensusColumnNull($this, '14.', 'VII. Art des Abwesenheit vom Zählungsorte. Nicht über ein Jahr Abwesende als See- oder Flußschiffer.'), |
|
61 | - new CensusColumnNull($this, '15.', 'VII. Art des Abwesenheit vom Zählungsorte. Nicht über ein Jahr Abwesende auf Land- oder Seereisen.'), |
|
62 | - new CensusColumnNull($this, '16.', 'VII. Art des Abwesenheit vom Zählungsorte. Nicht über ein Jahr Abwesende auf Besuch außerhalb des Orts.'), |
|
63 | - new CensusColumnNull($this, '17.', 'VII. Art des Aufenthalts am Zählungsort. Ueber ein Jahr, oder in anderer Art als nach Spalte 14 bis 16 Abwesende.'), |
|
64 | - new CensusColumnNull($this, '18.Aufenthaltsort', 'VIII. Vermuthlicher Aufenthaltsort zur Zählungszeit.'), |
|
65 | - ); |
|
66 | - } |
|
40 | + /** |
|
41 | + * The columns of the census. |
|
42 | + * |
|
43 | + * @return CensusColumnInterface[] |
|
44 | + */ |
|
45 | + public function columns() { |
|
46 | + return array( |
|
47 | + new CensusColumnNull($this, '1.Nr.', 'Ordnungs-Nummer.'), |
|
48 | + new CensusColumnGivenNames($this, '2.Vorname', 'I. Vor- und Familienname jeder Person. Vorname.'), |
|
49 | + new CensusColumnSurname($this, '3.Familienname', 'I. Vor- und Familienname jeder Person. Familienname.'), |
|
50 | + new CensusColumnNull($this, '4.männlich', 'II. Geschlecht männlich.'), |
|
51 | + new CensusColumnNull($this, '5.weiblich', 'II. Geschlecht weiblich.'), |
|
52 | + new CensusColumnBirthYear($this, '6.Geburtsjahr', 'III. Alter.'), |
|
53 | + new CensusColumnReligion($this, '7.Religion', 'IV. Religionsbekenntnis.'), |
|
54 | + new CensusColumnNull($this, '8.ledig', 'V. Familienstand. ledig.'), |
|
55 | + new CensusColumnNull($this, '9.verehelicht', 'V. Familienstand. verehelicht.'), |
|
56 | + new CensusColumnNull($this, '10.verwittwet', 'V. Familienstand. verwittwet.'), |
|
57 | + new CensusColumnNull($this, '11.geschieden', 'V. Familienstand. geschieden.'), |
|
58 | + new CensusColumnNull($this, '12.StA_M-S', 'VI. Staatsangehörigkeit. Mecklenburg-Schwerinscher Unterthan.'), |
|
59 | + new CensusColumnNull($this, '13.StA', 'VI. Staatsangehörigkeit. Anderen Staaten angehörig. Welchem Staat?'), |
|
60 | + new CensusColumnNull($this, '14.', 'VII. Art des Abwesenheit vom Zählungsorte. Nicht über ein Jahr Abwesende als See- oder Flußschiffer.'), |
|
61 | + new CensusColumnNull($this, '15.', 'VII. Art des Abwesenheit vom Zählungsorte. Nicht über ein Jahr Abwesende auf Land- oder Seereisen.'), |
|
62 | + new CensusColumnNull($this, '16.', 'VII. Art des Abwesenheit vom Zählungsorte. Nicht über ein Jahr Abwesende auf Besuch außerhalb des Orts.'), |
|
63 | + new CensusColumnNull($this, '17.', 'VII. Art des Aufenthalts am Zählungsort. Ueber ein Jahr, oder in anderer Art als nach Spalte 14 bis 16 Abwesende.'), |
|
64 | + new CensusColumnNull($this, '18.Aufenthaltsort', 'VIII. Vermuthlicher Aufenthaltsort zur Zählungszeit.'), |
|
65 | + ); |
|
66 | + } |
|
67 | 67 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfDeutschlandNL1867 extends CensusOfDeutschland implements CensusInterface { |
|
21 | +class CensusOfDeutschlandNL1867 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 '03 DEC 1867'; |
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 (Nachtragsliste), 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, '1.Nr.', 'Ordnungs-Nummer.'), |
48 | 52 | new CensusColumnGivenNames($this, '2.Vorname', 'I. Vor- und Familienname jeder Person. Vorname.'), |
@@ -19,39 +19,39 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfDenmark1901 extends CensusOfDenmark implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '01 FEB 1901'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '01 FEB 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, 'Navn', 'Samtlige Personers Navn (ogsaa Fornavn). Ved Børn, endnu uden Navn, sættes „Dreng“ eller „Pige“.'), |
|
39 | - new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M.) eller Kvindekøn (Kv.).'), |
|
40 | - new CensusColumnBirthDaySlashMonthYear($this, 'Fødselsdag', 'Føderlsaar og Føderladag.'), |
|
41 | - new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U.), Gift (G.), Enkemand eller Enke (E.), Separeret (S.), Fraskilt (F.).'), |
|
42 | - new CensusColumnReligion($this, 'Trossamfund', 'Trossamfund (Folkekirken eller Navnet paa det Trossamfund, man tilhører, eller „uden for Trossamfund“).'), |
|
43 | - new CensusColumnBirthPlace($this, 'Fødested', 'Fødested 1) Indenlandsk Fødested: Kebstadens, Handelspladsens eller Sogneta og Amtets Navn (kan Amtet ikke angives, sættes vedkommende Landsdel, f. Eks. Fyn, Jlland osv.), 2) Fedt i Bilandene eller Udlandet: Landets Navn.'), |
|
44 | - new CensusColumnNull($this, '', ''), |
|
45 | - new CensusColumnNull($this, '', ''), |
|
46 | - new CensusColumnRelationToHead($this, 'Stilling i familien', 'Stilling i Familien (Husfader, Husmoder, Barn, Slangtning o.l., Tjenestetyende (naar vedkommende har Skudsmaalsbog), Pensioner, logerende.'), |
|
47 | - new CensusColumnOccupation($this, 'Erhverv', ''), |
|
48 | - new CensusColumnNull($this, '', ''), |
|
49 | - new CensusColumnNull($this, '', ''), |
|
50 | - new CensusColumnNull($this, '', ''), |
|
51 | - new CensusColumnNull($this, '', ''), |
|
52 | - new CensusColumnNull($this, '', ''), |
|
53 | - new CensusColumnNull($this, '', ''), |
|
54 | - new CensusColumnNull($this, 'Anmærkninger', 'Anmærkninger.'), |
|
55 | - ); |
|
56 | - } |
|
31 | + /** |
|
32 | + * The columns of the census. |
|
33 | + * |
|
34 | + * @return CensusColumnInterface[] |
|
35 | + */ |
|
36 | + public function columns() { |
|
37 | + return array( |
|
38 | + new CensusColumnFullName($this, 'Navn', 'Samtlige Personers Navn (ogsaa Fornavn). Ved Børn, endnu uden Navn, sættes „Dreng“ eller „Pige“.'), |
|
39 | + new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M.) eller Kvindekøn (Kv.).'), |
|
40 | + new CensusColumnBirthDaySlashMonthYear($this, 'Fødselsdag', 'Føderlsaar og Føderladag.'), |
|
41 | + new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U.), Gift (G.), Enkemand eller Enke (E.), Separeret (S.), Fraskilt (F.).'), |
|
42 | + new CensusColumnReligion($this, 'Trossamfund', 'Trossamfund (Folkekirken eller Navnet paa det Trossamfund, man tilhører, eller „uden for Trossamfund“).'), |
|
43 | + new CensusColumnBirthPlace($this, 'Fødested', 'Fødested 1) Indenlandsk Fødested: Kebstadens, Handelspladsens eller Sogneta og Amtets Navn (kan Amtet ikke angives, sættes vedkommende Landsdel, f. Eks. Fyn, Jlland osv.), 2) Fedt i Bilandene eller Udlandet: Landets Navn.'), |
|
44 | + new CensusColumnNull($this, '', ''), |
|
45 | + new CensusColumnNull($this, '', ''), |
|
46 | + new CensusColumnRelationToHead($this, 'Stilling i familien', 'Stilling i Familien (Husfader, Husmoder, Barn, Slangtning o.l., Tjenestetyende (naar vedkommende har Skudsmaalsbog), Pensioner, logerende.'), |
|
47 | + new CensusColumnOccupation($this, 'Erhverv', ''), |
|
48 | + new CensusColumnNull($this, '', ''), |
|
49 | + new CensusColumnNull($this, '', ''), |
|
50 | + new CensusColumnNull($this, '', ''), |
|
51 | + new CensusColumnNull($this, '', ''), |
|
52 | + new CensusColumnNull($this, '', ''), |
|
53 | + new CensusColumnNull($this, '', ''), |
|
54 | + new CensusColumnNull($this, 'Anmærkninger', 'Anmærkninger.'), |
|
55 | + ); |
|
56 | + } |
|
57 | 57 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfDenmark1901 extends CensusOfDenmark implements CensusInterface { |
|
21 | +class CensusOfDenmark1901 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 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, 'Navn', 'Samtlige Personers Navn (ogsaa Fornavn). Ved Børn, endnu uden Navn, sættes „Dreng“ eller „Pige“.'), |
39 | 42 | new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M.) eller Kvindekøn (Kv.).'), |
@@ -19,27 +19,27 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfDeutschland 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 CensusOfDeutschland1819(), |
|
30 | - new CensusOfDeutschland1867(), |
|
31 | - new CensusOfDeutschlandNL1867(), |
|
32 | - new CensusOfDeutschland1900(), |
|
33 | - new CensusOfDeutschland1919(), |
|
34 | - ); |
|
35 | - } |
|
22 | + /** |
|
23 | + * All available censuses for this census place. |
|
24 | + * |
|
25 | + * @return CensusInterface[] |
|
26 | + */ |
|
27 | + public function allCensusDates() { |
|
28 | + return array( |
|
29 | + new CensusOfDeutschland1819(), |
|
30 | + new CensusOfDeutschland1867(), |
|
31 | + new CensusOfDeutschlandNL1867(), |
|
32 | + new CensusOfDeutschland1900(), |
|
33 | + new CensusOfDeutschland1919(), |
|
34 | + ); |
|
35 | + } |
|
36 | 36 | |
37 | - /** |
|
38 | - * Where did this census occur, in GEDCOM format. |
|
39 | - * |
|
40 | - * @return string |
|
41 | - */ |
|
42 | - public function censusPlace() { |
|
43 | - return 'Deutschland'; |
|
44 | - } |
|
37 | + /** |
|
38 | + * Where did this census occur, in GEDCOM format. |
|
39 | + * |
|
40 | + * @return string |
|
41 | + */ |
|
42 | + public function censusPlace() { |
|
43 | + return 'Deutschland'; |
|
44 | + } |
|
45 | 45 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfDeutschland extends Census implements CensusPlaceInterface { |
|
21 | +class CensusOfDeutschland 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 CensusOfDeutschland1819(), |
30 | 32 | new CensusOfDeutschland1867(), |
@@ -39,7 +41,8 @@ discard block |
||
39 | 41 | * |
40 | 42 | * @return string |
41 | 43 | */ |
42 | - public function censusPlace() { |
|
44 | + public function censusPlace() |
|
45 | + { |
|
43 | 46 | return 'Deutschland'; |
44 | 47 | } |
45 | 48 | } |
@@ -19,55 +19,55 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfUnitedStates1820 extends CensusOfUnitedStates implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '07 AUG 1820'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '07 AUG 1820'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * The columns of the census. |
|
33 | - * |
|
34 | - * @return CensusColumnInterface[] |
|
35 | - */ |
|
31 | + /** |
|
32 | + * The columns of the census. |
|
33 | + * |
|
34 | + * @return CensusColumnInterface[] |
|
35 | + */ |
|
36 | 36 | |
37 | - public function columns() { |
|
38 | - return array( |
|
39 | - new CensusColumnFullName($this, 'Name', 'Name of head of family'), |
|
40 | - new CensusColumnNull($this, 'M0-10', 'Free white males 0-10 years'), |
|
41 | - new CensusColumnNull($this, 'M10-16', 'Free white males 10-16 years'), |
|
42 | - new CensusColumnNull($this, 'M16-18', 'Free white males 16-18 years'), |
|
43 | - new CensusColumnNull($this, 'M16-26', 'Free white males 16-26 years'), |
|
44 | - new CensusColumnNull($this, 'M26-45', 'Free white males 26-45 years'), |
|
45 | - new CensusColumnNull($this, 'M45+', 'Free white males 45+ years'), |
|
46 | - new CensusColumnNull($this, 'F0-10', 'Free white females 0-10 years'), |
|
47 | - new CensusColumnNull($this, 'F10-16', 'Free white females 10-16 years'), |
|
48 | - new CensusColumnNull($this, 'F16-26', 'Free white females 16-26 years'), |
|
49 | - new CensusColumnNull($this, 'F26-45', 'Free white females 26-45 years'), |
|
50 | - new CensusColumnNull($this, 'F45+', 'Free white females 45+ years'), |
|
51 | - new CensusColumnNull($this, 'FNR', 'Foreigners not naturalized'), |
|
52 | - new CensusColumnNull($this, 'AG', 'No. engaged in agriculture'), |
|
53 | - new CensusColumnNull($this, 'COM', 'No. engaged in commerce'), |
|
54 | - new CensusColumnNull($this, 'MNF', 'No. engaged in manufactures'), |
|
55 | - new CensusColumnNull($this, 'M0', 'Slave males 0-14 years'), |
|
56 | - new CensusColumnNull($this, 'M14', 'Slave males 14-26 years'), |
|
57 | - new CensusColumnNull($this, 'M26', 'Slave males 26-45 years'), |
|
58 | - new CensusColumnNull($this, 'M45', 'Slave males 45+ years'), |
|
59 | - new CensusColumnNull($this, 'F0', 'Slave females 0-14 years'), |
|
60 | - new CensusColumnNull($this, 'F14', 'Slave females 14-26 years'), |
|
61 | - new CensusColumnNull($this, 'F26', 'Slave females 26-45 years'), |
|
62 | - new CensusColumnNull($this, 'F45', 'Slave females 45+ years'), |
|
63 | - new CensusColumnNull($this, 'M0', 'Free colored males 0-14 years'), |
|
64 | - new CensusColumnNull($this, 'M14', 'Free colored males 14-26 years'), |
|
65 | - new CensusColumnNull($this, 'M26', 'Free colored males 26-45 years'), |
|
66 | - new CensusColumnNull($this, 'M45', 'Free colored males 45+ years'), |
|
67 | - new CensusColumnNull($this, 'F0', 'Free colored females 0-14 years'), |
|
68 | - new CensusColumnNull($this, 'F14', 'Free colored females 14-26 years'), |
|
69 | - new CensusColumnNull($this, 'F26', 'Free colored females 26-45 years'), |
|
70 | - new CensusColumnNull($this, 'F45', 'Free colored females 45+ years'), |
|
71 | - ); |
|
72 | - } |
|
37 | + public function columns() { |
|
38 | + return array( |
|
39 | + new CensusColumnFullName($this, 'Name', 'Name of head of family'), |
|
40 | + new CensusColumnNull($this, 'M0-10', 'Free white males 0-10 years'), |
|
41 | + new CensusColumnNull($this, 'M10-16', 'Free white males 10-16 years'), |
|
42 | + new CensusColumnNull($this, 'M16-18', 'Free white males 16-18 years'), |
|
43 | + new CensusColumnNull($this, 'M16-26', 'Free white males 16-26 years'), |
|
44 | + new CensusColumnNull($this, 'M26-45', 'Free white males 26-45 years'), |
|
45 | + new CensusColumnNull($this, 'M45+', 'Free white males 45+ years'), |
|
46 | + new CensusColumnNull($this, 'F0-10', 'Free white females 0-10 years'), |
|
47 | + new CensusColumnNull($this, 'F10-16', 'Free white females 10-16 years'), |
|
48 | + new CensusColumnNull($this, 'F16-26', 'Free white females 16-26 years'), |
|
49 | + new CensusColumnNull($this, 'F26-45', 'Free white females 26-45 years'), |
|
50 | + new CensusColumnNull($this, 'F45+', 'Free white females 45+ years'), |
|
51 | + new CensusColumnNull($this, 'FNR', 'Foreigners not naturalized'), |
|
52 | + new CensusColumnNull($this, 'AG', 'No. engaged in agriculture'), |
|
53 | + new CensusColumnNull($this, 'COM', 'No. engaged in commerce'), |
|
54 | + new CensusColumnNull($this, 'MNF', 'No. engaged in manufactures'), |
|
55 | + new CensusColumnNull($this, 'M0', 'Slave males 0-14 years'), |
|
56 | + new CensusColumnNull($this, 'M14', 'Slave males 14-26 years'), |
|
57 | + new CensusColumnNull($this, 'M26', 'Slave males 26-45 years'), |
|
58 | + new CensusColumnNull($this, 'M45', 'Slave males 45+ years'), |
|
59 | + new CensusColumnNull($this, 'F0', 'Slave females 0-14 years'), |
|
60 | + new CensusColumnNull($this, 'F14', 'Slave females 14-26 years'), |
|
61 | + new CensusColumnNull($this, 'F26', 'Slave females 26-45 years'), |
|
62 | + new CensusColumnNull($this, 'F45', 'Slave females 45+ years'), |
|
63 | + new CensusColumnNull($this, 'M0', 'Free colored males 0-14 years'), |
|
64 | + new CensusColumnNull($this, 'M14', 'Free colored males 14-26 years'), |
|
65 | + new CensusColumnNull($this, 'M26', 'Free colored males 26-45 years'), |
|
66 | + new CensusColumnNull($this, 'M45', 'Free colored males 45+ years'), |
|
67 | + new CensusColumnNull($this, 'F0', 'Free colored females 0-14 years'), |
|
68 | + new CensusColumnNull($this, 'F14', 'Free colored females 14-26 years'), |
|
69 | + new CensusColumnNull($this, 'F26', 'Free colored females 26-45 years'), |
|
70 | + new CensusColumnNull($this, 'F45', 'Free colored females 45+ years'), |
|
71 | + ); |
|
72 | + } |
|
73 | 73 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfUnitedStates1820 extends CensusOfUnitedStates implements CensusInterface { |
|
21 | +class CensusOfUnitedStates1820 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 '07 AUG 1820'; |
29 | 31 | } |
30 | 32 | |
@@ -34,7 +36,8 @@ discard block |
||
34 | 36 | * @return CensusColumnInterface[] |
35 | 37 | */ |
36 | 38 | |
37 | - public function columns() { |
|
39 | + public function columns() |
|
40 | + { |
|
38 | 41 | return array( |
39 | 42 | new CensusColumnFullName($this, 'Name', 'Name of head of family'), |
40 | 43 | new CensusColumnNull($this, 'M0-10', 'Free white males 0-10 years'), |
@@ -19,39 +19,39 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfWales1911 extends CensusOfWales implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '02 APR 1911'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '02 APR 1911'; |
|
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 CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), |
|
41 | - new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), |
|
42 | - new CensusColumnConditionEnglish($this, 'Condition', 'Condition'), |
|
43 | - new CensusColumnYearsMarried($this, 'YrM', 'Years married'), |
|
44 | - new CensusColumnChildrenBornAlive($this, 'ChA', 'Children born alive'), |
|
45 | - new CensusColumnChildrenLiving($this, 'ChL', 'Children who are still alive'), |
|
46 | - new CensusColumnChildrenDied($this, 'ChD', 'Children who have died'), |
|
47 | - new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), |
|
48 | - new CensusColumnNull($this, 'Ind', 'Industry'), |
|
49 | - new CensusColumnNull($this, 'Emp', 'Employer, worker or own account'), |
|
50 | - new CensusColumnNull($this, 'Home', 'Working at home'), |
|
51 | - new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), |
|
52 | - new CensusColumnNationality($this, 'Nat', 'Nationality'), |
|
53 | - new CensusColumnNull($this, 'Infirm', 'Infirmity'), |
|
54 | - new CensusColumnNull($this, 'Lang', 'Language spoken'), |
|
55 | - ); |
|
56 | - } |
|
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 CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), |
|
41 | + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), |
|
42 | + new CensusColumnConditionEnglish($this, 'Condition', 'Condition'), |
|
43 | + new CensusColumnYearsMarried($this, 'YrM', 'Years married'), |
|
44 | + new CensusColumnChildrenBornAlive($this, 'ChA', 'Children born alive'), |
|
45 | + new CensusColumnChildrenLiving($this, 'ChL', 'Children who are still alive'), |
|
46 | + new CensusColumnChildrenDied($this, 'ChD', 'Children who have died'), |
|
47 | + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), |
|
48 | + new CensusColumnNull($this, 'Ind', 'Industry'), |
|
49 | + new CensusColumnNull($this, 'Emp', 'Employer, worker or own account'), |
|
50 | + new CensusColumnNull($this, 'Home', 'Working at home'), |
|
51 | + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), |
|
52 | + new CensusColumnNationality($this, 'Nat', 'Nationality'), |
|
53 | + new CensusColumnNull($this, 'Infirm', 'Infirmity'), |
|
54 | + new CensusColumnNull($this, 'Lang', 'Language spoken'), |
|
55 | + ); |
|
56 | + } |
|
57 | 57 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfWales1911 extends CensusOfWales implements CensusInterface { |
|
21 | +class CensusOfWales1911 extends CensusOfWales 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 '02 APR 1911'; |
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'), |