Skip to content

Commit 2817341

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Fix subtype in TextPart constructor calls Update security.rst
2 parents cde5b29 + 7d60488 commit 2817341

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

components/mime.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ different parts of the email by hand::
166166
;
167167

168168
$textContent = new TextPart('Lorem ipsum...');
169-
$htmlContent = new TextPart('<h1>Lorem ipsum</h1> <p>...</p>', 'html');
169+
$htmlContent = new TextPart('<h1>Lorem ipsum</h1> <p>...</p>', null, 'html');
170170
$body = new AlternativePart($textContent, $htmlContent);
171171

172172
$email = new Message($headers, $body);
@@ -188,7 +188,7 @@ email multiparts::
188188
$textContent = new TextPart('Lorem ipsum...');
189189
$htmlContent = new TextPart(sprintf(
190190
'<img src="cid:%s"/> <h1>Lorem ipsum</h1> <p>...</p>', $imageCid
191-
), 'html');
191+
), null, 'html');
192192
$bodyContent = new AlternativePart($textContent, $htmlContent);
193193
$body = new RelatedPart($bodyContent, $embeddedImage);
194194

security.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ Next, you'll need to create a route for this URL (but not a controller):
877877
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
878878
879879
return function (RoutingConfigurator $routes) {
880-
$routes->add('logout', '/logout')
880+
$routes->add('app_logout', '/logout')
881881
->methods(['GET'])
882882
;
883883
};

0 commit comments

Comments
 (0)