Skip to content

Commit cc0256e

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: [Console] Caution about disabling auto exit flag language tweak Fix PostgreSqlStore code sample formatting Replace unavailable dependency in Symfony 4 Update normalizers.rst
2 parents cd8daae + edbb23a commit cc0256e

File tree

5 files changed

+16
-5
lines changed

5 files changed

+16
-5
lines changed

components/lock.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,8 @@ PostgreSqlStore
465465

466466
The PostgreSqlStore uses `Advisory Locks`_ provided by PostgreSQL. It requires a
467467
`PDO`_ connection, a `Doctrine DBAL Connection`_, or a
468-
`Data Source Name (DSN)`_. It supports native blocking, as well as sharing locks.
468+
`Data Source Name (DSN)`_. It supports native blocking, as well as sharing
469+
locks::
469470

470471
use Symfony\Component\Lock\Store\PostgreSqlStore;
471472

components/property_access.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ The ``getValue()`` method can also use the magic ``__get()`` method::
225225
Magic ``__call()`` Method
226226
~~~~~~~~~~~~~~~~~~~~~~~~~
227227

228-
At last, ``getValue()`` can use the magic ``__call()`` method, but you need to
228+
Lastly, ``getValue()`` can use the magic ``__call()`` method, but you need to
229229
enable this feature by using :class:`Symfony\\Component\\PropertyAccess\\PropertyAccessorBuilder`::
230230

231231
// ...

console.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,16 @@ call ``setAutoExit(false)`` on it to get the command result in ``CommandTester``
411411
not dispatched. If you need to test those events, use the
412412
:class:`Symfony\\Component\\Console\\Tester\\ApplicationTester` instead.
413413

414+
.. caution::
415+
416+
When testing commands using the :class:`Symfony\\Component\\Console\\Tester\\ApplicationTester`
417+
class, don't forget to disable the auto exit flag::
418+
419+
$application = new Application();
420+
$application->setAutoExit(false);
421+
422+
$tester = new ApplicationTester($application);
423+
414424
.. note::
415425

416426
When using the Console component in a standalone project, use

serializer/normalizers.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ Symfony includes the following normalizers but you can also
3636
transform :phpclass:`SplFileInfo` objects in `Data URIs`_
3737
* :class:`Symfony\\Component\\Serializer\\Normalizer\\CustomNormalizer` to
3838
normalize PHP object using an object that implements
39+
:class:`Symfony\\Component\\Serializer\\Normalizer\\NormalizableInterface`;
3940
* :class:`Symfony\\Component\\Serializer\\Normalizer\\FormErrorNormalizer` for
4041
objects implementing the :class:`Symfony\\Component\\Form\\FormInterface` to
41-
normalize form errors.
42-
:class:`Symfony\\Component\\Serializer\\Normalizer\\NormalizableInterface`;
42+
normalize form errors;
4343
* :class:`Symfony\\Component\\Serializer\\Normalizer\\GetSetMethodNormalizer` to
4444
normalize PHP object using the getter and setter methods of the object;
4545
* :class:`Symfony\\Component\\Serializer\\Normalizer\\PropertyNormalizer` to

setup/unstable_versions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Symfony version has deprecated some of its features.
6868
$ cd projects/my_project/
6969
$ git checkout -b testing_new_symfony
7070
# ... update composer.json configuration
71-
$ composer update symfony/symfony
71+
$ composer update "symfony/*"
7272
7373
# ... after testing the new Symfony version
7474
$ git checkout master

0 commit comments

Comments
 (0)