Skip to content

Commit 7626f5d

Browse files
curtisdelicataStyleCIBot
authored andcommitted
Apply fixes from StyleCI
1 parent e25e285 commit 7626f5d

File tree

6 files changed

+41
-44
lines changed

6 files changed

+41
-44
lines changed

src/Models/Person.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Person extends Model
2424
'description',
2525
'title', 'name', 'appellative', 'uid', 'email', 'phone', 'birthday', 'birth_year',
2626
'deathday', 'death_year', 'burial_day', 'burial_year', 'bank', 'bank_account',
27-
'uid', 'chan', 'rin', 'resn', 'rfn', 'afn', 'type'
27+
'uid', 'chan', 'rin', 'resn', 'rfn', 'afn', 'type',
2828
];
2929

3030
public function events()

src/Utils/FamilyData.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,9 @@ public static function getFamily($conn, $families, $obje_ids = [], $sour_ids = [
7575
];
7676

7777
Family::on($conn)->updateOrCreate($value, $value);
78-
7978
}
8079

8180
otherFamRecord::insertFamilyData($conn, $persons_id, $families, $obje_ids, $sour_ids);
82-
8381
} catch (\Exception $e) {
8482
$error = $e->getMessage();
8583

src/Utils/GedcomGenerator.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ protected function setIndi($p_id)
314314

315315
$gid = $person->gid;
316316
$indi->setGid($gid);
317-
317+
318318
$uid = $person->uid;
319319
$indi->setUid($uid);
320320

@@ -351,7 +351,7 @@ protected function setIndi($p_id)
351351
$chan = Carbon::parse($person->chan);
352352
$chan = [
353353
strtoupper($chan->format('j M Y')),
354-
$chan->format('H:i:s.v')
354+
$chan->format('H:i:s.v'),
355355
];
356356
$indi->setChan($chan);
357357
}
@@ -547,7 +547,7 @@ protected function setSour()
547547
foreach ($_sour as $item) {
548548
$sour->setTitl($item->titl);
549549
}
550-
550+
551551
$this->_gedcom->addSour($sour);
552552
}
553553

src/Utils/GedcomParser.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,6 @@ public function parse(
243243
FamilyData::getFamily($this->conn, $families, $this->obje_ids, $this->sour_ids, $this->persons_id, $this->note_ids, $this->repo_ids, $parentData);
244244

245245
foreach ($families as $family) {
246-
247246
FamilyData::getFamily($this->conn, $family, $this->obje_ids);
248247
if ($progressBar === true) {
249248
$bar->advance();

src/Utils/ParentData.php

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,14 @@ public static function getPerson($conn, $individuals, $obje_ids = [], $sour_ids
8787
$rfn = $individual->getRfn();
8888
$afn = $individual->getAfn();
8989
$titl = $individual->getAttr();
90-
90+
9191
$birt = $individual->getBirt();
9292
$birthday = $birt->dateFormatted ?? null;
9393
$birth_month = $birt->month ?? null;
9494
$birth_year = $birt->year ?? null;
9595
$birthday_dati = $birt->dati ?? null;
9696
$birthday_plac = $birt->plac ?? null;
97-
97+
9898
$deat = $individual->getDeat();
9999
$deathday = $deat->dateFormatted ?? null;
100100
$death_month = $deat->month ?? null;
@@ -119,42 +119,42 @@ public static function getPerson($conn, $individuals, $obje_ids = [], $sour_ids
119119

120120
$config = json_encode(config('database.connections.'.$conn));
121121
$value = [
122-
'gid' => $g_id,
123-
'name' => $name,
124-
'givn' => $givn,
125-
'surn' => $surn,
126-
'sex' => $sex,
127-
'uid' => $uid,
128-
'rin' => $rin,
129-
'resn' => $resn,
130-
'rfn' => $rfn,
131-
'afn' => $afn,
132-
'nick' => $nick,
133-
'type' => $type,
134-
'chan' => $chan ? $chan->getDatetime() : null,
135-
'nsfx' => $nsfx,
136-
'npfx' => $npfx,
137-
'spfx' => $spfx,
138-
'birthday' => $birthday,
139-
'birth_month' => $birth_month,
140-
'birth_year' => $birth_year,
141-
'birthday_dati' => $birthday_dati,
142-
'birthday_plac' => $birthday_plac,
143-
'deathday' => $deathday,
144-
'death_month' => $death_month,
145-
'death_year' => $death_year,
146-
'deathday_dati' => $deathday_dati,
147-
'deathday_plac' => $deathday_plac,
148-
'deathday_caus' => $deathday_caus,
149-
'burial_day' => $burial_day,
150-
'burial_month' => $burial_month,
151-
'burial_year' => $burial_year,
122+
'gid' => $g_id,
123+
'name' => $name,
124+
'givn' => $givn,
125+
'surn' => $surn,
126+
'sex' => $sex,
127+
'uid' => $uid,
128+
'rin' => $rin,
129+
'resn' => $resn,
130+
'rfn' => $rfn,
131+
'afn' => $afn,
132+
'nick' => $nick,
133+
'type' => $type,
134+
'chan' => $chan ? $chan->getDatetime() : null,
135+
'nsfx' => $nsfx,
136+
'npfx' => $npfx,
137+
'spfx' => $spfx,
138+
'birthday' => $birthday,
139+
'birth_month' => $birth_month,
140+
'birth_year' => $birth_year,
141+
'birthday_dati' => $birthday_dati,
142+
'birthday_plac' => $birthday_plac,
143+
'deathday' => $deathday,
144+
'death_month' => $death_month,
145+
'death_year' => $death_year,
146+
'deathday_dati' => $deathday_dati,
147+
'deathday_plac' => $deathday_plac,
148+
'deathday_caus' => $deathday_caus,
149+
'burial_day' => $burial_day,
150+
'burial_month' => $burial_month,
151+
'burial_year' => $burial_year,
152152
'burial_day_dati' => $burial_day_dati,
153153
'burial_day_plac' => $burial_day_plac,
154-
'titl' => $attr ? $attr['TITL'][0]->getAttr('TITL') : null,
155-
'famc' => $famc ? $famc[0]->getFamc() : null,
156-
'fams' => $fams ? $fams[0]->getFams() : null,
157-
'chr' => $chr
154+
'titl' => $attr ? $attr['TITL'][0]->getAttr('TITL') : null,
155+
'famc' => $famc ? $famc[0]->getFamc() : null,
156+
'fams' => $fams ? $fams[0]->getFams() : null,
157+
'chr' => $chr,
158158
];
159159

160160
$parentData[] = $value;

src/migrations/2021_08_26_222539_add_column_dati_plac_famc_fams_to_people_table.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function down()
4343
'burial_day_dati',
4444
'burial_day_plac',
4545
'famc',
46-
'fams'
46+
'fams',
4747
]);
4848
});
4949
}

0 commit comments

Comments
 (0)