Skip to content
This repository was archived by the owner on Apr 8, 2024. It is now read-only.

Commit 35ccf62

Browse files
ssfinneyssfinney
committed
Revert "Fix nitpick"
This reverts commit f692f71.
1 parent f692f71 commit 35ccf62

File tree

1 file changed

+28
-77
lines changed

1 file changed

+28
-77
lines changed

‎src/MailTracking.php‎

Lines changed: 28 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,8 @@ public function recordMail(Swift_Message $email)
118118
*/
119119
protected function seeEmailBcc($bcc, Swift_Message $message = null)
120120
{
121-
$this->assertArrayHasKey(
122-
$bcc,
123-
(array)$this->getEmail($message)
124-
->getBcc(),
125-
"The last email sent was not bcc'ed to $bcc."
126-
);
121+
$this->assertArrayHasKey($bcc, (array)$this->getEmail($message)
122+
->getBcc(), "The last email sent was not bcc'ed to $bcc.");
127123

128124
return $this;
129125
}
@@ -138,12 +134,8 @@ protected function seeEmailBcc($bcc, Swift_Message $message = null)
138134
*/
139135
protected function seeEmailCc($cc, Swift_Message $message = null)
140136
{
141-
$this->assertArrayHasKey(
142-
$cc,
143-
(array)$this->getEmail($message)
144-
->getCc(),
145-
"The last email sent was not cc'ed to $cc."
146-
);
137+
$this->assertArrayHasKey($cc, (array)$this->getEmail($message)
138+
->getCc(), "The last email sent was not cc'ed to $cc.");
147139

148140
return $this;
149141
}
@@ -158,12 +150,8 @@ protected function seeEmailCc($cc, Swift_Message $message = null)
158150
*/
159151
protected function seeEmailContains($excerpt, Swift_Message $message = null)
160152
{
161-
$this->assertStringContainsString(
162-
$excerpt,
163-
$this->getEmail($message)
164-
->getBody(),
165-
"The last email sent did not contain the provided body."
166-
);
153+
$this->assertStringContainsString($excerpt, $this->getEmail($message)
154+
->getBody(), "The last email sent did not contain the provided body.");
167155

168156
return $this;
169157
}
@@ -179,12 +167,9 @@ protected function seeEmailContains($excerpt, Swift_Message $message = null)
179167
*/
180168
protected function seeEmailContentTypeEquals($content_type, Swift_Message $message = null)
181169
{
182-
$this->assertEquals(
183-
$content_type,
184-
$this->getEmail($message)
185-
->getContentType(),
186-
"The last email sent did not contain the provided body."
187-
);
170+
$this->assertEquals($content_type, $this->getEmail($message)
171+
->getContentType(),
172+
"The last email sent did not contain the provided body.");
188173

189174
return $this;
190175
}
@@ -199,12 +184,8 @@ protected function seeEmailContentTypeEquals($content_type, Swift_Message $messa
199184
*/
200185
protected function seeEmailDoesNotContain($excerpt, Swift_Message $message = null)
201186
{
202-
$this->assertStringNotContainsString(
203-
$excerpt,
204-
$this->getEmail($message)
205-
->getBody(),
206-
"The last email sent contained the provided text in its body."
207-
);
187+
$this->assertStringNotContainsString($excerpt, $this->getEmail($message)
188+
->getBody(), "The last email sent contained the provided text in its body.");
208189

209190
return $this;
210191
}
@@ -219,12 +200,8 @@ protected function seeEmailDoesNotContain($excerpt, Swift_Message $message = nul
219200
*/
220201
protected function seeEmailEquals($body, Swift_Message $message = null)
221202
{
222-
$this->assertEquals(
223-
$body,
224-
$this->getEmail($message)
225-
->getBody(),
226-
"The last email sent did not match the given email."
227-
);
203+
$this->assertEquals($body, $this->getEmail($message)
204+
->getBody(), "The last email sent did not match the given email.");
228205

229206
return $this;
230207
}
@@ -240,12 +217,8 @@ protected function seeEmailEquals($body, Swift_Message $message = null)
240217
protected function seeEmailFrom($sender, Swift_Message $message = null)
241218
{
242219
// TODO: Allow from to be an array to check email & name
243-
$this->assertArrayHasKey(
244-
$sender,
245-
(array)$this->getEmail($message)
246-
->getFrom(),
247-
"The last email sent was not sent from $sender."
248-
);
220+
$this->assertArrayHasKey($sender, (array)$this->getEmail($message)
221+
->getFrom(), "The last email sent was not sent from $sender.");
249222

250223
return $this;
251224
}
@@ -264,11 +237,8 @@ protected function seeEmailPriorityEquals($priority, Swift_Message $message = nu
264237
$actual_priority = $this->getEmail($message)
265238
->getPriority();
266239

267-
$this->assertEquals(
268-
$priority,
269-
$actual_priority,
270-
"The last email sent had a priority of $actual_priority but expected $priority."
271-
);
240+
$this->assertEquals($priority, $actual_priority,
241+
"The last email sent had a priority of $actual_priority but expected $priority.");
272242

273243
return $this;
274244
}
@@ -283,12 +253,9 @@ protected function seeEmailPriorityEquals($priority, Swift_Message $message = nu
283253
*/
284254
protected function seeEmailReplyTo($reply_to, Swift_Message $message = null)
285255
{
286-
$this->assertArrayHasKey(
287-
$reply_to,
288-
(array)$this->getEmail($message)
289-
->getReplyTo(),
290-
"The last email sent was not set to reply to $reply_to."
291-
);
256+
$this->assertArrayHasKey($reply_to, (array)$this->getEmail($message)
257+
->getReplyTo(),
258+
"The last email sent was not set to reply to $reply_to.");
292259

293260
return $this;
294261
}
@@ -346,12 +313,8 @@ protected function seeEmailSubject($subject, Swift_Message $message = null)
346313
*/
347314
protected function seeEmailSubjectContains($excerpt, Swift_Message $message = null)
348315
{
349-
$this->assertStringContainsString(
350-
$excerpt,
351-
$this->getEmail($message)
352-
->getSubject(),
353-
"The last email sent did not contain the provided subject."
354-
);
316+
$this->assertStringContainsString($excerpt, $this->getEmail($message)
317+
->getSubject(), "The last email sent did not contain the provided subject.");
355318

356319
return $this;
357320
}
@@ -366,12 +329,8 @@ protected function seeEmailSubjectContains($excerpt, Swift_Message $message = nu
366329
*/
367330
protected function seeEmailSubjectDoesNotContain($excerpt, Swift_Message $message = null)
368331
{
369-
$this->assertStringNotContainsString(
370-
$excerpt,
371-
$this->getEmail($message)
372-
->getSubject(),
373-
"The last email sent contained the provided text in its subject."
374-
);
332+
$this->assertStringNotContainsString($excerpt, $this->getEmail($message)
333+
->getSubject(), "The last email sent contained the provided text in its subject.");
375334

376335
return $this;
377336
}
@@ -386,12 +345,8 @@ protected function seeEmailSubjectDoesNotContain($excerpt, Swift_Message $messag
386345
*/
387346
protected function seeEmailSubjectEquals($subject, Swift_Message $message = null)
388347
{
389-
$this->assertEquals(
390-
$subject,
391-
$this->getEmail($message)
392-
->getSubject(),
393-
"The last email sent did not contain a subject of $subject."
394-
);
348+
$this->assertEquals($subject, $this->getEmail($message)
349+
->getSubject(), "The last email sent did not contain a subject of $subject.");
395350

396351
return $this;
397352
}
@@ -406,12 +361,8 @@ protected function seeEmailSubjectEquals($subject, Swift_Message $message = null
406361
*/
407362
protected function seeEmailTo($recipient, Swift_Message $message = null)
408363
{
409-
$this->assertArrayHasKey(
410-
$recipient,
411-
(array)$this->getEmail($message)
412-
->getTo(),
413-
"The last email sent was not sent to $recipient."
414-
);
364+
$this->assertArrayHasKey($recipient, (array)$this->getEmail($message)
365+
->getTo(), "The last email sent was not sent to $recipient.");
415366

416367
return $this;
417368
}

0 commit comments

Comments
 (0)