Skip to content

Commit 71ec62d

Browse files
committed
Fix unit tests
Signed-off-by: danielabyan <danielabyan@gmail.com>
1 parent db9f30f commit 71ec62d

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

test/Header/SubjectTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use PHPUnit\Framework\TestCase;
88

99
use function str_repeat;
10-
use function wordwrap;
1110

1211
/**
1312
* @group Laminas_Mail
@@ -21,7 +20,10 @@ public function testHeaderFolding(): void
2120
$subject = new Header\Subject();
2221
$subject->setSubject($string);
2322

24-
$expected = wordwrap($string, 78, "\r\n ");
23+
$expected = "foobarblahblahblah baz batfoobarblahblahblah baz\r\n "
24+
. "batfoobarblahblahblah baz batfoobarblahblahblah baz batfoobarblahblahblah baz\r\n "
25+
. "batfoobarblahblahblah baz batfoobarblahblahblah baz batfoobarblahblahblah baz\r\n "
26+
. "batfoobarblahblahblah baz batfoobarblahblahblah baz bat";
2527
$test = $subject->getFieldValue(Header\HeaderInterface::FORMAT_ENCODED);
2628
$this->assertEquals($expected, $test);
2729
}

test/MessageTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -884,8 +884,8 @@ public function testMessageSubjectFromString(): void
884884
$mail = Message::fromString($rawMessage);
885885

886886
$this->assertStringContainsString(
887-
'Subject: =?UTF-8?Q?Non=20=E2=80=9Cascii=E2=80=9D=20characters=20like=20accented=20?=' . "\r\n"
888-
. ' =?UTF-8?Q?vowels=20=C3=B2=C3=A0=C3=B9=C3=A8=C3=A9=C3=AC?=' . "\r\n",
887+
'Subject: =?UTF-8?Q?Non=20=E2=80=9Cascii=E2=80=9D=20characters=20like=20?=' . "\r\n"
888+
. ' =?UTF-8?Q?accented=20vowels=20=C3=B2=C3=A0=C3=B9=C3=A8=C3=A9=C3=AC?=' . "\r\n",
889889
$mail->toString()
890890
);
891891
}
@@ -896,8 +896,8 @@ public function testMessageSubjectSetSubject(): void
896896
$mail->setSubject('Non “ascii” characters like accented vowels òàùèéì');
897897

898898
$this->assertStringContainsString(
899-
'Subject: =?UTF-8?Q?Non=20=E2=80=9Cascii=E2=80=9D=20characters=20like=20accented=20?=' . "\r\n"
900-
. ' =?UTF-8?Q?vowels=20=C3=B2=C3=A0=C3=B9=C3=A8=C3=A9=C3=AC?=' . "\r\n",
899+
'Subject: =?UTF-8?Q?Non=20=E2=80=9Cascii=E2=80=9D=20characters=20like=20?=' . "\r\n"
900+
. ' =?UTF-8?Q?accented=20vowels=20=C3=B2=C3=A0=C3=B9=C3=A8=C3=A9=C3=AC?=' . "\r\n",
901901
$mail->toString()
902902
);
903903
}
@@ -909,8 +909,8 @@ public function testCorrectHeaderEncodingAddHeader(): void
909909
$mail->getHeaders()->addHeader($header);
910910

911911
$this->assertStringContainsString(
912-
'X-Test: =?UTF-8?Q?Non=20=E2=80=9Cascii=E2=80=9D=20characters=20like=20accented=20?=' . "\r\n"
913-
. ' =?UTF-8?Q?vowels=20=C3=B2=C3=A0=C3=B9=C3=A8=C3=A9=C3=AC?=' . "\r\n",
912+
'X-Test: =?UTF-8?Q?Non=20=E2=80=9Cascii=E2=80=9D=20characters=20like=20?=' . "\r\n"
913+
. ' =?UTF-8?Q?accented=20vowels=20=C3=B2=C3=A0=C3=B9=C3=A8=C3=A9=C3=AC?=' . "\r\n",
914914
$mail->toString()
915915
);
916916
}
@@ -924,8 +924,8 @@ public function testCorrectHeaderEncodingSetHeaders(): void
924924
$mail->setHeaders($headers);
925925

926926
$this->assertStringContainsString(
927-
'X-Test: =?UTF-8?Q?Non=20=E2=80=9Cascii=E2=80=9D=20characters=20like=20accented=20?=' . "\r\n"
928-
. ' =?UTF-8?Q?vowels=20=C3=B2=C3=A0=C3=B9=C3=A8=C3=A9=C3=AC?=' . "\r\n",
927+
'X-Test: =?UTF-8?Q?Non=20=E2=80=9Cascii=E2=80=9D=20characters=20like=20?=' . "\r\n"
928+
. ' =?UTF-8?Q?accented=20vowels=20=C3=B2=C3=A0=C3=B9=C3=A8=C3=A9=C3=AC?=' . "\r\n",
929929
$mail->toString()
930930
);
931931
}
@@ -939,8 +939,8 @@ public function testCorrectHeaderEncodingFromString(): void
939939
$mail->getHeaders()->addHeader($header);
940940

941941
$this->assertStringContainsString(
942-
'X-Test: =?UTF-8?Q?Non=20=E2=80=9Cascii=E2=80=9D=20characters=20like=20accented=20?=' . "\r\n"
943-
. ' =?UTF-8?Q?vowels=20=C3=B2=C3=A0=C3=B9=C3=A8=C3=A9=C3=AC?=' . "\r\n",
942+
'X-Test: =?UTF-8?Q?Non=20=E2=80=9Cascii=E2=80=9D=20characters=20like=20?=' . "\r\n"
943+
. ' =?UTF-8?Q?accented=20vowels=20=C3=B2=C3=A0=C3=B9=C3=A8=C3=A9=C3=AC?=',
944944
$mail->toString()
945945
);
946946
}
@@ -957,8 +957,8 @@ public function testCorrectHeaderEncodingFromStringAndSetHeaders(): void
957957
$mail->setHeaders($headers);
958958

959959
$this->assertStringContainsString(
960-
'X-Test: =?UTF-8?Q?Non=20=E2=80=9Cascii=E2=80=9D=20characters=20like=20accented=20?=' . "\r\n"
961-
. ' =?UTF-8?Q?vowels=20=C3=B2=C3=A0=C3=B9=C3=A8=C3=A9=C3=AC?=' . "\r\n",
960+
'X-Test: =?UTF-8?Q?Non=20=E2=80=9Cascii=E2=80=9D=20characters=20like=20?=' . "\r\n"
961+
. ' =?UTF-8?Q?accented=20vowels=20=C3=B2=C3=A0=C3=B9=C3=A8=C3=A9=C3=AC?=',
962962
$mail->toString()
963963
);
964964
}

0 commit comments

Comments
 (0)