Wrap lines at 72

Author: phpfui

examples/simpleevent.php

@@ -51,4 +51,4 @@
 // write iCalendar feed to stdout
 echo $icalobj->export();
 
-file_put_contents('simpleEvent.ics', $icalobj->export());
+\file_put_contents('simpleEvent.ics', $icalobj->export());

src/ICalendarOrg/ZCRecurringDate.php

@@ -423,7 +423,6 @@ public function debug(int $level, string $msg) : self
 	 */
 	public function getDates(?int $maxdate = null) : array
 		{
-		//$this->debug = 2;
 		self::debug(1, 'getDates()');
 		$nextdate = $enddate = $this->startdate;
 		$rdates = [];
@@ -703,7 +702,6 @@ private function byDay(int $startdate, int $enddate, array &$rdates, string $tzi
 								{
 								$rdates[] = $wdate;
 								$count++;
-								//break;
 								}
 							}
 						}

src/ICalendarOrg/ZCiCalDataNode.php

@@ -75,7 +75,6 @@ public function __construct(string $line)
 			{
 			$value = \str_replace('`~', '\\:', \substr($line, $i + 1));
 			// fix escaped characters (don't see double quotes in spec but Apple apparently uses it in iCal)
-//			$value = \str_replace(['\\N', '\\n', '\\"'], ["\n", "\n", '"'], $value);
 			$tvalue = \str_replace('\\,', '`~', $value);
 			$tvalue = \explode(',', $tvalue);
 			$value = \str_replace('`~', '\\,', $tvalue);
@@ -126,21 +125,24 @@ public function __toString() : string
 			$output .= ':' . $this->getValues();
 			}
 
-		$final = $output;
+		$final = '';
 
-		if (\strlen($final) > 70)
+		$parts = \explode("\n", $output);
+
+		foreach ($parts as $index => $value)
 			{
-			$final = '';
+			$part = '';
 
-			while (\strlen($output) > 70)
+			while (\strlen($value) > 70)
 				{
-				$final = $final . \substr($output, 0, 67) . " \r\n";
-				$output = \substr($output, 67);
+				$part = $part . \substr($value, 0, 67) . " \r\n";
+				$value = \substr($value, 67);
 				}
-			$final .= $output;
+			$part .= $value;
+			$parts[$index] = $part;
 			}
 
-		return $final . "\r\n";
+		return \implode("\n", $parts) . "\r\n";
 		}
 
 	/**

src/ICalendarOrg/ZCiCalNode.php

@@ -143,7 +143,6 @@ public function export(?ZCiCalNode $node = null, int $level = 0) : string
 
 		if ($level > 5)
 			{
-			//die("levels nested too deep<br/>\n");
 			throw new \Exception('levels nested too deep');
 			}
 		$txtstr .= 'BEGIN:' . $node->getName() . "\r\n";
@@ -257,7 +256,6 @@ public function printTree(?ZCiCalNode $node = null, int $level = 1) : string
 		if ($level > 5)
 			{
 			exit("levels nested too deep<br/>\n");
-			//return;
 			}
 
 		for ($i = 0; $i < $level; $i++)

tests/ZCiCalDataNodeTest.php

@@ -18,7 +18,7 @@ public function testZCiCalDataNode(string $line) : void
 		{
 		$dataNode = new \ICalendarOrg\ZCiCalDataNode($line);
 		$generated = "{$dataNode}";
-		$this->assertEquals($line . "\n", $generated, $line . ' has an error');
+		$this->assertEquals($line . "\r\n", $generated, $line . ' has an error');
 		}
 
 	/**
@@ -30,11 +30,11 @@ public function providerZCiCalDataNode() : array
 		{
 		return [
 			['ACTION:AUDIO'],
-			['ATTACH;FMTTYPE=application/postscript:ftp://example.com/pub/conf/bkgrnd.ps'],
-			['ATTACH;FMTTYPE=audio/basic:http://example.com/pub/audio-files/ssbanner.aud'],
+			['ATTACH;FMTTYPE=application/postscript:ftp://example.com/pub/bkgrnd.ps'],
+			['ATTACH;FMTTYPE=audio/basic:http://example.com/pub/ssbanner.aud'],
 			['ATTENDEE;PARTSTAT=ACCEPTED:mailto:[email protected]'],
 			['ATTENDEE;RSVP=TRUE:mailto:[email protected]'],
-			['ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:mailto:employee-A@example.com'],
+			['ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:mailto:a@ex.com'],
 			['CATEGORIES:CONFERENCE'],
 			['CATEGORIES:MEETING'],
 			['CATEGORIES:MEETING,PROJECT'],
@@ -53,9 +53,11 @@ public function providerZCiCalDataNode() : array
 2. Definitionof project processes.
 3. Review of project schedule.
 Participants: John Smith, Jane Doe, Jim Dandy
--It was decided that the requirements need to be signed off by product marketing.
+-It was decided that the requirements need to be signed off by
+	product marketing.
 -Project processes were accepted.
--Project schedule needs to account for scheduled holidays and employee vacation time. Check with HR for specific dates.
+-Project schedule needs to account for scheduled holidays and
+	employee vacation time. Check with HR for specific dates.
 -New schedule will be distributed by Friday.
 -Next weeks meeting is cancelled. No meeting until 3/23.'],
 			['DTEND:19960920T220000Z'],