From 5b8e84d3f9e9e35c41570f99eb9c6988c9e5eb1d Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sun, 20 Jul 2014 18:01:09 +0200 Subject: [PATCH] consistency, replace "e-mail" with "email" --- cookbook/email/testing.rst | 10 +++++----- cookbook/web_services/php_soap_extension.rst | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cookbook/email/testing.rst b/cookbook/email/testing.rst index d5fce3b4186..c95ea6cb5dc 100644 --- a/cookbook/email/testing.rst +++ b/cookbook/email/testing.rst @@ -1,16 +1,16 @@ .. index:: single: Emails; Testing -How to Test that an Email is Sent in a functional Test +How to Test that an Email is Sent in a Functional Test ====================================================== -Sending e-mails with Symfony is pretty straightforward thanks to the +Sending emails with Symfony is pretty straightforward thanks to the SwiftmailerBundle, which leverages the power of the `Swift Mailer`_ library. To functionally test that an email was sent, and even assert the email subject, content or any other headers, you can use :ref:`the Symfony Profiler `. -Start with an easy controller action that sends an e-mail:: +Start with an easy controller action that sends an email:: public function sendEmailAction($name) { @@ -49,13 +49,13 @@ to get information about the messages send on the previous request:: $mailCollector = $client->getProfile()->getCollector('swiftmailer'); - // Check that an e-mail was sent + // Check that an email was sent $this->assertEquals(1, $mailCollector->getMessageCount()); $collectedMessages = $mailCollector->getMessages(); $message = $collectedMessages[0]; - // Asserting e-mail data + // Asserting email data $this->assertInstanceOf('Swift_Message', $message); $this->assertEquals('Hello Email', $message->getSubject()); $this->assertEquals('send@example.com', key($message->getFrom())); diff --git a/cookbook/web_services/php_soap_extension.rst b/cookbook/web_services/php_soap_extension.rst index 49ec8c323b1..c12efb742e7 100644 --- a/cookbook/web_services/php_soap_extension.rst +++ b/cookbook/web_services/php_soap_extension.rst @@ -51,7 +51,7 @@ In this case, the SOAP service will allow the client to call a method called } Next, you can train Symfony to be able to create an instance of this class. -Since the class sends an e-mail, it's been designed to accept a ``Swift_Mailer`` +Since the class sends an email, it's been designed to accept a ``Swift_Mailer`` instance. Using the Service Container, you can configure Symfony to construct a ``HelloService`` object properly: