Skip to content

Commit 9b1521b

Browse files
committed
Merge branch '3.4' into 4.1
* 3.4: 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 60778d4 + bb557d4 commit 9b1521b

Some content is hidden

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

45 files changed

+523
-14
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
@@ -139,6 +139,7 @@ Available Options
139139
connection attempt times out.
140140

141141
.. note::
142+
142143
When using the `Predis`_ library some additional Predis-specific options are available.
143144
Reference the `Predis Connection Parameters`_ documentation for more information.
144145

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
@@ -515,7 +515,7 @@ namespaces in the ``phpunit.xml`` file, as done for example in the
515515
</listener>
516516
</listeners>
517517
</phpunit>
518-
518+
519519
Under the hood, a PHPUnit listener injects the mocked functions in the tested
520520
classes' namespace. In order to work as expected, the listener has to run before
521521
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
@@ -113,6 +113,7 @@ with a non-zero code)::
113113
.. tip::
114114

115115
.. versionadded:: 3.3
116+
116117
The ability to define commands as arrays of arguments was introduced in
117118
Symfony 3.3.
118119

components/property_info.rst

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

243243
.. versionadded:: 4.1
244+
244245
The support of hasser methods in the ``ReflectionExtractor`` class was
245246
introduced in Symfony 4.1.
246247

components/serializer.rst

Lines changed: 2 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

@@ -631,6 +632,7 @@ There are several types of normalizers available:
631632
into a list of errors according to the `RFC 7807`_ standard.
632633

633634
.. versionadded:: 4.1
635+
634636
The ``ConstraintViolationListNormalizer`` was introduced in Symfony 4.1.
635637

636638
.. _component-serializer-encoders:
@@ -740,7 +742,6 @@ The ``YamlEncoder``
740742
This encoder requires the :doc:`Yaml Component </components/yaml>` and
741743
transforms from and to Yaml.
742744

743-
744745
.. _component-serializer-handling-circular-references:
745746

746747
Handling Circular References

0 commit comments

Comments
 (0)