@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | * @param string $bcc |
93 | 93 | * @param Swift_Message|null $message |
94 | 94 | * |
95 | - * @return PHPUnit_Framework_TestCase $this |
|
95 | + * @return MailTracking $this |
|
96 | 96 | */ |
97 | 97 | protected function seeEmailBcc($bcc, Swift_Message $message = null) |
98 | 98 | { |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | * @param string $cc |
109 | 109 | * @param Swift_Message|null $message |
110 | 110 | * |
111 | - * @return PHPUnit_Framework_TestCase $this |
|
111 | + * @return MailTracking $this |
|
112 | 112 | */ |
113 | 113 | protected function seeEmailCc($cc, Swift_Message $message = null) |
114 | 114 | { |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | * @param string $excerpt |
125 | 125 | * @param Swift_Message|null $message |
126 | 126 | * |
127 | - * @return PHPUnit_Framework_TestCase $this |
|
127 | + * @return MailTracking $this |
|
128 | 128 | */ |
129 | 129 | protected function seeEmailContains($excerpt, Swift_Message $message = null) |
130 | 130 | { |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | * @param string $content_type |
142 | 142 | * @param Swift_Message|null $message |
143 | 143 | * |
144 | - * @return PHPUnit_Framework_TestCase $this |
|
144 | + * @return MailTracking $this |
|
145 | 145 | */ |
146 | 146 | protected function seeEmailContentTypeEquals($content_type, Swift_Message $message = null) |
147 | 147 | { |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | * @param string $excerpt |
159 | 159 | * @param Swift_Message|null $message |
160 | 160 | * |
161 | - * @return PHPUnit_Framework_TestCase $this |
|
161 | + * @return MailTracking $this |
|
162 | 162 | */ |
163 | 163 | protected function seeEmailDoesNotContain($excerpt, Swift_Message $message = null) |
164 | 164 | { |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | * @param string $body |
176 | 176 | * @param Swift_Message|null $message |
177 | 177 | * |
178 | - * @return PHPUnit_Framework_TestCase $this |
|
178 | + * @return MailTracking $this |
|
179 | 179 | */ |
180 | 180 | protected function seeEmailEquals($body, Swift_Message $message = null) |
181 | 181 | { |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | * @param string $sender |
192 | 192 | * @param Swift_Message|null $message |
193 | 193 | * |
194 | - * @return PHPUnit_Framework_TestCase $this |
|
194 | + * @return MailTracking $this |
|
195 | 195 | */ |
196 | 196 | protected function seeEmailFrom($sender, Swift_Message $message = null) |
197 | 197 | { |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | * @param integer $priority |
210 | 210 | * @param Swift_Message|null $message |
211 | 211 | * |
212 | - * @return PHPUnit_Framework_TestCase $this |
|
212 | + * @return MailTracking $this |
|
213 | 213 | */ |
214 | 214 | protected function seeEmailPriorityEquals($priority, Swift_Message $message = null) |
215 | 215 | { |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | * @param string $reply_to |
229 | 229 | * @param Swift_Message|null $message |
230 | 230 | * |
231 | - * @return PHPUnit_Framework_TestCase $this |
|
231 | + * @return MailTracking $this |
|
232 | 232 | */ |
233 | 233 | protected function seeEmailReplyTo($reply_to, Swift_Message $message = null) |
234 | 234 | { |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | * |
245 | 245 | * @param integer $count |
246 | 246 | * |
247 | - * @return PHPUnit_Framework_TestCase $this |
|
247 | + * @return MailTracking $this |
|
248 | 248 | * @deprecated in favor of seeEmailCountEquals |
249 | 249 | */ |
250 | 250 | protected function seeEmailsSent($count) |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | * |
258 | 258 | * @param integer $count |
259 | 259 | * |
260 | - * @return PHPUnit_Framework_TestCase $this |
|
260 | + * @return MailTracking $this |
|
261 | 261 | */ |
262 | 262 | protected function seeEmailCountEquals($count) |
263 | 263 | { |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | * @param string $subject |
275 | 275 | * @param Swift_Message|null $message |
276 | 276 | * |
277 | - * @return PHPUnit_Framework_TestCase $this |
|
277 | + * @return MailTracking $this |
|
278 | 278 | * @deprecated in favor of seeEmailSubjectEquals |
279 | 279 | */ |
280 | 280 | protected function seeEmailSubject($subject, Swift_Message $message = null) |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | * @param string $excerpt |
289 | 289 | * @param Swift_Message|null $message |
290 | 290 | * |
291 | - * @return PHPUnit_Framework_TestCase $this |
|
291 | + * @return MailTracking $this |
|
292 | 292 | */ |
293 | 293 | protected function seeEmailSubjectContains($excerpt, Swift_Message $message = null) |
294 | 294 | { |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | * @param string $excerpt |
306 | 306 | * @param Swift_Message|null $message |
307 | 307 | * |
308 | - * @return PHPUnit_Framework_TestCase $this |
|
308 | + * @return MailTracking $this |
|
309 | 309 | */ |
310 | 310 | protected function seeEmailSubjectDoesNotContain($excerpt, Swift_Message $message = null) |
311 | 311 | { |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | * @param string $subject |
323 | 323 | * @param Swift_Message|null $message |
324 | 324 | * |
325 | - * @return PHPUnit_Framework_TestCase $this |
|
325 | + * @return MailTracking $this |
|
326 | 326 | */ |
327 | 327 | protected function seeEmailSubjectEquals($subject, Swift_Message $message = null) |
328 | 328 | { |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | * @param string $recipient |
340 | 340 | * @param Swift_Message|null $message |
341 | 341 | * |
342 | - * @return PHPUnit_Framework_TestCase $this |
|
342 | + * @return MailTracking $this |
|
343 | 343 | */ |
344 | 344 | protected function seeEmailTo($recipient, Swift_Message $message = null) |
345 | 345 | { |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | /** |
353 | 353 | * Assert that no emails were sent. |
354 | 354 | * |
355 | - * @return PHPUnit_Framework_TestCase $this |
|
355 | + * @return MailTracking $this |
|
356 | 356 | */ |
357 | 357 | protected function seeEmailWasNotSent() |
358 | 358 | { |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | /** |
367 | 367 | * Assert that at least one email was sent. |
368 | 368 | * |
369 | - * @return PHPUnit_Framework_TestCase $this |
|
369 | + * @return MailTracking $this |
|
370 | 370 | */ |
371 | 371 | protected function seeEmailWasSent() |
372 | 372 | { |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | */ |
97 | 97 | protected function seeEmailBcc($bcc, Swift_Message $message = null) |
98 | 98 | { |
99 | - $this->assertArrayHasKey($bcc, (array)$this->getEmail($message) |
|
99 | + $this->assertArrayHasKey($bcc, (array) $this->getEmail($message) |
|
100 | 100 | ->getBcc(), "The last email sent was not bcc'ed to $bcc."); |
101 | 101 | |
102 | 102 | return $this; |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | */ |
113 | 113 | protected function seeEmailCc($cc, Swift_Message $message = null) |
114 | 114 | { |
115 | - $this->assertArrayHasKey($cc, (array)$this->getEmail($message) |
|
115 | + $this->assertArrayHasKey($cc, (array) $this->getEmail($message) |
|
116 | 116 | ->getCc(), "The last email sent was not cc'ed to $cc."); |
117 | 117 | |
118 | 118 | return $this; |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | protected function seeEmailFrom($sender, Swift_Message $message = null) |
197 | 197 | { |
198 | 198 | // TODO: Allow from to be an array to check email & name |
199 | - $this->assertArrayHasKey($sender, (array)$this->getEmail($message) |
|
199 | + $this->assertArrayHasKey($sender, (array) $this->getEmail($message) |
|
200 | 200 | ->getFrom(), "The last email sent was not sent from $sender."); |
201 | 201 | |
202 | 202 | return $this; |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | */ |
233 | 233 | protected function seeEmailReplyTo($reply_to, Swift_Message $message = null) |
234 | 234 | { |
235 | - $this->assertArrayHasKey($reply_to, (array)$this->getEmail($message) |
|
235 | + $this->assertArrayHasKey($reply_to, (array) $this->getEmail($message) |
|
236 | 236 | ->getReplyTo(), |
237 | 237 | "The last email sent was not set to reply to $reply_to."); |
238 | 238 | |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | */ |
344 | 344 | protected function seeEmailTo($recipient, Swift_Message $message = null) |
345 | 345 | { |
346 | - $this->assertArrayHasKey($recipient, (array)$this->getEmail($message) |
|
346 | + $this->assertArrayHasKey($recipient, (array) $this->getEmail($message) |
|
347 | 347 | ->getTo(), "The last email sent was not sent to $recipient."); |
348 | 348 | |
349 | 349 | return $this; |
@@ -46,13 +46,13 @@ discard block |
||
46 | 46 | * |
47 | 47 | * @before |
48 | 48 | */ |
49 | - public function setUpMailTracking() |
|
50 | - { |
|
51 | - $this->afterApplicationCreated(function() { |
|
52 | - Mail::getSwiftMailer() |
|
53 | - ->registerPlugin(new MailRecorder($this)); |
|
54 | - }); |
|
55 | - } |
|
49 | + public function setUpMailTracking() |
|
50 | + { |
|
51 | + $this->afterApplicationCreated(function() { |
|
52 | + Mail::getSwiftMailer() |
|
53 | + ->registerPlugin(new MailRecorder($this)); |
|
54 | + }); |
|
55 | + } |
|
56 | 56 | |
57 | 57 | /** |
58 | 58 | * Retrieve the appropriate Swift message. |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | protected function seeEmailBcc($bcc, Swift_Message $message = null) |
100 | 100 | { |
101 | 101 | $this->assertArrayHasKey($bcc, (array)$this->getEmail($message) |
102 | - ->getBcc(), "The last email sent was not bcc'ed to $bcc."); |
|
102 | + ->getBcc(), "The last email sent was not bcc'ed to $bcc."); |
|
103 | 103 | |
104 | 104 | return $this; |
105 | 105 | } |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | protected function seeEmailCc($cc, Swift_Message $message = null) |
116 | 116 | { |
117 | 117 | $this->assertArrayHasKey($cc, (array)$this->getEmail($message) |
118 | - ->getCc(), "The last email sent was not cc'ed to $cc."); |
|
118 | + ->getCc(), "The last email sent was not cc'ed to $cc."); |
|
119 | 119 | |
120 | 120 | return $this; |
121 | 121 | } |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | protected function seeEmailContains($excerpt, Swift_Message $message = null) |
132 | 132 | { |
133 | 133 | $this->assertContains($excerpt, $this->getEmail($message) |
134 | - ->getBody(), "The last email sent did not contain the provided body."); |
|
134 | + ->getBody(), "The last email sent did not contain the provided body."); |
|
135 | 135 | |
136 | 136 | return $this; |
137 | 137 | } |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | { |
167 | 167 | $this->assertNotContains($excerpt, $this->getEmail($message) |
168 | 168 | ->getBody(), |
169 | - "The last email sent contained the provided text in its body."); |
|
169 | + "The last email sent contained the provided text in its body."); |
|
170 | 170 | |
171 | 171 | return $this; |
172 | 172 | } |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | { |
200 | 200 | // TODO: Allow from to be an array to check email & name |
201 | 201 | $this->assertArrayHasKey($sender, (array)$this->getEmail($message) |
202 | - ->getFrom(), "The last email sent was not sent from $sender."); |
|
202 | + ->getFrom(), "The last email sent was not sent from $sender."); |
|
203 | 203 | |
204 | 204 | return $this; |
205 | 205 | } |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | { |
237 | 237 | $this->assertArrayHasKey($reply_to, (array)$this->getEmail($message) |
238 | 238 | ->getReplyTo(), |
239 | - "The last email sent was not set to reply to $reply_to."); |
|
239 | + "The last email sent was not set to reply to $reply_to."); |
|
240 | 240 | |
241 | 241 | return $this; |
242 | 242 | } |
@@ -295,8 +295,8 @@ discard block |
||
295 | 295 | protected function seeEmailSubjectContains($excerpt, Swift_Message $message = null) |
296 | 296 | { |
297 | 297 | $this->assertContains($excerpt, $this->getEmail($message) |
298 | - ->getSubject(), |
|
299 | - "The last email sent did not contain the provided subject."); |
|
298 | + ->getSubject(), |
|
299 | + "The last email sent did not contain the provided subject."); |
|
300 | 300 | |
301 | 301 | return $this; |
302 | 302 | } |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | { |
314 | 314 | $this->assertNotContains($excerpt, $this->getEmail($message) |
315 | 315 | ->getSubject(), |
316 | - "The last email sent contained the provided text in its subject."); |
|
316 | + "The last email sent contained the provided text in its subject."); |
|
317 | 317 | |
318 | 318 | return $this; |
319 | 319 | } |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | protected function seeEmailSubjectEquals($subject, Swift_Message $message = null) |
330 | 330 | { |
331 | 331 | $this->assertEquals($subject, $this->getEmail($message) |
332 | - ->getSubject(), |
|
332 | + ->getSubject(), |
|
333 | 333 | "The last email sent did not contain a subject of $subject."); |
334 | 334 | |
335 | 335 | return $this; |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | protected function seeEmailTo($recipient, Swift_Message $message = null) |
347 | 347 | { |
348 | 348 | $this->assertArrayHasKey($recipient, (array)$this->getEmail($message) |
349 | - ->getTo(), "The last email sent was not sent to $recipient."); |
|
349 | + ->getTo(), "The last email sent was not sent to $recipient."); |
|
350 | 350 | |
351 | 351 | return $this; |
352 | 352 | } |
@@ -21,7 +21,7 @@ |
||
21 | 21 | /** |
22 | 22 | * MailRecorder constructor. |
23 | 23 | * |
24 | - * @param $test |
|
24 | + * @param MailTracking $test |
|
25 | 25 | */ |
26 | 26 | public function __construct($test) |
27 | 27 | { |