Skip to content

Commit 2333b01

Browse files
jakejohnsmindplay-dk
jakejohns
authored and
mindplay-dk
committed
Fix HEREDOC in tests for php 7.3 (#13)
1 parent f64a843 commit 2333b01

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed

‎tests/integration/SMTPClientCest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function sendSMTPMessage(IntegrationTester $I)
2323

2424
$quoted_body = quoted_printable_encode("Hey, Bar!\r\n\r\nIt's me! Foo!\r\n\r\nHow you been man?\r\n\r\n.\r\n\r\n.foo!\r\n\r\nhehehe :-)\r\n\r\n");
2525

26-
$mime_message = <<<MIME
26+
$mime_message = <<<EOT
2727
Date: Thu, 15 Sep 2016 17:20:54 +0200
2828
To: =?utf-8?q?Rasmus =C3=A5h Schultz?= <blip@test.org>
2929
From: blub@test.org
@@ -33,7 +33,7 @@ public function sendSMTPMessage(IntegrationTester $I)
3333
Content-Transfer-Encoding: quoted-printable
3434
3535
{$quoted_body}
36-
MIME;
36+
EOT;
3737

3838
$client->sendMail(
3939
"from-foo@test.org",

‎tests/integration/SecureSocketCest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function sendSMTPMessageOverSecureSocket(IntegrationTester $I, Scenario $
2525

2626
$quoted_body = quoted_printable_encode("Hey, Bar!\r\n\r\nIt's me! Foo!\r\n\r\nHow you been man?\r\n\r\n.\r\n\r\n.foo!\r\n\r\nhehehe :-)\r\n\r\n");
2727

28-
$mime_message = <<<MIME
28+
$mime_message = <<<EOT
2929
Date: Thu, 15 Sep 2016 17:20:54 +0200
3030
To: =?utf-8?q?Rasmus =C3=A5h Schultz?= <blip@test.org>
3131
From: blub@test.org
@@ -35,7 +35,7 @@ public function sendSMTPMessageOverSecureSocket(IntegrationTester $I, Scenario $
3535
Content-Transfer-Encoding: quoted-printable
3636
3737
{$quoted_body}
38-
MIME;
38+
EOT;
3939

4040
$client->sendMail(
4141
"from-foo@test.org",

‎tests/unit/MIMEWriterCest.php‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function writeTextMessage(UnitTester $I)
5454

5555
$quoted_body = TestMessageFactory::TEXT_BODY_QUOTED_PRINTABLE;
5656

57-
$expected_mime = <<<MIME
57+
$expected_mime = <<<EOT
5858
Date: Thu, 15 Sep 2016 17:20:54 +0200
5959
To: =?UTF-8?Q?Rasmus =C3=A5h Schultz?= <blip@test.org>
6060
From: blub@test.org
@@ -66,7 +66,7 @@ public function writeTextMessage(UnitTester $I)
6666
6767
{$quoted_body}
6868
69-
MIME;
69+
EOT;
7070

7171
$I->assertSame($expected_mime, $this->toMIME($message));
7272
}
@@ -79,7 +79,7 @@ public function writeTextMessageWithAttachment(UnitTester $I)
7979

8080
$quoted_body = TestMessageFactory::TEXT_BODY_QUOTED_PRINTABLE;
8181

82-
$expected_mime = <<<MIME
82+
$expected_mime = <<<EOT
8383
Date: Thu, 15 Sep 2016 17:20:54 +0200
8484
To: =?UTF-8?Q?Rasmus =C3=A5h Schultz?= <blip@test.org>
8585
From: blub@test.org, zoink@test.org
@@ -103,7 +103,7 @@ public function writeTextMessageWithAttachment(UnitTester $I)
103103
{$encoded_attachment}
104104
--++++mixed-03e3b4a304d78659f1a3c0a3cea31a4d73f3a426++++--
105105
106-
MIME;
106+
EOT;
107107

108108
$I->assertSame($expected_mime, $this->toMIME($message));
109109
}
@@ -114,7 +114,7 @@ public function writeHTMLMessage(UnitTester $I)
114114

115115
$quoted_body = TestMessageFactory::HTML_BODY_QUOTED_PRINTABLE;
116116

117-
$expected_mime = <<<MIME
117+
$expected_mime = <<<EOT
118118
Date: Thu, 15 Sep 2016 17:20:54 +0200
119119
To: =?UTF-8?Q?Rasmus =C3=A5h Schultz?= <blip@test.org>
120120
From: blub@test.org
@@ -125,7 +125,7 @@ public function writeHTMLMessage(UnitTester $I)
125125
126126
{$quoted_body}
127127
128-
MIME;
128+
EOT;
129129

130130
$I->assertSame($expected_mime, $this->toMIME($message));
131131
}
@@ -138,7 +138,7 @@ public function writeHTMLMessageWithAttachment(UnitTester $I)
138138

139139
$quoted_body = TestMessageFactory::HTML_BODY_QUOTED_PRINTABLE;
140140

141-
$expected_mime = <<<MIME
141+
$expected_mime = <<<EOT
142142
Date: Thu, 15 Sep 2016 17:20:54 +0200
143143
To: =?UTF-8?Q?Rasmus =C3=A5h Schultz?= <blip@test.org>
144144
From: blub@test.org
@@ -161,7 +161,7 @@ public function writeHTMLMessageWithAttachment(UnitTester $I)
161161
{$encoded_attachment}
162162
--++++mixed-03e3b4a304d78659f1a3c0a3cea31a4d73f3a426++++--
163163
164-
MIME;
164+
EOT;
165165

166166
$I->assertSame($expected_mime, $this->toMIME($message));
167167
}
@@ -173,7 +173,7 @@ public function writeTextAndHTMLMessage(UnitTester $I)
173173
$quoted_text = TestMessageFactory::TEXT_BODY_QUOTED_PRINTABLE;
174174
$quoted_html = TestMessageFactory::HTML_BODY_QUOTED_PRINTABLE;
175175

176-
$expected_mime = <<<MIME
176+
$expected_mime = <<<EOT
177177
Date: Thu, 15 Sep 2016 17:20:54 +0200
178178
To: Rasmus Schultz <blip@test.org>
179179
From: blub@test.org
@@ -193,7 +193,7 @@ public function writeTextAndHTMLMessage(UnitTester $I)
193193
{$quoted_html}
194194
--++++alternative-aaafaf7c286e771e9bd71eacae9f26ae36c9c650++++--
195195
196-
MIME;
196+
EOT;
197197

198198
$I->assertSame($expected_mime, $this->toMIME($message));
199199
}
@@ -208,7 +208,7 @@ public function writeTextAndHTMLMessageWithAttachment(UnitTester $I)
208208

209209
$quoted_html_body = TestMessageFactory::HTML_BODY_QUOTED_PRINTABLE;
210210

211-
$expected_mime = <<<MIME
211+
$expected_mime = <<<EOT
212212
Date: Thu, 15 Sep 2016 17:20:54 +0200
213213
To: =?UTF-8?Q?Rasmus =C3=A5h Schultz?= <blip@test.org>
214214
From: blub@test.org
@@ -240,7 +240,7 @@ public function writeTextAndHTMLMessageWithAttachment(UnitTester $I)
240240
{$encoded_attachment}
241241
--++++mixed-03e3b4a304d78659f1a3c0a3cea31a4d73f3a426++++--
242242
243-
MIME;
243+
EOT;
244244

245245
$I->assertSame($expected_mime, $this->toMIME($message));
246246
}
@@ -258,7 +258,7 @@ public function writeMessageWithMultipleAttachments(UnitTester $I)
258258

259259
$quoted_body = TestMessageFactory::TEXT_BODY_QUOTED_PRINTABLE;
260260

261-
$expected_mime = <<<MIME
261+
$expected_mime = <<<EOT
262262
Date: Thu, 15 Sep 2016 17:20:54 +0200
263263
To: Rasmus Schultz <blip@test.org>
264264
From: blub@test.org
@@ -287,7 +287,7 @@ public function writeMessageWithMultipleAttachments(UnitTester $I)
287287
{$encoded_second_attachment}
288288
--++++mixed-03e3b4a304d78659f1a3c0a3cea31a4d73f3a426++++--
289289
290-
MIME;
290+
EOT;
291291

292292
$I->assertSame($expected_mime, $this->toMIME($message));
293293
}
@@ -296,7 +296,7 @@ public function writeMessageWithMultipleRecipients(UnitTester $I)
296296
{
297297
$message = $this->factory->createMessageWithMultipleRecipients();
298298

299-
$expected_mime = <<<MIME
299+
$expected_mime = <<<EOT
300300
Date: Thu, 15 Sep 2016 17:20:54 +0200
301301
To: Rasmus Schultz <blip@test.org>, Also Rasmus Schultz <also-blip@test.org>
302302
From: blub@test.org
@@ -307,7 +307,7 @@ public function writeMessageWithMultipleRecipients(UnitTester $I)
307307
308308
Hello!
309309
310-
MIME;
310+
EOT;
311311

312312
$I->assertSame($expected_mime, $this->toMIME($message));
313313
}
@@ -316,7 +316,7 @@ public function writeMessageWithCCAndBCCRecipients(UnitTester $I)
316316
{
317317
$message = $this->factory->createMessageWithCCAndBCCRecipients();
318318

319-
$expected_mime = <<<MIME
319+
$expected_mime = <<<EOT
320320
Date: Thu, 15 Sep 2016 17:20:54 +0200
321321
To: blip@test.org
322322
From: blub@test.org
@@ -328,7 +328,7 @@ public function writeMessageWithCCAndBCCRecipients(UnitTester $I)
328328
329329
Hello!
330330
331-
MIME;
331+
EOT;
332332

333333
$I->assertSame($expected_mime, $this->toMIME($message));
334334
}
@@ -337,7 +337,7 @@ public function writeMessageWithCustomHeaders(UnitTester $I)
337337
{
338338
$message = $this->factory->createMessageWithCustomHeaders();
339339

340-
$expected_mime = <<<MIME
340+
$expected_mime = <<<EOT
341341
Date: Thu, 15 Sep 2016 17:20:54 +0200
342342
To: blip@test.org
343343
From: blub@test.org
@@ -349,7 +349,7 @@ public function writeMessageWithCustomHeaders(UnitTester $I)
349349
350350
Hello!
351351
352-
MIME;
352+
EOT;
353353

354354
$I->assertSame($expected_mime, $this->toMIME($message));
355355
}
@@ -362,7 +362,7 @@ public function writeMessageWithInlineAttachment(UnitTester $I)
362362

363363
$encoded_message = TestMessageFactory::HTML_BODY_WITH_INLINE_IMAGE_QP;
364364

365-
$expected_mime = <<<MIME
365+
$expected_mime = <<<EOT
366366
Date: Thu, 15 Sep 2016 17:20:54 +0200
367367
To: blip@test.org
368368
From: blub@test.org
@@ -384,7 +384,7 @@ public function writeMessageWithInlineAttachment(UnitTester $I)
384384
{$encoded_inline_attachment}
385385
--++++related-39b004dfb8671932b47924cc47958a54d3b4524e++++--
386386
387-
MIME;
387+
EOT;
388388

389389
$I->assertSame($expected_mime, $this->toMIME($message));
390390
}
@@ -399,7 +399,7 @@ public function writeMessageWithInlineAttachmentAndTextAlternative(UnitTester $I
399399

400400
$encoded_alt_message = TestMessageFactory::TEXT_BODY_QUOTED_PRINTABLE;
401401

402-
$expected_mime = <<<MIME
402+
$expected_mime = <<<EOT
403403
Date: Thu, 15 Sep 2016 17:20:54 +0200
404404
To: blip@test.org
405405
From: blub@test.org
@@ -430,7 +430,7 @@ public function writeMessageWithInlineAttachmentAndTextAlternative(UnitTester $I
430430
{$encoded_inline_attachment}
431431
--++++related-39b004dfb8671932b47924cc47958a54d3b4524e++++--
432432
433-
MIME;
433+
EOT;
434434

435435
$I->assertSame($expected_mime, $this->toMIME($message));
436436
}
@@ -445,7 +445,7 @@ public function writeMessageWithInlineAndRegularAttachments(UnitTester $I)
445445

446446
$encoded_attachment = TestMessageFactory::TEXT_BODY_BASE64;
447447

448-
$expected_mime = <<<MIME
448+
$expected_mime = <<<EOT
449449
Date: Thu, 15 Sep 2016 17:20:54 +0200
450450
To: blip@test.org
451451
From: blub@test.org
@@ -479,7 +479,7 @@ public function writeMessageWithInlineAndRegularAttachments(UnitTester $I)
479479
{$encoded_inline_attachment}
480480
--++++related-39b004dfb8671932b47924cc47958a54d3b4524e++++--
481481
482-
MIME;
482+
EOT;
483483

484484
$I->assertSame($expected_mime, $this->toMIME($message));
485485
}
@@ -496,7 +496,7 @@ public function writeMessageWithInlineAndRegularAttachmentsAndTextAlternative(Un
496496

497497
$encoded_alt_message = TestMessageFactory::TEXT_BODY_QUOTED_PRINTABLE;
498498

499-
$expected_mime = <<<MIME
499+
$expected_mime = <<<EOT
500500
Date: Thu, 15 Sep 2016 17:20:54 +0200
501501
To: blip@test.org
502502
From: blub@test.org
@@ -539,7 +539,7 @@ public function writeMessageWithInlineAndRegularAttachmentsAndTextAlternative(Un
539539
{$encoded_inline_attachment}
540540
--++++related-39b004dfb8671932b47924cc47958a54d3b4524e++++--
541541
542-
MIME;
542+
EOT;
543543

544544
$I->assertSame($expected_mime, $this->toMIME($message));
545545
}

0 commit comments

Comments
 (0)