Skip to content

Commit 1944d33

Browse files
committed
Revert "MimePart: line length limit changed to 500" [Closes #72]
This reverts commit 856c152.
1 parent b4027a0 commit 1944d33

8 files changed

+50
-35
lines changed

src/Mail/MimePart.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class MimePart
3232
/** @internal */
3333
public const EOL = "\r\n";
3434

35-
public const LINE_LENGTH = 500;
35+
public const LINE_LENGTH = 76;
3636

3737
/** @var array */
3838
private $headers = [];

tests/Mail/Mail.attachment.phpt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ Content-Type: application/zip
3939
Content-Transfer-Encoding: base64
4040
Content-Disposition: attachment; filename="example.zip"
4141
42-
UEsDBBQAAAAIACeIMjsmkSpnQAAAAEEAAAALAAAAdmVyc2lvbi50eHTzSy0pSVVwK0rMTS3PL8pWMNCz1DNU0ChKLcsszszPU0hJNjMwTzNQKErNSU0sTk1RAIoZGRhY6gKRoYUmLxcAUEsBAhQAFAAAAAgAJ4gyOyaRKmdAAAAAQQAAAAsAAAAAAAAAAAAgAAAAAAAAAHZlcnNpb24udHh0UEsFBgAAAAABAAEAOQAAAGkAAAAAAA==
42+
UEsDBBQAAAAIACeIMjsmkSpnQAAAAEEAAAALAAAAdmVyc2lvbi50eHTzSy0pSVVwK0rMTS3PL8pW
43+
MNCz1DNU0ChKLcsszszPU0hJNjMwTzNQKErNSU0sTk1RAIoZGRhY6gKRoYUmLxcAUEsBAhQAFAAA
44+
AAgAJ4gyOyaRKmdAAAAAQQAAAAsAAAAAAAAAAAAgAAAAAAAAAHZlcnNpb24udHh0UEsFBgAAAAAB
45+
AAEAOQAAAGkAAAAAAA==
4346
----------%S%--
4447
EOD
4548
, TestMailer::$output);
@@ -97,14 +100,17 @@ Content-Type: application/zip
97100
Content-Transfer-Encoding: base64
98101
Content-Disposition: attachment; filename="%S?%"
99102
100-
UEsDBBQAAAAIACeIMjsmkSpnQAAAAEEAAAALAAAAdmVyc2lvbi50eHTzSy0pSVVwK0rMTS3PL8pWMNCz1DNU0ChKLcsszszPU0hJNjMwTzNQKErNSU0sTk1RAIoZGRhY6gKRoYUmLxcAUEsBAhQAFAAAAAgAJ4gyOyaRKmdAAAAAQQAAAAsAAAAAAAAAAAAgAAAAAAAAAHZlcnNpb24udHh0UEsFBgAAAAABAAEAOQAAAGkAAAAAAA==
103+
UEsDBBQAAAAIACeIMjsmkSpnQAAAAEEAAAALAAAAdmVyc2lvbi50eHTzSy0pSVVwK0rMTS3PL8pW
104+
MNCz1DNU0ChKLcsszszPU0hJNjMwTzNQKErNSU0sTk1RAIoZGRhY6gKRoYUmLxcAUEsBAhQAFAAA
105+
AAgAJ4gyOyaRKmdAAAAAQQAAAAsAAAAAAAAAAAAgAAAAAAAAAHZlcnNpb24udHh0UEsFBgAAAAAB
106+
AAEAOQAAAGkAAAAAAA==
101107
----------%S%--
102108
EOD
103109
, TestMailer::$output);
104110

105111

106112
$mail = new Message;
107-
$mail->addAttachment(str_repeat('veryvery', 70) . 'longnazvu-dokumentu.zip', file_get_contents(__DIR__ . '/fixtures/example.zip'), 'application/zip');
113+
$mail->addAttachment('lorem-ipsum-dlouhy-text-nazvu-pdf-dokumentu.zip', file_get_contents(__DIR__ . '/fixtures/example.zip'), 'application/zip');
108114
$mailer->send($mail);
109115

110116
Assert::match(<<<'EOD'
@@ -124,7 +130,7 @@ Content-Transfer-Encoding: 7bit
124130
Content-Type: application/zip
125131
Content-Transfer-Encoding: base64
126132
Content-Disposition: attachment; filename=
127-
"veryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryverylongnazvu-dokumentu.zip"
133+
"lorem-ipsum-dlouhy-text-nazvu-pdf-dokumentu.zip"
128134
129135
%A%
130136
----------%S%--

tests/Mail/Mail.email.long.phpt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ require __DIR__ . '/Mail.php';
1717

1818
$mail = new Message;
1919

20-
$mail->addTo(str_repeat('veryvery', 70) . 'longemail@example.com');
20+
$mail->addTo('veryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryverylongemail@example.com');
2121

22-
$mail->addCc(str_repeat('veryvery', 70) . 'longemail@example.com', 'John Doe');
22+
$mail->addCc('veryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryverylongemail@example.com', 'John Doe');
2323

24-
$mail->addBcc(str_repeat('veryvery', 70) . 'long name <' . str_repeat('veryvery', 70) . 'longemail@example.com>');
24+
$mail->addBcc('veryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryverylong name <veryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryverylongemail@example.com>');
2525

2626
$mailer = new TestMailer;
2727
$mailer->send($mail);
@@ -30,11 +30,11 @@ Assert::match(<<<'EOD'
3030
MIME-Version: 1.0
3131
X-Mailer: Nette Framework
3232
Date: %a%
33-
To: veryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryverylongemail@example.com
33+
To: veryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryverylongemail@example.com
3434
Cc: John Doe
35-
<veryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryverylongemail@example.com>
36-
Bcc: veryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryverylong name
37-
<veryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryverylongemail@example.com>
35+
<veryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryverylongemail@example.com>
36+
Bcc: veryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryverylong name
37+
<veryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryverylongemail@example.com>
3838
Message-ID: <%a%@%a%>
3939
Content-Type: text/plain; charset=UTF-8
4040
Content-Transfer-Encoding: 7bit

tests/Mail/Mail.email.phpt

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,6 @@ $mail->addReplyTo('[email protected]', 'John Doe');
2424

2525
$mail->addTo('Žluťoučký "kůň" <[email protected]>');
2626
$mail->addTo('[email protected]', "John 'jd' Doe");
27-
$mail->addTo('[email protected]', "John 'jd' Doe");
28-
$mail->addTo('[email protected]', "John 'jd' Doe");
29-
$mail->addTo('[email protected]', "John 'jd' Doe");
30-
$mail->addTo('[email protected]', "John 'jd' Doe");
31-
$mail->addTo('[email protected]', "John 'jd' Doe");
32-
$mail->addTo('[email protected]', "John 'jd' Doe");
33-
$mail->addTo('[email protected]', "John 'jd' Doe");
34-
$mail->addTo('[email protected]', "John 'jd' Doe");
35-
$mail->addTo('[email protected]', "John 'jd' Doe");
36-
$mail->addTo('[email protected]', "John 'jd' Doe");
37-
$mail->addTo('[email protected]', "John 'jd' Doe");
38-
$mail->addTo('[email protected]', "John 'jd' Doe");
39-
$mail->addTo('[email protected]', "John 'jd' Doe");
4027

4128
$mail->addCc('The\Mail <[email protected]>');
4229
$mail->addCc('[email protected]', 'John Doe');
@@ -55,11 +42,14 @@ MIME-Version: 1.0
5542
X-Mailer: Nette Framework
5643
Date: %a%
5744
From: =?UTF-8?B?xb1sdcWlb3XEjWvDvSBrxa/FiA==?= <[email protected]>
58-
Reply-To: =?UTF-8?B?xb1sdcWlb3XEjWvDvSBrxa/FiA==?= <[email protected]>,John Doe <[email protected]>
59-
To: =?UTF-8?B?xb1sdcWlb3XEjWvDvSAia8WvxYgi?= <[email protected]>,John 'jd' Doe <[email protected]>,John 'jd' Doe <[email protected]>,John 'jd' Doe <[email protected]>,John 'jd' Doe <[email protected]>,John 'jd' Doe <[email protected]>,John 'jd' Doe <[email protected]>,John 'jd' Doe <[email protected]>,John 'jd' Doe <[email protected]>,John 'jd' Doe <[email protected]>,John 'jd' Doe <[email protected]>,John 'jd' Doe <[email protected]>,John 'jd' Doe <[email protected]>,John 'jd' Doe
60-
61-
Cc: TheMail <[email protected]>,John Doe <[email protected]>,"The.Mail" <[email protected]>
62-
Bcc: =?UTF-8?B?xb1sdcWlb3XEjWvDvSBrxa/FiA==?= <[email protected]>,[email protected]
45+
Reply-To: =?UTF-8?B?xb1sdcWlb3XEjWvDvSBrxa/FiA==?= <[email protected]>,
46+
John Doe <[email protected]>
47+
To: =?UTF-8?B?xb1sdcWlb3XEjWvDvSAia8WvxYgi?= <[email protected]>,
48+
John 'jd' Doe <[email protected]>
49+
Cc: TheMail <[email protected]>,John Doe <[email protected]>,"The.Mail"
50+
51+
Bcc: =?UTF-8?B?xb1sdcWlb3XEjWvDvSBrxa/FiA==?= <[email protected]>,
52+
6353
Return-Path: [email protected]
6454
Message-ID: <%a%@%a%>
6555
Content-Type: text/plain; charset=UTF-8

tests/Mail/Mail.textualAndHtmlBody.attachment.expect

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,8 @@ Content-Type: application/zip
2828
Content-Transfer-Encoding: base64
2929
Content-Disposition: attachment; filename="example.zip"
3030

31-
UEsDBBQAAAAIACeIMjsmkSpnQAAAAEEAAAALAAAAdmVyc2lvbi50eHTzSy0pSVVwK0rMTS3PL8pWMNCz1DNU0ChKLcsszszPU0hJNjMwTzNQKErNSU0sTk1RAIoZGRhY6gKRoYUmLxcAUEsBAhQAFAAAAAgAJ4gyOyaRKmdAAAAAQQAAAAsAAAAAAAAAAAAgAAAAAAAAAHZlcnNpb24udHh0UEsFBgAAAAABAAEAOQAAAGkAAAAAAA==
31+
UEsDBBQAAAAIACeIMjsmkSpnQAAAAEEAAAALAAAAdmVyc2lvbi50eHTzSy0pSVVwK0rMTS3PL8pW
32+
MNCz1DNU0ChKLcsszszPU0hJNjMwTzNQKErNSU0sTk1RAIoZGRhY6gKRoYUmLxcAUEsBAhQAFAAA
33+
AAgAJ4gyOyaRKmdAAAAAQQAAAAsAAAAAAAAAAAAgAAAAAAAAAHZlcnNpb24udHh0UEsFBgAAAAAB
34+
AAEAOQAAAGkAAAAAAA==
3235
----------%S%--

tests/Mail/Mail.textualAndHtmlBody.embedded.attachment.expect

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,21 @@ Content-Transfer-Encoding: base64
3232
Content-Disposition: inline; filename="background.png"
3333
Content-ID: <%S%>
3434

35-
iVBORw0KGgoAAAANSUhEUgAABAAAAAAGCAMAAABq1Ry/AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADlQTFRFIYzeKYzeMZTeOZTeQpTeQpzeSpzeUpzeY6Xee73nhL3nlMbnnMbnrc7nvdbvxt7v1ufv5+fv7+/vqVk59gAAAKFJREFUeNrsmMEKgzAQRHcTq63WJPr/H9ska4vQ2rOG5+CEgT0JPiYrqiKiJue723Afp+ccQlqWFSHUtqQCQCoFVF0BwCMDYI4p8XUQal3269ubAeB7A0CI1gBWDMMattIA1BBQAdC9G0DcrgAfVuwPDMOaMHGqtgEo5o8bwDcKiETi1aP4QoDtyQWgtyXgbgdwzIDfxeBfYphhhk81/BJgAHfwneqeqMofAAAAAElFTkSuQmCC
35+
iVBORw0KGgoAAAANSUhEUgAABAAAAAAGCAMAAABq1Ry/AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
36+
bWFnZVJlYWR5ccllPAAAADlQTFRFIYzeKYzeMZTeOZTeQpTeQpzeSpzeUpzeY6Xee73nhL3nlMbn
37+
nMbnrc7nvdbvxt7v1ufv5+fv7+/vqVk59gAAAKFJREFUeNrsmMEKgzAQRHcTq63WJPr/H9ska4vQ
38+
2rOG5+CEgT0JPiYrqiKiJue723Afp+ccQlqWFSHUtqQCQCoFVF0BwCMDYI4p8XUQal3269ubAeB7
39+
A0CI1gBWDMMattIA1BBQAdC9G0DcrgAfVuwPDMOaMHGqtgEo5o8bwDcKiETi1aP4QoDtyQWgtyXg
40+
bgdwzIDfxeBfYphhhk81/BJgAHfwneqeqMofAAAAAElFTkSuQmCC
3641
----------%S%--
3742
----------%S%--
3843
----------%S%
3944
Content-Type: application/%S%
4045
Content-Transfer-Encoding: base64
4146
Content-Disposition: attachment; filename="example.zip"
4247

43-
UEsDBBQAAAAIACeIMjsmkSpnQAAAAEEAAAALAAAAdmVyc2lvbi50eHTzSy0pSVVwK0rMTS3PL8pWMNCz1DNU0ChKLcsszszPU0hJNjMwTzNQKErNSU0sTk1RAIoZGRhY6gKRoYUmLxcAUEsBAhQAFAAAAAgAJ4gyOyaRKmdAAAAAQQAAAAsAAAAAAAAAAAAgAAAAAAAAAHZlcnNpb24udHh0UEsFBgAAAAABAAEAOQAAAGkAAAAAAA==
48+
UEsDBBQAAAAIACeIMjsmkSpnQAAAAEEAAAALAAAAdmVyc2lvbi50eHTzSy0pSVVwK0rMTS3PL8pW
49+
MNCz1DNU0ChKLcsszszPU0hJNjMwTzNQKErNSU0sTk1RAIoZGRhY6gKRoYUmLxcAUEsBAhQAFAAA
50+
AAgAJ4gyOyaRKmdAAAAAQQAAAAsAAAAAAAAAAAAgAAAAAAAAAHZlcnNpb24udHh0UEsFBgAAAAAB
51+
AAEAOQAAAGkAAAAAAA==
4452
----------%S%--

tests/Mail/Mail.textualAndHtmlBody.embedded.expect

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ Content-Transfer-Encoding: base64
3333
Content-Disposition: inline; filename="background.png"
3434
Content-ID: <%S%>
3535

36-
iVBORw0KGgoAAAANSUhEUgAABAAAAAAGCAMAAABq1Ry/AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADlQTFRFIYzeKYzeMZTeOZTeQpTeQpzeSpzeUpzeY6Xee73nhL3nlMbnnMbnrc7nvdbvxt7v1ufv5+fv7+/vqVk59gAAAKFJREFUeNrsmMEKgzAQRHcTq63WJPr/H9ska4vQ2rOG5+CEgT0JPiYrqiKiJue723Afp+ccQlqWFSHUtqQCQCoFVF0BwCMDYI4p8XUQal3269ubAeB7A0CI1gBWDMMattIA1BBQAdC9G0DcrgAfVuwPDMOaMHGqtgEo5o8bwDcKiETi1aP4QoDtyQWgtyXgbgdwzIDfxeBfYphhhk81/BJgAHfwneqeqMofAAAAAElFTkSuQmCC
36+
iVBORw0KGgoAAAANSUhEUgAABAAAAAAGCAMAAABq1Ry/AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
37+
bWFnZVJlYWR5ccllPAAAADlQTFRFIYzeKYzeMZTeOZTeQpTeQpzeSpzeUpzeY6Xee73nhL3nlMbn
38+
nMbnrc7nvdbvxt7v1ufv5+fv7+/vqVk59gAAAKFJREFUeNrsmMEKgzAQRHcTq63WJPr/H9ska4vQ
39+
2rOG5+CEgT0JPiYrqiKiJue723Afp+ccQlqWFSHUtqQCQCoFVF0BwCMDYI4p8XUQal3269ubAeB7
40+
A0CI1gBWDMMattIA1BBQAdC9G0DcrgAfVuwPDMOaMHGqtgEo5o8bwDcKiETi1aP4QoDtyQWgtyXg
41+
bgdwzIDfxeBfYphhhk81/BJgAHfwneqeqMofAAAAAElFTkSuQmCC
3742
----------%S%--
3843
----------%S%--

tests/Mail/Mail.textualBody.attachment.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ Content-Type: application/zip
4949
Content-Transfer-Encoding: base64
5050
Content-Disposition: attachment; filename="example.zip"
5151
52-
UEsDBBQAAAAIACeIMjsmkSpnQAAAAEEAAAALAAAAdmVyc2lvbi50eHTzSy0pSVVwK0rMTS3PL8pWMNCz1DNU0ChKLcsszszPU0hJNjMwTzNQKErNSU0sTk1RAIoZGRhY6gKRoYUmLxcAUEsBAhQAFAAAAAgAJ4gyOyaRKmdAAAAAQQAAAAsAAAAAAAAAAAAgAAAAAAAAAHZlcnNpb24udHh0UEsFBgAAAAABAAEAOQAAAGkAAAAAAA==
52+
UEsDBBQAAAAIACeIMjsmkSpnQAAAAEEAAAALAAAAdmVyc2lvbi50eHTzSy0pSVVwK0rMTS3PL8pW
53+
MNCz1DNU0ChKLcsszszPU0hJNjMwTzNQKErNSU0sTk1RAIoZGRhY6gKRoYUmLxcAUEsBAhQAFAAA
54+
AAgAJ4gyOyaRKmdAAAAAQQAAAAsAAAAAAAAAAAAgAAAAAAAAAHZlcnNpb24udHh0UEsFBgAAAAAB
55+
AAEAOQAAAGkAAAAAAA==
5356
----------%S%--
5457
EOD
5558
, TestMailer::$output);

0 commit comments

Comments
 (0)