Skip to content

Commit c19f279

Browse files
committed
Merge branch '4.1' into 4.2
* 4.1: clarify how to use custom entity manager names Fixed tiny grammar error in flex.rst [Validator] Range constraint: min and mix can be integer or string update year in license added blank line after .. versionadded:: directive add missing blank line after directive Add missing imports and remove useless
2 parents 1ac94be + d5b9337 commit c19f279

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+84
-15
lines changed

components/cache/adapters/memcached_adapter.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ Available Options
278278
are valid and fit within the design of the protocol being used.
279279

280280
.. tip::
281+
281282
Reference the `Memcached`_ extension's `predefined constants`_ documentation
282283
for additional information about the available options.
283284

components/cache/adapters/redis_adapter.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ Available Options
149149
connection attempt times out.
150150

151151
.. note::
152+
152153
When using the `Predis`_ library some additional Predis-specific options are available.
153154
Reference the `Predis Connection Parameters`_ documentation for more information.
154155

components/cache/cache_pools.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ when all items are successfully deleted)::
152152
$ php bin/console cache:pool:clear cache.validation cache.app
153153
154154
.. versionadded:: 4.1
155+
155156
The ``cache:pool:delete`` command was introduced in Symfony 4.1.
156157

157158
.. _component-cache-cache-pool-prune:

components/console/helpers/questionhelper.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Suppose you want to confirm an action before actually executing it. Add
2525
the following to your command::
2626

2727
// ...
28+
use Symfony\Component\Console\Command\Command;
2829
use Symfony\Component\Console\Input\InputInterface;
2930
use Symfony\Component\Console\Output\OutputInterface;
3031
use Symfony\Component\Console\Question\ConfirmationQuestion;

components/console/helpers/table.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ When building a console application it may be useful to display tabular data:
2020
To display a table, use :class:`Symfony\\Component\\Console\\Helper\\Table`,
2121
set the headers, set the rows and then render the table::
2222

23+
use Symfony\Component\Console\Command\Command;
2324
use Symfony\Component\Console\Helper\Table;
25+
use Symfony\Component\Console\Input\InputInterface;
26+
use Symfony\Component\Console\Output\OutputInterface;
2427
// ...
2528

2629
class SomeCommand extends Command

components/form.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ to bootstrap or access Twig and add the :class:`Symfony\\Bridge\\Twig\\Extension
224224
->getFormFactory();
225225

226226
.. versionadded:: 1.30
227+
227228
The ``Twig\\RuntimeLoader\\FactoryRuntimeLoader`` was introduced in Twig 1.30.
228229

229230
The exact details of your `Twig Configuration`_ will vary, but the goal is

components/phpunit_bridge.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ namespaces in the ``phpunit.xml`` file, as done for example in the
543543
</listener>
544544
</listeners>
545545
</phpunit>
546-
546+
547547
Under the hood, a PHPUnit listener injects the mocked functions in the tested
548548
classes' namespace. In order to work as expected, the listener has to run before
549549
the tested class ever runs. By default, the mocked functions are created when the

components/process.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ Using Features From the OS Shell
101101
--------------------------------
102102

103103
.. versionadded:: 4.2
104+
104105
The ``fromShellCommandline()`` static method was introduced in Symfony 4.2.
105106

106107
Using array of arguments is the recommended way to define commands. This

components/property_info.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ to determine if it's accessible. This based on how the :doc:`PropertyAccess </co
250250
works.
251251

252252
.. versionadded:: 4.1
253+
253254
The support of hasser methods in the ``ReflectionExtractor`` class was
254255
introduced in Symfony 4.1.
255256

components/serializer.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ needs three parameters:
165165
#. The encoder used to convert that information into an array
166166

167167
.. versionadded:: 3.3
168+
168169
Support for the ``allow_extra_attributes`` key in the context was introduced
169170
in Symfony 3.3.
170171

@@ -717,6 +718,7 @@ There are several types of normalizers available:
717718
into a list of errors according to the `RFC 7807`_ standard.
718719

719720
.. versionadded:: 4.1
721+
720722
The ``ConstraintViolationListNormalizer`` was introduced in Symfony 4.1.
721723

722724
.. _component-serializer-encoders:
@@ -835,7 +837,6 @@ The ``YamlEncoder``
835837
This encoder requires the :doc:`Yaml Component </components/yaml>` and
836838
transforms from and to Yaml.
837839

838-
839840
Skipping ``null`` Values
840841
------------------------
841842

@@ -853,6 +854,7 @@ to ``true``::
853854
// ['bar' => 'notNull']
854855

855856
.. versionadded:: 4.2
857+
856858
The ``skip_null_values`` option was introduced in Symfony 4.2.
857859

858860
.. _component-serializer-handling-circular-references:

0 commit comments

Comments
 (0)