diff --git a/lib/ITip/Broker.php b/lib/ITip/Broker.php
index 76ee0c71..93e2fab6 100644
--- a/lib/ITip/Broker.php
+++ b/lib/ITip/Broker.php
@@ -588,14 +588,14 @@ protected function parseEventForOrganizer(VCalendar $calendar, array $eventInfo,
                         unset($currentEvent->ORGANIZER['SCHEDULE-FORCE-SEND']);
                         unset($currentEvent->ORGANIZER['SCHEDULE-STATUS']);
 
-                        foreach ($currentEvent->ATTENDEE as $attendee) {
-                            unset($attendee['SCHEDULE-FORCE-SEND']);
-                            unset($attendee['SCHEDULE-STATUS']);
+                        foreach ($currentEvent->ATTENDEE as $currentEventAttendee) {
+                            unset($currentEventAttendee['SCHEDULE-FORCE-SEND']);
+                            unset($currentEventAttendee['SCHEDULE-STATUS']);
 
                             // We're adding PARTSTAT=NEEDS-ACTION to ensure that
                             // iOS shows an "Inbox Item"
-                            if (!isset($attendee['PARTSTAT'])) {
-                                $attendee['PARTSTAT'] = 'NEEDS-ACTION';
+                            if (!isset($currentEventAttendee['PARTSTAT'])) {
+                                $currentEventAttendee['PARTSTAT'] = 'NEEDS-ACTION';
                             }
                         }
                     }
diff --git a/tests/VObject/Component/VAvailabilityTest.php b/tests/VObject/Component/VAvailabilityTest.php
index 263eeebd..67499e98 100644
--- a/tests/VObject/Component/VAvailabilityTest.php
+++ b/tests/VObject/Component/VAvailabilityTest.php
@@ -435,8 +435,7 @@ protected function template(array $properties)
 …
 END:VAVAILABILITY
 END:VCALENDAR
-VCAL
-            ,
+VCAL,
             $properties
         );
     }
@@ -459,8 +458,7 @@ protected function templateAvailable(array $properties)
 END:AVAILABLE
 END:VAVAILABILITY
 END:VCALENDAR
-VCAL
-            ,
+VCAL,
             $properties
         );
     }
diff --git a/tests/VObject/Parser/XmlTest.php b/tests/VObject/Parser/XmlTest.php
index 2276f7fd..6491d087 100644
--- a/tests/VObject/Parser/XmlTest.php
+++ b/tests/VObject/Parser/XmlTest.php
@@ -47,8 +47,7 @@ public function testRFC6321Example1(): void
   </components>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             // VERSION comes first because this is required by vCard 4.0.
             'VERSION:2.0'."\n".
@@ -270,8 +269,7 @@ public function testRFC6321Section3Part2(): void
 <icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
  <vcalendar/>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'END:VCALENDAR'."\n"
         );
@@ -299,8 +297,7 @@ public function testRFC6321Section3Part3(): void
   </components>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'BEGIN:VTIMEZONE'."\n".
             'END:VTIMEZONE'."\n".
@@ -340,8 +337,7 @@ public function testRFC6321Section3Part4Part1Part2(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'GEO:37.386013;-122.082932'."\n".
             'END:VCALENDAR'."\n"
@@ -367,8 +363,7 @@ public function testRFC6321Section3Part4Part1Part3(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'REQUEST-STATUS:2.0;Success'."\n".
             'END:VCALENDAR'."\n"
@@ -389,8 +384,7 @@ public function testRFC6321Section3Part4Part1Part3(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'REQUEST-STATUS:3.1;Invalid property value;DTSTART:96-Apr-01'."\n".
             'END:VCALENDAR'."\n"
@@ -411,8 +405,7 @@ public function testRFC6321Section3Part4Part1Part3(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'REQUEST-STATUS:2.8;Success\, repeating event ignored. Scheduled as a single'."\n".
             '  event.;RRULE:FREQ=WEEKLY\;INTERVAL=2'."\n".
@@ -433,8 +426,7 @@ public function testRFC6321Section3Part4Part1Part3(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'REQUEST-STATUS:4.1;Event conflict.  Date-time is busy.'."\n".
             'END:VCALENDAR'."\n"
@@ -455,8 +447,7 @@ public function testRFC6321Section3Part4Part1Part3(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'REQUEST-STATUS:3.7;Invalid calendar user;ATTENDEE:mailto:jsmith@example.com'."\n".
             'END:VCALENDAR'."\n"
@@ -480,8 +471,7 @@ public function testRFC6321Section3Part6Part1(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'ATTACH:SGVsbG8gV29ybGQh'."\n".
             'END:VCALENDAR'."\n"
@@ -500,8 +490,7 @@ public function testRFC6321Section3Part6Part1(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'ATTACH:SGVsbG8gV29ybGQh'."\n".
             'END:VCALENDAR'."\n"
@@ -528,8 +517,7 @@ public function testRFC6321Section3Part6Part2(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'ATTENDEE;RSVP=true:mailto:cyrus@example.com'."\n".
             'END:VCALENDAR'."\n"
@@ -553,8 +541,7 @@ public function testRFC6321Section3Part6Part3(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'ATTENDEE:mailto:cyrus@example.com'."\n".
             'END:VCALENDAR'."\n"
@@ -578,8 +565,7 @@ public function testRFC6321Section3Part6Part4(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'DTSTART;VALUE=DATE:20110517'."\n".
             'END:VCALENDAR'."\n"
@@ -603,8 +589,7 @@ public function testRFC6321Section3Part6Part5(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'DTSTART:20110517T120000'."\n".
             'END:VCALENDAR'."\n"
@@ -628,8 +613,7 @@ public function testRFC6321Section3Part6Part6(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'DURATION:P1D'."\n".
             'END:VCALENDAR'."\n"
@@ -662,8 +646,7 @@ public function testRFC6321Section3Part6Part8(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'FOO:42'."\n".
             'END:VCALENDAR'."\n"
@@ -681,8 +664,7 @@ public function testRFC6321Section3Part6Part8(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'FOO:-42'."\n".
             'END:VCALENDAR'."\n"
@@ -709,8 +691,7 @@ public function testRFC6321Section3Part6Part9(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'FREEBUSY:20110517T120000/P1H'."\n".
             'END:VCALENDAR'."\n"
@@ -731,8 +712,7 @@ public function testRFC6321Section3Part6Part9(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'FREEBUSY:20110517T120000/20120517T120000'."\n".
             'END:VCALENDAR'."\n"
@@ -761,8 +741,7 @@ public function testRFC6321Section3Part6Part10(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'RRULE:FREQ=YEARLY;COUNT=5;BYDAY=-1SU;BYMONTH=10'."\n".
             'END:VCALENDAR'."\n"
@@ -786,8 +765,7 @@ public function testRFC6321Section3Part6Part11(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'CALSCALE:GREGORIAN'."\n".
             'END:VCALENDAR'."\n"
@@ -811,8 +789,7 @@ public function testRFC6321Section3Part6Part12(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'FOO:120000'."\n".
             'END:VCALENDAR'."\n"
@@ -836,8 +813,7 @@ public function testRFC6321Section3Part6Part13(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'ATTACH:http://calendar.example.com'."\n".
             'END:VCALENDAR'."\n"
@@ -862,8 +838,7 @@ public function testRFC6321Section3Part6Part14(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'TZOFFSETFROM:-0500'."\n".
             'END:VCALENDAR'."\n"
@@ -882,8 +857,7 @@ public function testRFC6321Section3Part6Part14(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'TZOFFSETFROM:+0100'."\n".
             'END:VCALENDAR'."\n"
@@ -907,8 +881,7 @@ public function testRFC6321Section5(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'X-PROPERTY:20110512T120000Z'."\n".
             'END:VCALENDAR'."\n"
@@ -931,8 +904,7 @@ public function testRFC6321Section5(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'DTSTART;X-PARAM=PT30M:20110512T130000Z'."\n".
             'END:VCALENDAR'."\n"
@@ -953,8 +925,7 @@ public function testRDateWithDateTime(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'RDATE:20080205T191224Z'."\n".
             'END:VCALENDAR'."\n"
@@ -973,8 +944,7 @@ public function testRDateWithDateTime(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'RDATE:20080205T191224Z,20090205T191224Z'."\n".
             'END:VCALENDAR'."\n"
@@ -995,8 +965,7 @@ public function testRDateWithDate(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'RDATE:20081006'."\n".
             'END:VCALENDAR'."\n"
@@ -1016,8 +985,7 @@ public function testRDateWithDate(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'RDATE:20081006,20091006,20101006'."\n".
             'END:VCALENDAR'."\n"
@@ -1046,8 +1014,7 @@ public function testRDateWithPeriod(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'RDATE;TZID=US/Eastern;VALUE=PERIOD:20060102T150000/PT2H'."\n".
             'END:VCALENDAR'."\n"
@@ -1077,8 +1044,7 @@ public function testRDateWithPeriod(): void
   </properties>
  </vcalendar>
 </icalendar>
-XML
-            ,
+XML,
             'BEGIN:VCALENDAR'."\n".
             'RDATE;TZID=US/Eastern;VALUE=PERIOD:20060102T150000/PT2H,20080102T150000/PT1'."\n".
             ' H'."\n".
@@ -1108,8 +1074,7 @@ public function testRFC6351Basic(): void
   </n>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'FN:J. Doe'."\n".
@@ -1149,8 +1114,7 @@ public function testRFC6351Example1(): void
   <x1:a href="http://www.example.com" xmlns:x1="http://www.w3.org/1999/xhtml">My web page!</x1:a>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'FN:J. Doe'."\n".
@@ -1183,8 +1147,7 @@ public function testRFC6351Section5(): void
   </tel>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'TEL;TYPE="voice,video":tel:+1-555-555-555'."\n".
@@ -1207,8 +1170,7 @@ public function testRFC6351Section5(): void
   </tel>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'TEL;TYPE="voice,video":tel:+1-555-555-555'."\n".
@@ -1244,8 +1206,7 @@ public function testRFC6351Section5Group(): void
   </group>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'TEL:tel:+1-555-555-556'."\n".
@@ -1276,8 +1237,7 @@ public function testRFC6351Section5Part1NoNamespace(): void
   </x-my-prop>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'X-MY-PROP;PREF=1:value goes here'."\n".
@@ -1300,8 +1260,7 @@ public function testRFC6351ValueDateWithYearMonthDay(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:20150128'."\n".
@@ -1324,8 +1283,7 @@ public function testRFC6351ValueDateWithYearMonth(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:2015-01'."\n".
@@ -1348,8 +1306,7 @@ public function testRFC6351ValueDateWithMonth(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:--01'."\n".
@@ -1372,8 +1329,7 @@ public function testRFC6351ValueDateWithMonthDay(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:--0128'."\n".
@@ -1396,8 +1352,7 @@ public function testRFC6351ValueDateWithDay(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:---28'."\n".
@@ -1420,8 +1375,7 @@ public function testRFC6351ValueTimeWithHour(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:13'."\n".
@@ -1444,8 +1398,7 @@ public function testRFC6351ValueTimeWithHourMinute(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:1353'."\n".
@@ -1468,8 +1421,7 @@ public function testRFC6351ValueTimeWithHourMinuteSecond(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:135301'."\n".
@@ -1492,8 +1444,7 @@ public function testRFC6351ValueTimeWithMinute(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:-53'."\n".
@@ -1516,8 +1467,7 @@ public function testRFC6351ValueTimeWithMinuteSecond(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:-5301'."\n".
@@ -1573,8 +1523,7 @@ public function testRFC6351ValueTimeWithSecondZ(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:--01Z'."\n".
@@ -1597,8 +1546,7 @@ public function testRFC6351ValueTimeWithSecondTZ(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:--01+1234'."\n".
@@ -1621,8 +1569,7 @@ public function testRFC6351ValueDateTimeWithYearMonthDayHour(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:20150128T13'."\n".
@@ -1645,8 +1592,7 @@ public function testRFC6351ValueDateTimeWithMonthDayHour(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:--0128T13'."\n".
@@ -1669,8 +1615,7 @@ public function testRFC6351ValueDateTimeWithDayHour(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:---28T13'."\n".
@@ -1693,8 +1638,7 @@ public function testRFC6351ValueDateTimeWithDayHourMinute(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:---28T1353'."\n".
@@ -1717,8 +1661,7 @@ public function testRFC6351ValueDateTimeWithDayHourMinuteSecond(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:---28T135301'."\n".
@@ -1741,8 +1684,7 @@ public function testRFC6351ValueDateTimeWithDayHourZ(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:---28T13Z'."\n".
@@ -1765,8 +1707,7 @@ public function testRFC6351ValueDateTimeWithDayHourTZ(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:---28T13+1234'."\n".
@@ -1789,8 +1730,7 @@ public function testRFC6350Section6Part1Part3(): void
   </source>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'SOURCE:ldap://ldap.example.com/cn=Babs%20Jensen\,%20o=Babsco\,%20c=US'."\n".
@@ -1813,8 +1753,7 @@ public function testRFC6350Section6Part1Part4(): void
   </kind>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'KIND:individual'."\n".
@@ -1837,8 +1776,7 @@ public function testRFC6350Section6Part2Part1(): void
   </fn>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'FN:Mr. John Q. Public\, Esq.'."\n".
@@ -1865,8 +1803,7 @@ public function testRFC6350Section6Part2Part2(): void
   </n>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'N:Stevenson;John;Philip\,Paul;Dr.;Jr.\,M.D.\,A.C.P.'."\n".
@@ -1890,8 +1827,7 @@ public function testRFC6350Section6Part2Part3(): void
   </nickname>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'NICKNAME:Jim,Jimmie'."\n".
@@ -1914,8 +1850,7 @@ public function testRFC6350Section6Part2Part4(): void
   </photo>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'PHOTO:http://www.example.com/pub/photos/jqpublic.gif'."\n".
@@ -1935,8 +1870,7 @@ public function testRFC6350Section6Part2Part5(): void
   </bday>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'BDAY:19531015T231000Z'."\n".
@@ -1956,8 +1890,7 @@ public function testRFC6350Section6Part2Part6(): void
   </anniversary>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'ANNIVERSARY:19960415'."\n".
@@ -1981,8 +1914,7 @@ public function testRFC6350Section6Part2Part7(): void
   </gender>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'GENDER:Jim;Jimmie'."\n".
@@ -2011,8 +1943,7 @@ public function testRFC6350Section6Part3Part1(): void
   </adr>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'ADR:;;123 Main Street;Any Town;CA;91921-1234;U.S.A.'."\n".
@@ -2050,8 +1981,7 @@ public function testRFC6350Section6Part4Part1(): void
   </tel>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'TEL;TYPE=home:tel:+33-01-23-45-67'."\n".
@@ -2073,8 +2003,7 @@ public function testRFC6350Section6Part4Part1(): void
   </tel>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'TEL;TYPE=home:tel:+33-01-23-45-67'."\n".
@@ -2102,8 +2031,7 @@ public function testRFC6350Section6Part4Part2(): void
   </email>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'EMAIL;TYPE=work:jqpublic@xyz.example.com'."\n".
@@ -2131,8 +2059,7 @@ public function testRFC6350Section6Part4Part3(): void
   </impp>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'IMPP;PREF=1:xmpp:alice@example.com'."\n".
@@ -2163,8 +2090,7 @@ public function testRFC6350Section6Part4Part4(): void
   </lang>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'LANG;TYPE=work;PREF=2:en'."\n".
@@ -2187,8 +2113,7 @@ public function testRFC6350Section6Part5Part1(): void
   </tz>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'TZ:Raleigh/North America'."\n".
@@ -2211,8 +2136,7 @@ public function testRFC6350Section6Part5Part2(): void
   </geo>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'GEO:geo:37.386013\,-122.082932'."\n".
@@ -2229,8 +2153,7 @@ public function testRFC6350Section6Part5Part2(): void
   </geo>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'GEO:geo:37.386013\,-122.082932'."\n".
@@ -2253,8 +2176,7 @@ public function testRFC6350Section6Part6Part1(): void
   </title>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'TITLE:Research Scientist'."\n".
@@ -2277,8 +2199,7 @@ public function testRFC6350Section6Part6Part2(): void
   </role>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'ROLE:Project Leader'."\n".
@@ -2301,8 +2222,7 @@ public function testRFC6350Section6Part6Part3(): void
   </logo>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'LOGO:http://www.example.com/pub/logos/abccorp.jpg'."\n".
@@ -2327,8 +2247,7 @@ public function testRFC6350Section6Part6Part4(): void
   </org>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'ORG:ABC\, Inc.;North American Division;Marketing'."\n".
@@ -2351,8 +2270,7 @@ public function testRFC6350Section6Part6Part5(): void
   </member>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'MEMBER:urn:uuid:03a0e51f-d1aa-4385-8a53-e29025acd8af'."\n".
@@ -2378,8 +2296,7 @@ public function testRFC6350Section6Part6Part5(): void
   </member>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'MEMBER:mailto:subscriber1@example.com'."\n".
@@ -2410,8 +2327,7 @@ public function testRFC6350Section6Part6Part6(): void
   </related>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'RELATED;TYPE=friend:urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6'."\n".
@@ -2437,8 +2353,7 @@ public function testRFC6350Section6Part7Part1(): void
   </categories>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'CATEGORIES:INTERNET,IETF,INDUSTRY,INFORMATION TECHNOLOGY'."\n".
@@ -2461,8 +2376,7 @@ public function testRFC6350Section6Part7Part2(): void
   </note>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'NOTE:Foo\, bar'."\n".
@@ -2485,8 +2399,7 @@ public function testRFC6350Section6Part7Part3(): void
   </prodid>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'PRODID:-//ONLINE DIRECTORY//NONSGML Version 1//EN'."\n".
@@ -2506,8 +2419,7 @@ public function testRFC6350Section6Part7Part4(): void
   </rev>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'REV:19951031T222710Z'."\n".
@@ -2530,8 +2442,7 @@ public function testRFC6350Section6Part7Part5(): void
   </sound>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'SOUND:CID:JOHNQPUBLIC.part8.19960229T080000.xyzMail@example.com'."\n".
@@ -2548,8 +2459,7 @@ public function testRFC6350Section6Part7Part5(): void
   </sound>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'SOUND:CID:JOHNQPUBLIC.part8.19960229T080000.xyzMail@example.com'."\n".
@@ -2572,8 +2482,7 @@ public function testRFC6350Section6Part7Part6(): void
   </uid>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'UID:urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6'."\n".
@@ -2597,8 +2506,7 @@ public function testRFC6350Section6Part7Part7(): void
   </clientpidmap>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'CLIENTPIDMAP:1;urn:uuid:3df403f4-5924-4bb7-b077-3c711d9eb34b'."\n".
@@ -2621,8 +2529,7 @@ public function testRFC6350Section6Part7Part8(): void
   </url>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'URL:http://example.org/restaurant.french/~chezchic.html'."\n".
@@ -2641,8 +2548,7 @@ public function testRFC6350Section6Part7Part9(): void
 <vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
  <vcard/>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'END:VCARD'."\n"
@@ -2669,8 +2575,7 @@ public function testRFC6350Section6Part8Part1(): void
   </key>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'KEY;MEDIATYPE=application/pgp-keys:ftp://example.com/keys/jdoe'."\n".
@@ -2698,8 +2603,7 @@ public function testRFC6350Section6Part9Part1(): void
   </fburl>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'FBURL;PREF=1:http://www.example.com/busy/janedoe'."\n".
@@ -2722,8 +2626,7 @@ public function testRFC6350Section6Part9Part2(): void
   </caladruri>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'CALADRURI:http://example.com/calendar/jdoe'."\n".
@@ -2751,8 +2654,7 @@ public function testRFC6350Section6Part9Part3(): void
   </caluri>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'CALURI;PREF=1:http://cal.example.com/calA'."\n".
@@ -2775,8 +2677,7 @@ public function testRFC6350SectionAPart3(): void
   </capuri>
  </vcard>
 </vcards>
-XML
-            ,
+XML,
             'BEGIN:VCARD'."\n".
             'VERSION:4.0'."\n".
             'CAPURI:http://cap.example.com/capA'."\n".