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

version is mandatory at vCard 4.0 #128

Merged
merged 6 commits into from
Mar 2, 2019
Merged

version is mandatory at vCard 4.0 #128

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f460a9c
version is mandatory and at vCard 4.0 it has to be on the line direct…
Jun 20, 2018
0d01280
version is mandatory and at vCard 4.0 it has to be on the line direct…
Jun 21, 2018
0b95823
Merge pull request #1 from jeroendesloovere/2.0.0-dev
helveticadomes Jun 21, 2018
ee5c5d6
Merge pull request #2 from helveticadomes/2.0.0-dev
helveticadomes Jun 21, 2018
39b758d
Remove Blank Lines, and move use Role to its alphanum order (may fix …
Jun 22, 2018
76f766c
Do Requested changes: add blank line above return and remove abadoned…
Jun 28, 2018
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
22 changes: 19 additions & 3 deletions src/VCard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
use JeroenDesloovere\VCard\Property\Parameter\Version;
use JeroenDesloovere\VCard\Property\Photo;
use JeroenDesloovere\VCard\Property\PropertyInterface;
use JeroenDesloovere\VCard\Property\Role;
use JeroenDesloovere\VCard\Property\Telephone;
use JeroenDesloovere\VCard\Property\Title;
use JeroenDesloovere\VCard\Property\Role;

final class VCard
{
Expand Down Expand Up @@ -66,10 +66,12 @@ final class VCard

/**
* @param Kind|null $kind
* @param Version|null $version
* @throws VCardException
*/
public function __construct(Kind $kind = null)
public function __construct(Kind $kind = null, Version $version = null)
{
$this->add($version ?? Version::version4());
$this->add($kind ?? Kind::individual());
}

Expand Down Expand Up @@ -130,12 +132,26 @@ private function addPropertyParameter(PropertyParameterInterface $propertyParame

public function getKind(): Kind
{
return $this->getParameters(Kind::class)[0];
$kind = $this->getParameters(Kind::class);

return reset($kind);
}

public function getParameters(string $filterByPropertyParameterClass = null): array
{
if ($filterByPropertyParameterClass === null) {
$array = $this->parameters;
$found = $others = [];
foreach ($array as $value) {
if ($value instanceof Version) {
$found[] = $value;
} else {
$others[] = $value;
}
}
$array = array_merge($found, $others);
$this->parameters = $array;

return $this->parameters;
}

Expand Down