@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | public static function parse(\PhpGedcom\Parser $parser) |
29 | 29 | { |
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | - $depth = (int)$record[0]; |
|
31 | + $depth = (int) $record[0]; |
|
32 | 32 | |
33 | 33 | $parser->forward(); |
34 | 34 | |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | while (!$parser->eof()) { |
38 | 38 | $record = $parser->getCurrentLineRecord(); |
39 | 39 | $recordType = trim($record[1]); |
40 | - $currentDepth = (int)$record[0]; |
|
40 | + $currentDepth = (int) $record[0]; |
|
41 | 41 | |
42 | 42 | if ($currentDepth <= $depth) { |
43 | 43 | $parser->back(); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | } |
59 | 59 | break; |
60 | 60 | default: |
61 | - $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
61 | + $parser->logUnhandledRecord(get_class().' @ '.__LINE__); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | $parser->forward(); |
@@ -30,11 +30,11 @@ |
||
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[2])){ |
33 | - $identifier = $parser->normalizeIdentifier($record[2]); |
|
33 | + $identifier = $parser->normalizeIdentifier($record[2]); |
|
34 | 34 | } |
35 | 35 | else{ |
36 | - $parser->skipToNextLevel($depth); |
|
37 | - return null; |
|
36 | + $parser->skipToNextLevel($depth); |
|
37 | + return null; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | $repo = new \PhpGedcom\Record\RepoRef(); |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | public static function parse(\PhpGedcom\Parser $parser) |
29 | 29 | { |
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | - $depth = (int)$record[0]; |
|
32 | - if(isset($record[2])){ |
|
31 | + $depth = (int) $record[0]; |
|
32 | + if (isset($record[2])) { |
|
33 | 33 | $identifier = $parser->normalizeIdentifier($record[2]); |
34 | 34 | } |
35 | - else{ |
|
35 | + else { |
|
36 | 36 | $parser->skipToNextLevel($depth); |
37 | 37 | return null; |
38 | 38 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | |
45 | 45 | while (!$parser->eof()) { |
46 | 46 | $record = $parser->getCurrentLineRecord(); |
47 | - $currentDepth = (int)$record[0]; |
|
47 | + $currentDepth = (int) $record[0]; |
|
48 | 48 | $recordType = strtoupper(trim($record[1])); |
49 | 49 | |
50 | 50 | if ($currentDepth <= $depth) { |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | } |
64 | 64 | break; |
65 | 65 | default: |
66 | - $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
66 | + $parser->logUnhandledRecord(get_class().' @ '.__LINE__); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | $parser->forward(); |
@@ -31,8 +31,7 @@ |
||
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[2])){ |
33 | 33 | $identifier = $parser->normalizeIdentifier($record[2]); |
34 | - } |
|
35 | - else{ |
|
34 | + } else{ |
|
36 | 35 | $parser->skipToNextLevel($depth); |
37 | 36 | return null; |
38 | 37 | } |
@@ -19,175 +19,175 @@ |
||
19 | 19 | * |
20 | 20 | */ |
21 | 21 | class Indi extends \PhpGedcom\Parser\Component { |
22 | - /** |
|
23 | - * |
|
24 | - * |
|
25 | - */ |
|
26 | - public static function parse(\PhpGedcom\Parser $parser) { |
|
27 | - $record = $parser->getCurrentLineRecord(); |
|
28 | - $depth = (int) $record[0]; |
|
29 | - if (isset($record[1])) { |
|
30 | - $identifier = $parser->normalizeIdentifier($record[1]); |
|
31 | - } else { |
|
32 | - $parser->skipToNextLevel($depth); |
|
33 | - return null; |
|
34 | - } |
|
22 | + /** |
|
23 | + * |
|
24 | + * |
|
25 | + */ |
|
26 | + public static function parse(\PhpGedcom\Parser $parser) { |
|
27 | + $record = $parser->getCurrentLineRecord(); |
|
28 | + $depth = (int) $record[0]; |
|
29 | + if (isset($record[1])) { |
|
30 | + $identifier = $parser->normalizeIdentifier($record[1]); |
|
31 | + } else { |
|
32 | + $parser->skipToNextLevel($depth); |
|
33 | + return null; |
|
34 | + } |
|
35 | 35 | |
36 | - $indi = new \PhpGedcom\Record\Indi(); |
|
37 | - $indi->setId($identifier); |
|
36 | + $indi = new \PhpGedcom\Record\Indi(); |
|
37 | + $indi->setId($identifier); |
|
38 | 38 | |
39 | - $parser->getGedcom()->addIndi($indi); |
|
39 | + $parser->getGedcom()->addIndi($indi); |
|
40 | 40 | |
41 | - $parser->forward(); |
|
41 | + $parser->forward(); |
|
42 | 42 | |
43 | - while (!$parser->eof()) { |
|
44 | - $record = $parser->getCurrentLineRecord(); |
|
45 | - $recordType = strtoupper(trim($record[1])); |
|
46 | - $currentDepth = (int) $record[0]; |
|
43 | + while (!$parser->eof()) { |
|
44 | + $record = $parser->getCurrentLineRecord(); |
|
45 | + $recordType = strtoupper(trim($record[1])); |
|
46 | + $currentDepth = (int) $record[0]; |
|
47 | 47 | |
48 | - if ($currentDepth <= $depth) { |
|
49 | - $parser->back(); |
|
50 | - break; |
|
51 | - } |
|
48 | + if ($currentDepth <= $depth) { |
|
49 | + $parser->back(); |
|
50 | + break; |
|
51 | + } |
|
52 | 52 | |
53 | - switch ($recordType) { |
|
54 | - case '_UID': |
|
55 | - $indi->setUid(trim($record[2])); |
|
56 | - break; |
|
57 | - case 'RESN': |
|
58 | - $indi->setResn(trim($record[2])); |
|
59 | - break; |
|
60 | - case 'NAME': |
|
61 | - $name = \PhpGedcom\Parser\Indi\Name::parse($parser); |
|
62 | - $indi->addName($name); |
|
63 | - break; |
|
64 | - case 'SEX': |
|
65 | - $indi->setSex(isset($record[2]) ? trim($record[2]) : ''); |
|
66 | - break; |
|
67 | - case 'ADOP': |
|
68 | - case 'BIRT': |
|
69 | - case 'BAPM': |
|
70 | - case 'BARM': |
|
71 | - case 'BASM': |
|
72 | - case 'BLES': |
|
73 | - case 'BURI': |
|
74 | - case 'CENS': |
|
75 | - case 'CHR': |
|
76 | - case 'CHRA': |
|
77 | - case 'CONF': |
|
78 | - case 'CREM': |
|
79 | - case 'DEAT': |
|
80 | - case 'EMIG': |
|
81 | - case 'FCOM': |
|
82 | - case 'GRAD': |
|
83 | - case 'IMMI': |
|
84 | - case 'NATU': |
|
85 | - case 'ORDN': |
|
86 | - case 'RETI': |
|
87 | - case 'PROB': |
|
88 | - case 'WILL': |
|
89 | - case 'EVEN': |
|
90 | - $className = ucfirst(strtolower($recordType)); |
|
91 | - $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
53 | + switch ($recordType) { |
|
54 | + case '_UID': |
|
55 | + $indi->setUid(trim($record[2])); |
|
56 | + break; |
|
57 | + case 'RESN': |
|
58 | + $indi->setResn(trim($record[2])); |
|
59 | + break; |
|
60 | + case 'NAME': |
|
61 | + $name = \PhpGedcom\Parser\Indi\Name::parse($parser); |
|
62 | + $indi->addName($name); |
|
63 | + break; |
|
64 | + case 'SEX': |
|
65 | + $indi->setSex(isset($record[2]) ? trim($record[2]) : ''); |
|
66 | + break; |
|
67 | + case 'ADOP': |
|
68 | + case 'BIRT': |
|
69 | + case 'BAPM': |
|
70 | + case 'BARM': |
|
71 | + case 'BASM': |
|
72 | + case 'BLES': |
|
73 | + case 'BURI': |
|
74 | + case 'CENS': |
|
75 | + case 'CHR': |
|
76 | + case 'CHRA': |
|
77 | + case 'CONF': |
|
78 | + case 'CREM': |
|
79 | + case 'DEAT': |
|
80 | + case 'EMIG': |
|
81 | + case 'FCOM': |
|
82 | + case 'GRAD': |
|
83 | + case 'IMMI': |
|
84 | + case 'NATU': |
|
85 | + case 'ORDN': |
|
86 | + case 'RETI': |
|
87 | + case 'PROB': |
|
88 | + case 'WILL': |
|
89 | + case 'EVEN': |
|
90 | + $className = ucfirst(strtolower($recordType)); |
|
91 | + $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
92 | 92 | |
93 | - $event = $class::parse($parser); |
|
94 | - $indi->addEven($event); |
|
95 | - break; |
|
96 | - case 'CAST': |
|
97 | - case 'DSCR': |
|
98 | - case 'EDUC': |
|
99 | - case 'IDNO': |
|
100 | - case 'NATI': |
|
101 | - case 'NCHI': |
|
102 | - case 'NMR': |
|
103 | - case 'OCCU': |
|
104 | - case 'PROP': |
|
105 | - case 'RELI': |
|
106 | - case 'RESI': |
|
107 | - case 'SSN': |
|
108 | - case 'TITL': |
|
109 | - $className = ucfirst(strtolower($recordType)); |
|
110 | - $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
93 | + $event = $class::parse($parser); |
|
94 | + $indi->addEven($event); |
|
95 | + break; |
|
96 | + case 'CAST': |
|
97 | + case 'DSCR': |
|
98 | + case 'EDUC': |
|
99 | + case 'IDNO': |
|
100 | + case 'NATI': |
|
101 | + case 'NCHI': |
|
102 | + case 'NMR': |
|
103 | + case 'OCCU': |
|
104 | + case 'PROP': |
|
105 | + case 'RELI': |
|
106 | + case 'RESI': |
|
107 | + case 'SSN': |
|
108 | + case 'TITL': |
|
109 | + $className = ucfirst(strtolower($recordType)); |
|
110 | + $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
111 | 111 | |
112 | - $att = $class::parse($parser); |
|
113 | - $indi->addAttr($att); |
|
114 | - break; |
|
115 | - case 'BAPL': |
|
116 | - case 'CONL': |
|
117 | - case 'ENDL': |
|
118 | - case 'SLGC': |
|
119 | - $className = ucfirst(strtolower($recordType)); |
|
120 | - $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
112 | + $att = $class::parse($parser); |
|
113 | + $indi->addAttr($att); |
|
114 | + break; |
|
115 | + case 'BAPL': |
|
116 | + case 'CONL': |
|
117 | + case 'ENDL': |
|
118 | + case 'SLGC': |
|
119 | + $className = ucfirst(strtolower($recordType)); |
|
120 | + $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
121 | 121 | |
122 | - $lds = $class::parse($parser); |
|
123 | - $indi->{'add' . $recordType}[] = $lds; |
|
124 | - break; |
|
125 | - case 'FAMC': |
|
126 | - $famc = \PhpGedcom\Parser\Indi\Famc::parse($parser); |
|
127 | - if ($famc) { |
|
128 | - $indi->addFamc($famc); |
|
129 | - } |
|
130 | - break; |
|
131 | - case 'FAMS': |
|
132 | - $fams = \PhpGedcom\Parser\Indi\Fams::parse($parser); |
|
133 | - if ($fams) { |
|
134 | - $indi->addFams($fams); |
|
135 | - } |
|
136 | - break; |
|
137 | - case 'SUBM': |
|
138 | - $indi->addSubm($parser->normalizeIdentifier($record[2])); |
|
139 | - break; |
|
140 | - case 'ASSO': |
|
141 | - $asso = \PhpGedcom\Parser\Indi\Asso::parse($parser); |
|
142 | - $indi->addAsso($asso); |
|
143 | - break; |
|
144 | - case 'ALIA': |
|
145 | - $indi->addAlia($parser->normalizeIdentifier($record[2])); |
|
146 | - break; |
|
147 | - case 'ANCI': |
|
148 | - $indi->addAnci($parser->normalizeIdentifier($record[2])); |
|
149 | - break; |
|
150 | - case 'DESI': |
|
151 | - $indi->addDesi($parser->normalizeIdentifier($record[2])); |
|
152 | - break; |
|
153 | - case 'RFN': |
|
154 | - $indi->setRfn(trim($record[2])); |
|
155 | - break; |
|
156 | - case 'AFN': |
|
157 | - $indi->setAfn(trim($record[2])); |
|
158 | - break; |
|
159 | - case 'REFN': |
|
160 | - $ref = \PhpGedcom\Parser\Refn::parse($parser); |
|
161 | - $indi->addRefn($ref); |
|
162 | - break; |
|
163 | - case 'RIN': |
|
164 | - $indi->setRin(trim($record[2])); |
|
165 | - break; |
|
166 | - case 'CHAN': |
|
167 | - $chan = \PhpGedcom\Parser\Chan::parse($parser); |
|
168 | - $indi->setChan($chan); |
|
169 | - break; |
|
170 | - case 'NOTE': |
|
171 | - $note = \PhpGedcom\Parser\NoteRef::parse($parser); |
|
172 | - if ($note) { |
|
173 | - $indi->addNote($note); |
|
174 | - } |
|
175 | - break; |
|
176 | - case 'SOUR': |
|
177 | - $sour = \PhpGedcom\Parser\SourRef::parse($parser); |
|
178 | - $indi->addSour($sour); |
|
179 | - break; |
|
180 | - case 'OBJE': |
|
181 | - $obje = \PhpGedcom\Parser\ObjeRef::parse($parser); |
|
182 | - $indi->addObje($obje); |
|
183 | - break; |
|
184 | - default: |
|
185 | - $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
186 | - } |
|
122 | + $lds = $class::parse($parser); |
|
123 | + $indi->{'add' . $recordType}[] = $lds; |
|
124 | + break; |
|
125 | + case 'FAMC': |
|
126 | + $famc = \PhpGedcom\Parser\Indi\Famc::parse($parser); |
|
127 | + if ($famc) { |
|
128 | + $indi->addFamc($famc); |
|
129 | + } |
|
130 | + break; |
|
131 | + case 'FAMS': |
|
132 | + $fams = \PhpGedcom\Parser\Indi\Fams::parse($parser); |
|
133 | + if ($fams) { |
|
134 | + $indi->addFams($fams); |
|
135 | + } |
|
136 | + break; |
|
137 | + case 'SUBM': |
|
138 | + $indi->addSubm($parser->normalizeIdentifier($record[2])); |
|
139 | + break; |
|
140 | + case 'ASSO': |
|
141 | + $asso = \PhpGedcom\Parser\Indi\Asso::parse($parser); |
|
142 | + $indi->addAsso($asso); |
|
143 | + break; |
|
144 | + case 'ALIA': |
|
145 | + $indi->addAlia($parser->normalizeIdentifier($record[2])); |
|
146 | + break; |
|
147 | + case 'ANCI': |
|
148 | + $indi->addAnci($parser->normalizeIdentifier($record[2])); |
|
149 | + break; |
|
150 | + case 'DESI': |
|
151 | + $indi->addDesi($parser->normalizeIdentifier($record[2])); |
|
152 | + break; |
|
153 | + case 'RFN': |
|
154 | + $indi->setRfn(trim($record[2])); |
|
155 | + break; |
|
156 | + case 'AFN': |
|
157 | + $indi->setAfn(trim($record[2])); |
|
158 | + break; |
|
159 | + case 'REFN': |
|
160 | + $ref = \PhpGedcom\Parser\Refn::parse($parser); |
|
161 | + $indi->addRefn($ref); |
|
162 | + break; |
|
163 | + case 'RIN': |
|
164 | + $indi->setRin(trim($record[2])); |
|
165 | + break; |
|
166 | + case 'CHAN': |
|
167 | + $chan = \PhpGedcom\Parser\Chan::parse($parser); |
|
168 | + $indi->setChan($chan); |
|
169 | + break; |
|
170 | + case 'NOTE': |
|
171 | + $note = \PhpGedcom\Parser\NoteRef::parse($parser); |
|
172 | + if ($note) { |
|
173 | + $indi->addNote($note); |
|
174 | + } |
|
175 | + break; |
|
176 | + case 'SOUR': |
|
177 | + $sour = \PhpGedcom\Parser\SourRef::parse($parser); |
|
178 | + $indi->addSour($sour); |
|
179 | + break; |
|
180 | + case 'OBJE': |
|
181 | + $obje = \PhpGedcom\Parser\ObjeRef::parse($parser); |
|
182 | + $indi->addObje($obje); |
|
183 | + break; |
|
184 | + default: |
|
185 | + $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
186 | + } |
|
187 | 187 | |
188 | - $parser->forward(); |
|
189 | - } |
|
188 | + $parser->forward(); |
|
189 | + } |
|
190 | 190 | |
191 | - return $indi; |
|
192 | - } |
|
191 | + return $indi; |
|
192 | + } |
|
193 | 193 | } |
@@ -51,138 +51,138 @@ |
||
51 | 51 | } |
52 | 52 | |
53 | 53 | switch ($recordType) { |
54 | - case '_UID': |
|
55 | - $indi->setUid(trim($record[2])); |
|
56 | - break; |
|
57 | - case 'RESN': |
|
58 | - $indi->setResn(trim($record[2])); |
|
59 | - break; |
|
60 | - case 'NAME': |
|
61 | - $name = \PhpGedcom\Parser\Indi\Name::parse($parser); |
|
62 | - $indi->addName($name); |
|
63 | - break; |
|
64 | - case 'SEX': |
|
65 | - $indi->setSex(isset($record[2]) ? trim($record[2]) : ''); |
|
66 | - break; |
|
67 | - case 'ADOP': |
|
68 | - case 'BIRT': |
|
69 | - case 'BAPM': |
|
70 | - case 'BARM': |
|
71 | - case 'BASM': |
|
72 | - case 'BLES': |
|
73 | - case 'BURI': |
|
74 | - case 'CENS': |
|
75 | - case 'CHR': |
|
76 | - case 'CHRA': |
|
77 | - case 'CONF': |
|
78 | - case 'CREM': |
|
79 | - case 'DEAT': |
|
80 | - case 'EMIG': |
|
81 | - case 'FCOM': |
|
82 | - case 'GRAD': |
|
83 | - case 'IMMI': |
|
84 | - case 'NATU': |
|
85 | - case 'ORDN': |
|
86 | - case 'RETI': |
|
87 | - case 'PROB': |
|
88 | - case 'WILL': |
|
89 | - case 'EVEN': |
|
90 | - $className = ucfirst(strtolower($recordType)); |
|
91 | - $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
54 | + case '_UID': |
|
55 | + $indi->setUid(trim($record[2])); |
|
56 | + break; |
|
57 | + case 'RESN': |
|
58 | + $indi->setResn(trim($record[2])); |
|
59 | + break; |
|
60 | + case 'NAME': |
|
61 | + $name = \PhpGedcom\Parser\Indi\Name::parse($parser); |
|
62 | + $indi->addName($name); |
|
63 | + break; |
|
64 | + case 'SEX': |
|
65 | + $indi->setSex(isset($record[2]) ? trim($record[2]) : ''); |
|
66 | + break; |
|
67 | + case 'ADOP': |
|
68 | + case 'BIRT': |
|
69 | + case 'BAPM': |
|
70 | + case 'BARM': |
|
71 | + case 'BASM': |
|
72 | + case 'BLES': |
|
73 | + case 'BURI': |
|
74 | + case 'CENS': |
|
75 | + case 'CHR': |
|
76 | + case 'CHRA': |
|
77 | + case 'CONF': |
|
78 | + case 'CREM': |
|
79 | + case 'DEAT': |
|
80 | + case 'EMIG': |
|
81 | + case 'FCOM': |
|
82 | + case 'GRAD': |
|
83 | + case 'IMMI': |
|
84 | + case 'NATU': |
|
85 | + case 'ORDN': |
|
86 | + case 'RETI': |
|
87 | + case 'PROB': |
|
88 | + case 'WILL': |
|
89 | + case 'EVEN': |
|
90 | + $className = ucfirst(strtolower($recordType)); |
|
91 | + $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
92 | 92 | |
93 | - $event = $class::parse($parser); |
|
94 | - $indi->addEven($event); |
|
95 | - break; |
|
96 | - case 'CAST': |
|
97 | - case 'DSCR': |
|
98 | - case 'EDUC': |
|
99 | - case 'IDNO': |
|
100 | - case 'NATI': |
|
101 | - case 'NCHI': |
|
102 | - case 'NMR': |
|
103 | - case 'OCCU': |
|
104 | - case 'PROP': |
|
105 | - case 'RELI': |
|
106 | - case 'RESI': |
|
107 | - case 'SSN': |
|
108 | - case 'TITL': |
|
109 | - $className = ucfirst(strtolower($recordType)); |
|
110 | - $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
93 | + $event = $class::parse($parser); |
|
94 | + $indi->addEven($event); |
|
95 | + break; |
|
96 | + case 'CAST': |
|
97 | + case 'DSCR': |
|
98 | + case 'EDUC': |
|
99 | + case 'IDNO': |
|
100 | + case 'NATI': |
|
101 | + case 'NCHI': |
|
102 | + case 'NMR': |
|
103 | + case 'OCCU': |
|
104 | + case 'PROP': |
|
105 | + case 'RELI': |
|
106 | + case 'RESI': |
|
107 | + case 'SSN': |
|
108 | + case 'TITL': |
|
109 | + $className = ucfirst(strtolower($recordType)); |
|
110 | + $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
111 | 111 | |
112 | - $att = $class::parse($parser); |
|
113 | - $indi->addAttr($att); |
|
114 | - break; |
|
115 | - case 'BAPL': |
|
116 | - case 'CONL': |
|
117 | - case 'ENDL': |
|
118 | - case 'SLGC': |
|
119 | - $className = ucfirst(strtolower($recordType)); |
|
120 | - $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
112 | + $att = $class::parse($parser); |
|
113 | + $indi->addAttr($att); |
|
114 | + break; |
|
115 | + case 'BAPL': |
|
116 | + case 'CONL': |
|
117 | + case 'ENDL': |
|
118 | + case 'SLGC': |
|
119 | + $className = ucfirst(strtolower($recordType)); |
|
120 | + $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
121 | 121 | |
122 | - $lds = $class::parse($parser); |
|
123 | - $indi->{'add' . $recordType}[] = $lds; |
|
124 | - break; |
|
125 | - case 'FAMC': |
|
126 | - $famc = \PhpGedcom\Parser\Indi\Famc::parse($parser); |
|
127 | - if ($famc) { |
|
128 | - $indi->addFamc($famc); |
|
129 | - } |
|
130 | - break; |
|
131 | - case 'FAMS': |
|
132 | - $fams = \PhpGedcom\Parser\Indi\Fams::parse($parser); |
|
133 | - if ($fams) { |
|
134 | - $indi->addFams($fams); |
|
135 | - } |
|
136 | - break; |
|
137 | - case 'SUBM': |
|
138 | - $indi->addSubm($parser->normalizeIdentifier($record[2])); |
|
139 | - break; |
|
140 | - case 'ASSO': |
|
141 | - $asso = \PhpGedcom\Parser\Indi\Asso::parse($parser); |
|
142 | - $indi->addAsso($asso); |
|
143 | - break; |
|
144 | - case 'ALIA': |
|
145 | - $indi->addAlia($parser->normalizeIdentifier($record[2])); |
|
146 | - break; |
|
147 | - case 'ANCI': |
|
148 | - $indi->addAnci($parser->normalizeIdentifier($record[2])); |
|
149 | - break; |
|
150 | - case 'DESI': |
|
151 | - $indi->addDesi($parser->normalizeIdentifier($record[2])); |
|
152 | - break; |
|
153 | - case 'RFN': |
|
154 | - $indi->setRfn(trim($record[2])); |
|
155 | - break; |
|
156 | - case 'AFN': |
|
157 | - $indi->setAfn(trim($record[2])); |
|
158 | - break; |
|
159 | - case 'REFN': |
|
160 | - $ref = \PhpGedcom\Parser\Refn::parse($parser); |
|
161 | - $indi->addRefn($ref); |
|
162 | - break; |
|
163 | - case 'RIN': |
|
164 | - $indi->setRin(trim($record[2])); |
|
165 | - break; |
|
166 | - case 'CHAN': |
|
167 | - $chan = \PhpGedcom\Parser\Chan::parse($parser); |
|
168 | - $indi->setChan($chan); |
|
169 | - break; |
|
170 | - case 'NOTE': |
|
171 | - $note = \PhpGedcom\Parser\NoteRef::parse($parser); |
|
172 | - if ($note) { |
|
173 | - $indi->addNote($note); |
|
174 | - } |
|
175 | - break; |
|
176 | - case 'SOUR': |
|
177 | - $sour = \PhpGedcom\Parser\SourRef::parse($parser); |
|
178 | - $indi->addSour($sour); |
|
179 | - break; |
|
180 | - case 'OBJE': |
|
181 | - $obje = \PhpGedcom\Parser\ObjeRef::parse($parser); |
|
182 | - $indi->addObje($obje); |
|
183 | - break; |
|
184 | - default: |
|
185 | - $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
122 | + $lds = $class::parse($parser); |
|
123 | + $indi->{'add' . $recordType}[] = $lds; |
|
124 | + break; |
|
125 | + case 'FAMC': |
|
126 | + $famc = \PhpGedcom\Parser\Indi\Famc::parse($parser); |
|
127 | + if ($famc) { |
|
128 | + $indi->addFamc($famc); |
|
129 | + } |
|
130 | + break; |
|
131 | + case 'FAMS': |
|
132 | + $fams = \PhpGedcom\Parser\Indi\Fams::parse($parser); |
|
133 | + if ($fams) { |
|
134 | + $indi->addFams($fams); |
|
135 | + } |
|
136 | + break; |
|
137 | + case 'SUBM': |
|
138 | + $indi->addSubm($parser->normalizeIdentifier($record[2])); |
|
139 | + break; |
|
140 | + case 'ASSO': |
|
141 | + $asso = \PhpGedcom\Parser\Indi\Asso::parse($parser); |
|
142 | + $indi->addAsso($asso); |
|
143 | + break; |
|
144 | + case 'ALIA': |
|
145 | + $indi->addAlia($parser->normalizeIdentifier($record[2])); |
|
146 | + break; |
|
147 | + case 'ANCI': |
|
148 | + $indi->addAnci($parser->normalizeIdentifier($record[2])); |
|
149 | + break; |
|
150 | + case 'DESI': |
|
151 | + $indi->addDesi($parser->normalizeIdentifier($record[2])); |
|
152 | + break; |
|
153 | + case 'RFN': |
|
154 | + $indi->setRfn(trim($record[2])); |
|
155 | + break; |
|
156 | + case 'AFN': |
|
157 | + $indi->setAfn(trim($record[2])); |
|
158 | + break; |
|
159 | + case 'REFN': |
|
160 | + $ref = \PhpGedcom\Parser\Refn::parse($parser); |
|
161 | + $indi->addRefn($ref); |
|
162 | + break; |
|
163 | + case 'RIN': |
|
164 | + $indi->setRin(trim($record[2])); |
|
165 | + break; |
|
166 | + case 'CHAN': |
|
167 | + $chan = \PhpGedcom\Parser\Chan::parse($parser); |
|
168 | + $indi->setChan($chan); |
|
169 | + break; |
|
170 | + case 'NOTE': |
|
171 | + $note = \PhpGedcom\Parser\NoteRef::parse($parser); |
|
172 | + if ($note) { |
|
173 | + $indi->addNote($note); |
|
174 | + } |
|
175 | + break; |
|
176 | + case 'SOUR': |
|
177 | + $sour = \PhpGedcom\Parser\SourRef::parse($parser); |
|
178 | + $indi->addSour($sour); |
|
179 | + break; |
|
180 | + case 'OBJE': |
|
181 | + $obje = \PhpGedcom\Parser\ObjeRef::parse($parser); |
|
182 | + $indi->addObje($obje); |
|
183 | + break; |
|
184 | + default: |
|
185 | + $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
186 | 186 | } |
187 | 187 | |
188 | 188 | $parser->forward(); |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | case 'WILL': |
89 | 89 | case 'EVEN': |
90 | 90 | $className = ucfirst(strtolower($recordType)); |
91 | - $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
91 | + $class = '\\PhpGedcom\\Parser\\Indi\\'.$className; |
|
92 | 92 | |
93 | 93 | $event = $class::parse($parser); |
94 | 94 | $indi->addEven($event); |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | case 'SSN': |
108 | 108 | case 'TITL': |
109 | 109 | $className = ucfirst(strtolower($recordType)); |
110 | - $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
110 | + $class = '\\PhpGedcom\\Parser\\Indi\\'.$className; |
|
111 | 111 | |
112 | 112 | $att = $class::parse($parser); |
113 | 113 | $indi->addAttr($att); |
@@ -117,10 +117,10 @@ discard block |
||
117 | 117 | case 'ENDL': |
118 | 118 | case 'SLGC': |
119 | 119 | $className = ucfirst(strtolower($recordType)); |
120 | - $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
120 | + $class = '\\PhpGedcom\\Parser\\Indi\\'.$className; |
|
121 | 121 | |
122 | 122 | $lds = $class::parse($parser); |
123 | - $indi->{'add' . $recordType}[] = $lds; |
|
123 | + $indi->{'add'.$recordType}[] = $lds; |
|
124 | 124 | break; |
125 | 125 | case 'FAMC': |
126 | 126 | $famc = \PhpGedcom\Parser\Indi\Famc::parse($parser); |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | $indi->addObje($obje); |
183 | 183 | break; |
184 | 184 | default: |
185 | - $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
185 | + $parser->logUnhandledRecord(get_class().' @ '.__LINE__); |
|
186 | 186 | } |
187 | 187 | |
188 | 188 | $parser->forward(); |
@@ -30,11 +30,11 @@ |
||
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[1])){ |
33 | - $identifier = $parser->normalizeIdentifier($record[1]); |
|
33 | + $identifier = $parser->normalizeIdentifier($record[1]); |
|
34 | 34 | } |
35 | 35 | else{ |
36 | - $parser->skipToNextLevel($depth); |
|
37 | - return null; |
|
36 | + $parser->skipToNextLevel($depth); |
|
37 | + return null; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | $sour = new \PhpGedcom\Record\Sour(); |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | public static function parse(\PhpGedcom\Parser $parser) |
29 | 29 | { |
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | - $depth = (int)$record[0]; |
|
32 | - if(isset($record[1])){ |
|
31 | + $depth = (int) $record[0]; |
|
32 | + if (isset($record[1])) { |
|
33 | 33 | $identifier = $parser->normalizeIdentifier($record[1]); |
34 | 34 | } |
35 | - else{ |
|
35 | + else { |
|
36 | 36 | $parser->skipToNextLevel($depth); |
37 | 37 | return null; |
38 | 38 | } |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | |
47 | 47 | while (!$parser->eof()) { |
48 | 48 | $record = $parser->getCurrentLineRecord(); |
49 | - $currentDepth = (int)$record[0]; |
|
49 | + $currentDepth = (int) $record[0]; |
|
50 | 50 | $recordType = strtoupper(trim($record[1])); |
51 | 51 | |
52 | 52 | if ($currentDepth <= $depth) { |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | $sour->addObje($obje); |
99 | 99 | break; |
100 | 100 | default: |
101 | - $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
101 | + $parser->logUnhandledRecord(get_class().' @ '.__LINE__); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | $parser->forward(); |
@@ -31,8 +31,7 @@ |
||
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[1])){ |
33 | 33 | $identifier = $parser->normalizeIdentifier($record[1]); |
34 | - } |
|
35 | - else{ |
|
34 | + } else{ |
|
36 | 35 | $parser->skipToNextLevel($depth); |
37 | 36 | return null; |
38 | 37 | } |
@@ -30,11 +30,11 @@ |
||
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[2])){ |
33 | - $_romn = trim($record[2]); |
|
33 | + $_romn = trim($record[2]); |
|
34 | 34 | } |
35 | 35 | else{ |
36 | - $parser->skipToNextLevel($depth); |
|
37 | - return null; |
|
36 | + $parser->skipToNextLevel($depth); |
|
37 | + return null; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | $romn = new \PhpGedcom\Record\Plac\Romn(); |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | public static function parse(\PhpGedcom\Parser $parser) |
29 | 29 | { |
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | - $depth = (int)$record[0]; |
|
32 | - if(isset($record[2])){ |
|
31 | + $depth = (int) $record[0]; |
|
32 | + if (isset($record[2])) { |
|
33 | 33 | $_romn = trim($record[2]); |
34 | 34 | } |
35 | - else{ |
|
35 | + else { |
|
36 | 36 | $parser->skipToNextLevel($depth); |
37 | 37 | return null; |
38 | 38 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | |
45 | 45 | while (!$parser->eof()) { |
46 | 46 | $record = $parser->getCurrentLineRecord(); |
47 | - $currentDepth = (int)$record[0]; |
|
47 | + $currentDepth = (int) $record[0]; |
|
48 | 48 | $recordType = strtoupper(trim($record[1])); |
49 | 49 | |
50 | 50 | if ($currentDepth <= $depth) { |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | $romn->setType(trim($record[2])); |
58 | 58 | break; |
59 | 59 | default: |
60 | - $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
60 | + $parser->logUnhandledRecord(get_class().' @ '.__LINE__); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | $parser->forward(); |
@@ -31,8 +31,7 @@ |
||
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[2])){ |
33 | 33 | $_romn = trim($record[2]); |
34 | - } |
|
35 | - else{ |
|
34 | + } else{ |
|
36 | 35 | $parser->skipToNextLevel($depth); |
37 | 36 | return null; |
38 | 37 | } |
@@ -30,11 +30,11 @@ |
||
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[2])){ |
33 | - $_fone = trim($record[2]); |
|
33 | + $_fone = trim($record[2]); |
|
34 | 34 | } |
35 | 35 | else{ |
36 | - $parser->skipToNextLevel($depth); |
|
37 | - return null; |
|
36 | + $parser->skipToNextLevel($depth); |
|
37 | + return null; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | $fone = new \PhpGedcom\Record\Plac\Fone(); |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | public static function parse(\PhpGedcom\Parser $parser) |
29 | 29 | { |
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | - $depth = (int)$record[0]; |
|
32 | - if(isset($record[2])){ |
|
31 | + $depth = (int) $record[0]; |
|
32 | + if (isset($record[2])) { |
|
33 | 33 | $_fone = trim($record[2]); |
34 | 34 | } |
35 | - else{ |
|
35 | + else { |
|
36 | 36 | $parser->skipToNextLevel($depth); |
37 | 37 | return null; |
38 | 38 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | |
45 | 45 | while (!$parser->eof()) { |
46 | 46 | $record = $parser->getCurrentLineRecord(); |
47 | - $currentDepth = (int)$record[0]; |
|
47 | + $currentDepth = (int) $record[0]; |
|
48 | 48 | $recordType = strtoupper(trim($record[1])); |
49 | 49 | |
50 | 50 | if ($currentDepth <= $depth) { |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | $fone->setType(trim($record[2])); |
58 | 58 | break; |
59 | 59 | default: |
60 | - $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
60 | + $parser->logUnhandledRecord(get_class().' @ '.__LINE__); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | $parser->forward(); |
@@ -31,8 +31,7 @@ |
||
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[2])){ |
33 | 33 | $_fone = trim($record[2]); |
34 | - } |
|
35 | - else{ |
|
34 | + } else{ |
|
36 | 35 | $parser->skipToNextLevel($depth); |
37 | 36 | return null; |
38 | 37 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | public static function parse(\PhpGedcom\Parser $parser) |
29 | 29 | { |
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | - $depth = (int)$record[0]; |
|
31 | + $depth = (int) $record[0]; |
|
32 | 32 | |
33 | 33 | |
34 | 34 | $map = new \PhpGedcom\Record\Plac\Map(); |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | |
38 | 38 | while (!$parser->eof()) { |
39 | 39 | $record = $parser->getCurrentLineRecord(); |
40 | - $currentDepth = (int)$record[0]; |
|
40 | + $currentDepth = (int) $record[0]; |
|
41 | 41 | $recordType = strtoupper(trim($record[1])); |
42 | 42 | |
43 | 43 | if ($currentDepth <= $depth) { |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $map->setLong(trim($record[2])); |
54 | 54 | break; |
55 | 55 | default: |
56 | - $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
56 | + $parser->logUnhandledRecord(get_class().' @ '.__LINE__); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | $parser->forward(); |
@@ -30,12 +30,12 @@ |
||
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[2])){ |
33 | - $sour = new \PhpGedcom\Record\SourRef(); |
|
34 | - $sour->setSour($parser->normalizeIdentifier($record[2])); |
|
33 | + $sour = new \PhpGedcom\Record\SourRef(); |
|
34 | + $sour->setSour($parser->normalizeIdentifier($record[2])); |
|
35 | 35 | } |
36 | 36 | else{ |
37 | - $parser->skipToNextLevel($depth); |
|
38 | - return null; |
|
37 | + $parser->skipToNextLevel($depth); |
|
38 | + return null; |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | $parser->forward(); |
@@ -28,12 +28,12 @@ discard block |
||
28 | 28 | public static function parse(\PhpGedcom\Parser $parser) |
29 | 29 | { |
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | - $depth = (int)$record[0]; |
|
32 | - if(isset($record[2])){ |
|
31 | + $depth = (int) $record[0]; |
|
32 | + if (isset($record[2])) { |
|
33 | 33 | $sour = new \PhpGedcom\Record\SourRef(); |
34 | 34 | $sour->setSour($parser->normalizeIdentifier($record[2])); |
35 | 35 | } |
36 | - else{ |
|
36 | + else { |
|
37 | 37 | $parser->skipToNextLevel($depth); |
38 | 38 | return null; |
39 | 39 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | while (!$parser->eof()) { |
44 | 44 | $record = $parser->getCurrentLineRecord(); |
45 | 45 | $recordType = strtoupper(trim($record[1])); |
46 | - $currentDepth = (int)$record[0]; |
|
46 | + $currentDepth = (int) $record[0]; |
|
47 | 47 | |
48 | 48 | if ($currentDepth <= $depth) { |
49 | 49 | $parser->back(); |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | $sour->setQuay(trim($record[2])); |
81 | 81 | break; |
82 | 82 | default: |
83 | - $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
83 | + $parser->logUnhandledRecord(get_class().' @ '.__LINE__); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | $parser->forward(); |
@@ -32,8 +32,7 @@ |
||
32 | 32 | if(isset($record[2])){ |
33 | 33 | $sour = new \PhpGedcom\Record\SourRef(); |
34 | 34 | $sour->setSour($parser->normalizeIdentifier($record[2])); |
35 | - } |
|
36 | - else{ |
|
35 | + } else{ |
|
37 | 36 | $parser->skipToNextLevel($depth); |
38 | 37 | return null; |
39 | 38 | } |
@@ -28,13 +28,13 @@ |
||
28 | 28 | public static function parse(\PhpGedcom\Parser $parser) |
29 | 29 | { |
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | - $depth = (int) $record[0]; |
|
32 | - if (isset($record[2])) { |
|
33 | - $_stat = $record[2]; |
|
34 | - } else { |
|
35 | - $parser->skipToNextLevel($depth); |
|
36 | - return null; |
|
37 | - } |
|
31 | + $depth = (int) $record[0]; |
|
32 | + if (isset($record[2])) { |
|
33 | + $_stat = $record[2]; |
|
34 | + } else { |
|
35 | + $parser->skipToNextLevel($depth); |
|
36 | + return null; |
|
37 | + } |
|
38 | 38 | |
39 | 39 | $stat = new \PhpGedcom\Record\Fam\Slgs\Stat(); |
40 | 40 | $stat->setStat($_stat); |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | while (!$parser->eof()) { |
45 | 45 | $record = $parser->getCurrentLineRecord(); |
46 | 46 | $recordType = strtoupper(trim($record[1])); |
47 | - $currentDepth = (int)$record[0]; |
|
47 | + $currentDepth = (int) $record[0]; |
|
48 | 48 | |
49 | 49 | if ($currentDepth <= $depth) { |
50 | 50 | $parser->back(); |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | $stat->setDate(trim($record[2])); |
57 | 57 | break; |
58 | 58 | default: |
59 | - $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
59 | + $parser->logUnhandledRecord(get_class().' @ '.__LINE__); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | $parser->forward(); |