@@ -19,26 +19,26 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfDenmark1840 extends CensusOfDenmark implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '01 FEB 1840'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '01 FEB 1840'; |
|
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 | } |
@@ -19,36 +19,36 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfCzechRepublic1880 extends CensusOfCzechRepublic implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '31 DEC 1880'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '31 DEC 1880'; |
|
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 CensusColumnSexMZ($this, 'Pohlaví', ''), |
|
40 | - new CensusColumnRelationToHead($this, 'Vztah', ''), |
|
41 | - new CensusColumnBirthDaySlashMonthYear($this, 'Narození', 'Datum narození'), |
|
42 | - new CensusColumnBirthPlace($this, 'Místo', 'Místo narození'), |
|
43 | - new CensusColumnNull($this, 'Přísluší', 'Domovské právo'), |
|
44 | - new CensusColumnReligion($this, 'Vyznání', ''), |
|
45 | - new CensusColumnNull($this, 'Stav', 'Rodinný stav'), |
|
46 | - new CensusColumnNull($this, 'Jazyk', 'Jazyk v obcová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 CensusColumnSexMZ($this, 'Pohlaví', ''), |
|
40 | + new CensusColumnRelationToHead($this, 'Vztah', ''), |
|
41 | + new CensusColumnBirthDaySlashMonthYear($this, 'Narození', 'Datum narození'), |
|
42 | + new CensusColumnBirthPlace($this, 'Místo', 'Místo narození'), |
|
43 | + new CensusColumnNull($this, 'Přísluší', 'Domovské právo'), |
|
44 | + new CensusColumnReligion($this, 'Vyznání', ''), |
|
45 | + new CensusColumnNull($this, 'Stav', 'Rodinný stav'), |
|
46 | + new CensusColumnNull($this, 'Jazyk', 'Jazyk v obcová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 | } |
@@ -21,27 +21,27 @@ |
||
21 | 21 | * The individual's birth place. |
22 | 22 | */ |
23 | 23 | class CensusColumnBirthPlace 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 = $individual->getBirthPlace(); |
|
34 | - $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 = $individual->getBirthPlace(); |
|
34 | + $census_place = $this->place(); |
|
35 | 35 | |
36 | - // Ignore the census country |
|
37 | - if ($birth_place === $census_place) { |
|
38 | - return ''; |
|
39 | - } |
|
36 | + // Ignore the census country |
|
37 | + if ($birth_place === $census_place) { |
|
38 | + return ''; |
|
39 | + } |
|
40 | 40 | |
41 | - if (substr($birth_place, -strlen($census_place) - 2) === ', ' . $census_place) { |
|
42 | - return substr($birth_place, 0, -strlen($census_place) - 2); |
|
43 | - } else { |
|
44 | - return $birth_place; |
|
45 | - } |
|
46 | - } |
|
41 | + if (substr($birth_place, -strlen($census_place) - 2) === ', ' . $census_place) { |
|
42 | + return substr($birth_place, 0, -strlen($census_place) - 2); |
|
43 | + } else { |
|
44 | + return $birth_place; |
|
45 | + } |
|
46 | + } |
|
47 | 47 | } |
@@ -19,39 +19,39 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfScotland1911 extends CensusOfScotland 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 CensusColumnNull($this, 'Lang', 'Language spoken'), |
|
43 | - new CensusColumnConditionEnglish($this, 'Condition', 'Condition'), |
|
44 | - new CensusColumnYearsMarried($this, 'YrM', 'Years married'), |
|
45 | - new CensusColumnChildrenBornAlive($this, 'ChA', 'Children born alive'), |
|
46 | - new CensusColumnChildrenLiving($this, 'ChL', 'Children who are still alive'), |
|
47 | - new CensusColumnChildrenDied($this, 'ChD', 'Children who have died'), |
|
48 | - new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), |
|
49 | - new CensusColumnNull($this, 'Ind', 'Industry'), |
|
50 | - new CensusColumnNull($this, 'Emp', 'Employer, worker or own account'), |
|
51 | - new CensusColumnNull($this, 'Home', 'Working at home'), |
|
52 | - new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), |
|
53 | - new CensusColumnNationality($this, 'Nat', 'Nationality'), |
|
54 | - new CensusColumnNull($this, 'Infirm', 'Infirmity'), |
|
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 CensusColumnNull($this, 'Lang', 'Language spoken'), |
|
43 | + new CensusColumnConditionEnglish($this, 'Condition', 'Condition'), |
|
44 | + new CensusColumnYearsMarried($this, 'YrM', 'Years married'), |
|
45 | + new CensusColumnChildrenBornAlive($this, 'ChA', 'Children born alive'), |
|
46 | + new CensusColumnChildrenLiving($this, 'ChL', 'Children who are still alive'), |
|
47 | + new CensusColumnChildrenDied($this, 'ChD', 'Children who have died'), |
|
48 | + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), |
|
49 | + new CensusColumnNull($this, 'Ind', 'Industry'), |
|
50 | + new CensusColumnNull($this, 'Emp', 'Employer, worker or own account'), |
|
51 | + new CensusColumnNull($this, 'Home', 'Working at home'), |
|
52 | + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), |
|
53 | + new CensusColumnNationality($this, 'Nat', 'Nationality'), |
|
54 | + new CensusColumnNull($this, 'Infirm', 'Infirmity'), |
|
55 | + ); |
|
56 | + } |
|
57 | 57 | } |
@@ -19,17 +19,17 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | interface CensusPlaceInterface { |
22 | - /** |
|
23 | - * All available censuses for this census place. |
|
24 | - * |
|
25 | - * @return CensusInterface[] |
|
26 | - */ |
|
27 | - public function allCensusDates(); |
|
22 | + /** |
|
23 | + * All available censuses for this census place. |
|
24 | + * |
|
25 | + * @return CensusInterface[] |
|
26 | + */ |
|
27 | + public function allCensusDates(); |
|
28 | 28 | |
29 | - /** |
|
30 | - * Where did this census occur, in GEDCOM format. |
|
31 | - * |
|
32 | - * @return string |
|
33 | - */ |
|
34 | - public function censusPlace(); |
|
29 | + /** |
|
30 | + * Where did this census occur, in GEDCOM format. |
|
31 | + * |
|
32 | + * @return string |
|
33 | + */ |
|
34 | + public function censusPlace(); |
|
35 | 35 | } |
@@ -19,34 +19,34 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfUnitedStates1860 extends CensusOfUnitedStates implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return 'BET JUN 1860 AND OCT 1860'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return 'BET JUN 1860 AND OCT 1860'; |
|
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 CensusColumnAge($this, 'Age', 'Age'), |
|
40 | - new CensusColumnSexMF($this, 'Sex', 'Sex'), |
|
41 | - new CensusColumnNull($this, 'Color', 'White, black, or mulatto'), |
|
42 | - new CensusColumnOccupation($this, 'Occupation', 'Profession, occupation, or trade'), |
|
43 | - new CensusColumnNull($this, 'RE', 'Value of real estate owned'), |
|
44 | - new CensusColumnNull($this, 'PE', 'Value of personal estate owned'), |
|
45 | - new CensusColumnBirthPlaceSimple($this, 'Birthplace', 'Place of birth, naming the state, territory, or country'), |
|
46 | - new CensusColumnMarriedWithinYear($this, 'Mar', 'Married within the year'), |
|
47 | - new CensusColumnNull($this, 'School', 'Attended school within the year'), |
|
48 | - new CensusColumnNull($this, 'R+W', 'Persons over 20 years of age who cannot read and write'), |
|
49 | - new CensusColumnNull($this, 'Infirm', 'Whether deaf and dumb, blind, insane, idiotic, pauper or convict'), |
|
50 | - ); |
|
51 | - } |
|
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 CensusColumnAge($this, 'Age', 'Age'), |
|
40 | + new CensusColumnSexMF($this, 'Sex', 'Sex'), |
|
41 | + new CensusColumnNull($this, 'Color', 'White, black, or mulatto'), |
|
42 | + new CensusColumnOccupation($this, 'Occupation', 'Profession, occupation, or trade'), |
|
43 | + new CensusColumnNull($this, 'RE', 'Value of real estate owned'), |
|
44 | + new CensusColumnNull($this, 'PE', 'Value of personal estate owned'), |
|
45 | + new CensusColumnBirthPlaceSimple($this, 'Birthplace', 'Place of birth, naming the state, territory, or country'), |
|
46 | + new CensusColumnMarriedWithinYear($this, 'Mar', 'Married within the year'), |
|
47 | + new CensusColumnNull($this, 'School', 'Attended school within the year'), |
|
48 | + new CensusColumnNull($this, 'R+W', 'Persons over 20 years of age who cannot read and write'), |
|
49 | + new CensusColumnNull($this, 'Infirm', 'Whether deaf and dumb, blind, insane, idiotic, pauper or convict'), |
|
50 | + ); |
|
51 | + } |
|
52 | 52 | } |
@@ -21,21 +21,21 @@ |
||
21 | 21 | * Is the individual's mother a foreigner. |
22 | 22 | */ |
23 | 23 | class CensusColumnMotherForeign 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 | - $mother = $this->mother($individual); |
|
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 | + $mother = $this->mother($individual); |
|
34 | 34 | |
35 | - if ($mother && $this->lastPartOfPlace($mother->getBirthPlace()) !== $this->place()) { |
|
36 | - return 'Y'; |
|
37 | - } else { |
|
38 | - return ''; |
|
39 | - } |
|
40 | - } |
|
35 | + if ($mother && $this->lastPartOfPlace($mother->getBirthPlace()) !== $this->place()) { |
|
36 | + return 'Y'; |
|
37 | + } else { |
|
38 | + return ''; |
|
39 | + } |
|
40 | + } |
|
41 | 41 | } |
@@ -21,19 +21,19 @@ |
||
21 | 21 | * The individual's occupation. |
22 | 22 | */ |
23 | 23 | class CensusColumnOccupation 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 | - foreach ($individual->getFacts('OCCU') as $fact) { |
|
34 | - return $fact->getValue(); |
|
35 | - } |
|
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 | + foreach ($individual->getFacts('OCCU') as $fact) { |
|
34 | + return $fact->getValue(); |
|
35 | + } |
|
36 | 36 | |
37 | - return ''; |
|
38 | - } |
|
37 | + return ''; |
|
38 | + } |
|
39 | 39 | } |
@@ -19,30 +19,30 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfWales1861 extends CensusOfWales implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '07 APR 1861'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '07 APR 1861'; |
|
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 CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), |
|
45 | - new CensusColumnNull($this, 'Infirm', 'Whether blind or deaf-and-dumb'), |
|
46 | - ); |
|
47 | - } |
|
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 CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), |
|
45 | + new CensusColumnNull($this, 'Infirm', 'Whether blind or deaf-and-dumb'), |
|
46 | + ); |
|
47 | + } |
|
48 | 48 | } |