Skip to content

Commit ec2e0dd

Browse files
committed
Merge branch '4.4'
* 4.4: Fix markup Update mailer.rst Use .xlf extension Removed blank line after filepath Ordered use statements Blank line after directive and no blank line after filepath
2 parents 6b9754d + ad5f953 commit ec2e0dd

File tree

6 files changed

+8
-10
lines changed

6 files changed

+8
-10
lines changed

bundles/best_practices.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,6 @@ following standardized instructions in your ``README.md`` file.
354354
in the ``config/bundles.php`` file of your project::
355355
356356
// config/bundles.php
357-
358357
return [
359358
// ...
360359
<vendor>\<bundle-name>\<bundle-long-name>::class => ['all' => true],

components/http_client.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,9 +484,9 @@ for next requests. The implementation leverages the
484484
so that the :doc:`HttpKernel component </components/http_kernel>` needs to be
485485
installed in your application::
486486

487-
use Symfony\Component\HttpClient\HttpClient;
488487
use Symfony\Component\HttpClient\CachingHttpClient;
489488
use Symfony\Component\HttpKernel\HttpCache\Store;
489+
use Symfony\Component\HttpClient\HttpClient;
490490

491491
$store = new Store('/path/to/cache/storage/');
492492
$client = HttpClient::create();

contributing/code/pull_requests.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ work:
129129
</contributing/code/maintenance>` (you may have to choose a higher branch if
130130
the feature you are fixing was introduced in a later version);
131131

132-
* ``master``, if you are adding a new feature.
132+
* ``master``, if you are adding a new feature.
133133

134134
.. note::
135135

doctrine.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,11 +427,10 @@ some basic validation tasks::
427427
// src/Controller/ProductController.php
428428
namespace App\Controller;
429429

430-
// ...
430+
use App\Entity\Product;
431431
use Symfony\Component\HttpFoundation\Response;
432432
use Symfony\Component\Validator\Validator\ValidatorInterface;
433-
434-
use App\Entity\Product;
433+
// ...
435434

436435
class ProductController extends AbstractController
437436
{

mailer.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Sending Emails with Mailer
22
==========================
33

44
.. versionadded:: 4.3
5+
56
The Mailer component was added in Symfony 4.3 and is currently experimental.
67
The previous solution - Swift Mailer - is still valid: :doc:`Swift Mailer</email>`.
78

@@ -62,7 +63,6 @@ You'll now have a new line in your ``.env`` file that you can uncomment:
6263
.. code-block:: bash
6364
6465
# .env
65-
6666
SENDGRID_KEY=
6767
MAILER_DSN=smtp://$SENDGRID_KEY@sendgrid
6868
@@ -376,7 +376,7 @@ image files as usual. First, to simplify things, define a Twig namespace called
376376
377377
paths:
378378
# point this wherever your images live
379-
images: '%kernel.project_dir%/assets/images'
379+
'%kernel.project_dir%/assets/images': images
380380
381381
Now, use the special ``email.image()`` Twig helper to embed the images inside
382382
the email contents:

translation/debug.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ you've already setup some translations for the ``fr`` locale:
3838

3939
.. code-block:: xml
4040
41-
<!-- translations/messages.fr.xliff -->
41+
<!-- translations/messages.fr.xlf -->
4242
<?xml version="1.0"?>
4343
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
4444
<file source-language="en" datatype="plaintext" original="file.ext">
@@ -69,7 +69,7 @@ and for the ``en`` locale:
6969

7070
.. code-block:: xml
7171
72-
<!-- translations/messages.en.xliff -->
72+
<!-- translations/messages.en.xlf -->
7373
<?xml version="1.0"?>
7474
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
7575
<file source-language="en" datatype="plaintext" original="file.ext">

0 commit comments

Comments
 (0)