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.

Sign up for GitHub

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

vCard 4.0: fix Name Property #146

Open
wants to merge 13 commits into
base: 2.0.0-dev
Choose a base branch
from
Open

vCard 4.0: fix Name Property #146

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0404f6f
fix Name Property (wrong order: FN and N have different orders!) mand…
Mar 4, 2019
17d55da
fix Name Property (wrong order: FN and N have different orders!) mand…
Mar 4, 2019
da3372a
Merge branch 'feature-fixed-name-property' of github.com:helveticadom…
Mar 5, 2019
690a942
change firstname with lastname, like requested
Mar 5, 2019
1884522
Merge branch 'feature-fixed-name-property' of github.com:helveticadom…
Mar 5, 2019
543756d
Add extra testcases. Defect in vcf files, changed as well. Still a bu…
Mar 5, 2019
390b6c8
vcard 1 & 2 added (I forgot to add them)
Mar 6, 2019
52659dc
DateTimeOrStringValue format fixed, now according to rfc6350. bear in…
melroy89 Mar 6, 2019
946f95a
Travis is hanging. trigger another build??
melroy89 Mar 6, 2019
aa1eddd
Code layout fixes
melroy89 Mar 6, 2019
51ecc1b
Improve UT
melroy89 Mar 6, 2019
9985584
Fix datatime value return value of to_string.
melroy89 Mar 7, 2019
061f052
Test FullName mandatory exception test
Mar 8, 2019
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
7 changes: 7 additions & 0 deletions src/Exception/VCardException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@

class VCardException extends \Exception
{
public static function forRequiredProperty(PropertyInterface $property): self
{
return new self(
'The property "' . get_class($property) . '" is mandatory, and you need to add it once.'
);
}

public static function forExistingProperty(PropertyInterface $property): self
{
return new self(
Expand Down
2 changes: 1 addition & 1 deletion src/Parser/Property/NameParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ final class NameParser extends PropertyParser implements NodeParserInterface
{
public function parseVcfString(string $value, array $parameters = []): NodeInterface
{
@list($firstName, $additional, $lastName, $prefix, $suffix) = explode(';', $value);
@list($lastName, $firstName, $additional, $prefix, $suffix) = explode(';', $value);

$this->convertEmptyStringToNull([
$lastName,
Expand Down
4 changes: 2 additions & 2 deletions src/Property/Name.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
final class Name implements PropertyInterface, NodeInterface
{
/** @var null|string */
private $additional;
private $lastName;

/** @var null|string */
private $firstName;

/** @var null|string */
private $lastName;
private $additional;

/** @var null|string */
private $prefix;
Expand Down
29 changes: 29 additions & 0 deletions src/VCard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,38 @@ public function getParameters(string $filterByPropertyParameterClass = null): ar
});
}

/**
* @param string $forPropertyClass
* @return array
* @throws VCardException
*/
public function getProperties(string $forPropertyClass = null): array
{
if ($forPropertyClass === null) {
$array = $this->properties;
//make empty array var for each required Property or Property you need to work with
$found_fullname = $found_name = $others = [];
foreach ($array as $value) {
//search if property exist and add it to the defined array var, else add it to the others array
if ($value instanceof FullName) {
$found_fullname[] = $value;
} elseif ($value instanceof Name) {
$found_name[] = $value;
} else {
$others[] = $value;
}
}
//check for empty and throw exception, if it can not be generated by existing fields
if (count($found_fullname) == 0) {
if (count($found_name) == 0) {
throw VCardException::forRequiredProperty(new FullName('NoName'));
} else {
$found_fullname[] = new FullName(implode(' ', array_filter(array($found_name[0]->getPrefix(), $found_name[0]->getLastName(), $found_name[0]->getAdditional(), $found_name[0]->getFirstName(), $found_name[0]->getSuffix()))));
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at the result of the fullname of the unit tester ran https://travis-ci.org/jeroendesloovere/vcard/jobs/502040710.

+FN:Mr. van den Berg Antoine Melroy\r\n

This is not correct.

I prefer: Prefix - firstname - additional - lastname - suffix order.

Which should result into:
+FN:Mr. Melroy Antoine van den Berg\r\n

I hope you agree as well regarding this.

Copy link
Author

@helveticadomes helveticadomes Mar 5, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i agree, fixed that & forcepush was to remove the commits created form a wrong rebase

}
}
$array = array_merge($found_fullname, $found_name, $others);
$this->properties = $array;

return $this->properties;
}

Expand Down