diff --git a/CHANGELOG.md b/CHANGELOG.md index 972e8fb15..8476d7402 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ ChangeLog ========= +4.4.2 (2022-06-24) +------------------ + +* #565: lowercase mailto:-addresses in getNormalizedValue() (@pk1234) +* #568: Add NICKNAME fallback for VCards without FNs (@Evengard) +* #573: Component/select: Before uppercasing $child->group, make sure it isn't null (@algernon) +* #575: Fix encoding detection on PHP 8.1 (@come-nc) + 4.4.1 (2021-12-07) ------------------ diff --git a/lib/Component/VCard.php b/lib/Component/VCard.php index ba9645408..90a6df72f 100644 --- a/lib/Component/VCard.php +++ b/lib/Component/VCard.php @@ -290,12 +290,12 @@ public function validate($options = 0) } elseif (isset($this->ORG)) { $this->FN = (string) $this->ORG; $repaired = true; - + // Otherwise, the NICKNAME property may work } elseif (isset($this->NICKNAME)) { $this->FN = (string) $this->NICKNAME; $repaired = true; - + // Otherwise, the EMAIL property may work } elseif (isset($this->EMAIL)) { $this->FN = (string) $this->EMAIL; diff --git a/lib/Property/ICalendar/CalAddress.php b/lib/Property/ICalendar/CalAddress.php index 00693d334..c90967d79 100644 --- a/lib/Property/ICalendar/CalAddress.php +++ b/lib/Property/ICalendar/CalAddress.php @@ -54,7 +54,7 @@ public function getNormalizedValue() } list($schema, $everythingElse) = explode(':', $input, 2); $schema = strtolower($schema); - if($schema === "mailto") { + if ('mailto' === $schema) { $everythingElse = strtolower($everythingElse); } diff --git a/lib/Version.php b/lib/Version.php index 64938bf0b..ff8cf49c2 100644 --- a/lib/Version.php +++ b/lib/Version.php @@ -14,5 +14,5 @@ class Version /** * Full version number. */ - const VERSION = '4.4.1'; + const VERSION = '4.4.2'; } diff --git a/tests/VObject/Component/VCardTest.php b/tests/VObject/Component/VCardTest.php index c23921682..45743ff67 100644 --- a/tests/VObject/Component/VCardTest.php +++ b/tests/VObject/Component/VCardTest.php @@ -94,7 +94,7 @@ public function validateData() ]; // No FN, NICKNAME fallback $tests[] = [ - "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\NICKNAME:JohnDoe\r\nEND:VCARD\r\n", + "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nNICKNAME:JohnDoe\r\nEND:VCARD\r\n", [ 'The FN property must appear in the VCARD component exactly 1 time', ],