Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Style fixes #51

Merged
merged 4 commits into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions phpcs.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0"?>
<ruleset name="PHP_CodeSniffer">
<description>PHP_CodeSniffer configuration</description>
<rule ref="PSR12">
<exclude name="PSR12.Operators.OperatorSpacing"/>
<exclude name="PSR12.Classes.PropertyDeclaration.Underscore" />
</rule>
</ruleset>
2 changes: 1 addition & 1 deletion src/Models/RecordInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/**
* Interface for GEDCOM record models.
*
* Defines the essential operations that all GEDCOM record types must implement,
* Defines the essential operations that all GEDCOM record types must implement,
* such as getting and setting the ID and name.
*/
interface RecordInterface
Expand Down
7 changes: 3 additions & 4 deletions src/Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* This file contains the Parser class responsible for parsing GEDCOM files. It implements the ParserInterface
* and provides functionality to read and interpret the structure and data of GEDCOM files.
*/

/**
* php-gedcom.
*
Expand Down Expand Up @@ -57,7 +58,7 @@ public function __construct(Gedcom $gedcom = null)
$this->_gedcom = is_null($gedcom) ? new Gedcom() : $gedcom;
}

/**
/**
* Advances the parser to the next line in the GEDCOM file.
*
* If a line was previously returned by the back() method, it sets that as the current line. Otherwise,
Expand Down Expand Up @@ -169,7 +170,6 @@ public function parseMultiLineRecord()
}

switch ($recordType) {

case 'DATA':
$dataInstance = new \Gedcom\Record\Data();
$this->forward();
Expand Down Expand Up @@ -348,15 +348,14 @@ public function parse($fileName)
$this->forward();

while (!$this->eof()) {

$record = $this->getCurrentLineRecord();

if ($record === false) {
continue;
}

$depth = (int) $record[0];

// We only process 0 level records here. Sub levels are processed
// in methods for those data types (individuals, sources, etc)

Expand Down
1 change: 1 addition & 0 deletions src/Parser/Addr.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Birt.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Buri.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Caln.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Chan.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Chr.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Component.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
3 changes: 2 additions & 1 deletion src/Parser/Date.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand All @@ -19,7 +20,7 @@ class Date extends \Gedcom\Parser\Component
public static function parse(\Gedcom\Parser $parser)
{
$record = $parser->getCurrentLineRecord();

if (isset($record[1])) {
$dat = new \Gedcom\Record\Date();
if (!empty($record[2])) {
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Deat.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Fam.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Fam/Anul.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Fam/Cens.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Fam/Div.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Fam/Divf.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Fam/Enga.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
107 changes: 54 additions & 53 deletions src/Parser/Fam/Even.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down Expand Up @@ -40,59 +41,59 @@ public static function parse(\Gedcom\Parser $parser)
}

switch ($recordType) {
case 'TYPE':
$even->setType(trim((string) $record[2]));
break;
case 'DATE':
$dat = \Gedcom\Parser\Date::parse($parser);
$even->setDate($dat);
//$even->setDate(trim($record[2]));
break;
case 'PLAC':
$plac = \Gedcom\Parser\Plac::parse($parser);
$even->setPlac($plac);
break;
case 'ADDR':
$addr = \Gedcom\Parser\Addr::parse($parser);
$even->setAddr($addr);
break;
case 'PHON':
$phone = \Gedcom\Parser\Phon::parse($parser);
$even->addPhone($phone);
break;
case 'CAUS':
$even->setCaus(trim((string) $record[2]));
break;
case 'AGE':
$even->setAge(trim((string) $record[2]));
break;
case 'AGNC':
$even->setAgnc(trim((string) $record[2]));
break;
case 'HUSB':
$husb = \Gedcom\Parser\Fam\Even\Husb::parse($parser);
$even->setHusb($husb);
break;
case 'WIFE':
$wife = \Gedcom\Parser\Fam\Even\Wife::parse($parser);
$even->setWife($wife);
break;
case 'SOUR':
$sour = \Gedcom\Parser\SourRef::parse($parser);
$even->addSour($sour);
break;
case 'OBJE':
$obje = \Gedcom\Parser\ObjeRef::parse($parser);
$even->addObje($obje);
break;
case 'NOTE':
$note = \Gedcom\Parser\NoteRef::parse($parser);
if ($note) {
$even->addNote($note);
}
break;
default:
$parser->logUnhandledRecord(self::class.' @ '.__LINE__);
case 'TYPE':
$even->setType(trim((string) $record[2]));
break;
case 'DATE':
$dat = \Gedcom\Parser\Date::parse($parser);
$even->setDate($dat);
//$even->setDate(trim($record[2]));
break;
case 'PLAC':
$plac = \Gedcom\Parser\Plac::parse($parser);
$even->setPlac($plac);
break;
case 'ADDR':
$addr = \Gedcom\Parser\Addr::parse($parser);
$even->setAddr($addr);
break;
case 'PHON':
$phone = \Gedcom\Parser\Phon::parse($parser);
$even->addPhone($phone);
break;
case 'CAUS':
$even->setCaus(trim((string) $record[2]));
break;
case 'AGE':
$even->setAge(trim((string) $record[2]));
break;
case 'AGNC':
$even->setAgnc(trim((string) $record[2]));
break;
case 'HUSB':
$husb = \Gedcom\Parser\Fam\Even\Husb::parse($parser);
$even->setHusb($husb);
break;
case 'WIFE':
$wife = \Gedcom\Parser\Fam\Even\Wife::parse($parser);
$even->setWife($wife);
break;
case 'SOUR':
$sour = \Gedcom\Parser\SourRef::parse($parser);
$even->addSour($sour);
break;
case 'OBJE':
$obje = \Gedcom\Parser\ObjeRef::parse($parser);
$even->addObje($obje);
break;
case 'NOTE':
$note = \Gedcom\Parser\NoteRef::parse($parser);
if ($note) {
$even->addNote($note);
}
break;
default:
$parser->logUnhandledRecord(self::class.' @ '.__LINE__);
}

$parser->forward();
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Fam/Even/Husb.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Fam/Even/Wife.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Fam/Marb.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Fam/Marc.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Fam/Marl.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Fam/Marr.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Fam/Mars.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Fam/Slgs.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Fam/Slgs/Stat.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Head.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Head/Char.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Head/Date.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Head/Gedc.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Head/Plac.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Head/Sour.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Head/Sour/Corp.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Head/Sour/Data.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Indi/Adop.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Indi/Asso.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Indi/Attr.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* php-gedcom.
*
Expand Down
Loading
Loading