Skip to content

Commit c07bbc2

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '4.2'
* 4.2: Document the multi-host DSN for Memcache caches Minor reword in the testing article Mentioned all the debug:* commands Clarify a sentence Update serializer.rst Fix typos and improve wording for the Lock component documentation More precision about the log directory permissions Updated the output of debug:autowiring Minor tweak for translation:update command Added some missing steps in the main form login article
2 parents 50c0823 + 44c2f94 commit c07bbc2

Some content is hidden

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

52 files changed

+260
-57
lines changed

‎components/cache/adapters/memcached_adapter.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,16 @@ helper method allows creating and configuring a `Memcached`_ class instance usin
6464
// etc...
6565
]);
6666

67+
// a single DSN can define multiple servers using the following syntax:
68+
// host[hostname-or-IP:port] (where port is optional). Sockets must include a trailing ':'
69+
$client = MemcachedAdapter::createConnection(
70+
'memcached:?host[localhost]&host[localhost:12345]&host[/some/memcached.sock:]=3'
71+
);
72+
73+
.. versionadded:: 4.2
74+
75+
The option to define multiple servers in a single DSN was introduced in Symfony 4.2.
76+
6777
The `Data Source Name (DSN)`_ for this adapter must use the following format:
6878

6979
.. code-block:: text

‎components/http_kernel.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ below for more details).
549549
There are two main listeners to ``kernel.exception`` when using the
550550
Symfony Framework.
551551

552-
**ExceptionListener in HttpKernel**
552+
**ExceptionListener in the HttpKernel Component**
553553

554554
The first comes core to the HttpKernel component
555555
and is called :class:`Symfony\\Component\\HttpKernel\\EventListener\\ExceptionListener`.
@@ -578,7 +578,7 @@ below for more details).
578578
controller to render is passed as a constructor argument to this listener.
579579
This controller will return the final ``Response`` for this error page.
580580

581-
**ExceptionListener in Security**
581+
**ExceptionListener in the Security Component**
582582

583583
The other important listener is the
584584
:class:`Symfony\\Component\\Security\\Http\\Firewall\\ExceptionListener`.

‎components/lock.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ with the ``release()`` method.
106106

107107
The trickiest part when working with expiring locks is choosing the right TTL.
108108
If it's too short, other processes could acquire the lock before finishing the
109-
job; it it's too long and the process crashes before calling the ``release()``
109+
job; if it's too long and the process crashes before calling the ``release()``
110110
method, the resource will stay locked until the timeout::
111111

112112
// ...
@@ -449,8 +449,8 @@ Some file systems (such as some types of NFS) do not support locking.
449449
always be locked on the same machine or to use a well configured shared file
450450
system.
451451

452-
Files on file system can be removed during a maintenance operation. For instance
453-
to cleanup the ``/tmp`` directory or after a reboot of the machine when directory
452+
Files on the file system can be removed during a maintenance operation. For instance,
453+
to clean up the ``/tmp`` directory or after a reboot of the machine when a directory
454454
uses tmpfs. It's not an issue if the lock is released when the process ended, but
455455
it is in case of ``Lock`` reused between requests.
456456

@@ -479,7 +479,7 @@ needs space to add new items.
479479

480480
.. caution::
481481

482-
Number of items stored in the Memcached must be under control. If it's not
482+
The number of items stored in Memcached must be under control. If it's not
483483
possible, LRU should be disabled and Lock should be stored in a dedicated
484484
Memcached service away from Cache.
485485

‎components/serializer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ when constructing the normalizer::
185185
$classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
186186
$normalizer = new ObjectNormalizer($classMetadataFactory);
187187
$serializer = new Serializer([$normalizer]);
188-
$person = $serializer->deserialize($data, 'Acme\Person', 'xml', [
188+
$person = $serializer->deserialize($data, 'App\Model\Person', 'xml', [
189189
'allow_extra_attributes' => false,
190190
]);
191191

‎form/create_custom_field_type.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,15 @@ The goal of this field was to extend the choice type to enable selection of the
8787
shipping type. This is achieved by fixing the ``choices`` to a list of available
8888
shipping options.
8989

90+
.. tip::
91+
92+
Run the following command to verify that the form type was successfully
93+
registered in the application:
94+
95+
.. code-block:: terminal
96+
97+
$ php bin/console debug:form
98+
9099
Creating a Template for the Field
91100
---------------------------------
92101

‎form/create_form_type_extension.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,15 @@ Once the extension is registered, any method that you've overridden (e.g.
7878
``buildForm()``) will be called whenever *any* field of the given type
7979
(``FileType``) is built.
8080

81+
.. tip::
82+
83+
Run the following command to verify that the form type extension was
84+
successfully registered in the application:
85+
86+
.. code-block:: terminal
87+
88+
$ php bin/console debug:form
89+
8190
Adding the extension Business Logic
8291
-----------------------------------
8392

‎form/type_guesser.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,3 +232,12 @@ and tag it with ``form.type_guesser``:
232232
->getFormFactory();
233233

234234
// ...
235+
236+
.. tip::
237+
238+
Run the following command to verify that the form type guesser was
239+
successfullyregistered in the application:
240+
241+
.. code-block:: terminal
242+
243+
$ php bin/console debug:form

‎quick_tour/the_architecture.rst

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,21 @@ What other possible classes or interfaces could you use? Find out by running:
6363
6464
$ php bin/console debug:autowiring
6565
66-
=============================================================== =====================================
67-
Class/Interface Type Alias Service ID
68-
=============================================================== =====================================
69-
``Psr\Cache\CacheItemPoolInterface`` alias for "cache.app.recorder"
70-
``Psr\Log\LoggerInterface`` alias for "monolog.logger"
71-
``Symfony\Component\EventDispatcher\EventDispatcherInterface`` alias for "debug.event_dispatcher"
72-
``Symfony\Component\HttpFoundation\RequestStack`` alias for "request_stack"
73-
``Symfony\Component\HttpFoundation\Session\SessionInterface`` alias for "session"
74-
``Symfony\Component\Routing\RouterInterface`` alias for "router.default"
75-
=============================================================== =====================================
66+
# this is just a *small* sample of the output...
67+
68+
Describes a logger instance.
69+
Psr\Log\LoggerInterface (monolog.logger)
70+
71+
Request stack that controls the lifecycle of requests.
72+
Symfony\Component\HttpFoundation\RequestStack (request_stack)
73+
74+
Interface for the session.
75+
Symfony\Component\HttpFoundation\Session\SessionInterface (session)
76+
77+
RouterInterface is the interface that all Router classes must implement.
78+
Symfony\Component\Routing\RouterInterface (router.default)
79+
80+
[...]
7681
7782
This is just a short summary of the full list! And as you add more packages, this
7883
list of tools will grow!

‎reference/forms/types/birthday.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ option defaults to 120 years ago to the current year.
5050
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\BirthdayType` |
5151
+----------------------+-------------------------------------------------------------------------------+
5252

53+
.. include:: /reference/forms/types/options/_debug_form.rst.inc
54+
5355
Overridden Options
5456
------------------
5557

‎reference/forms/types/button.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ A simple, non-responsive button.
1919
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\ButtonType` |
2020
+----------------------+----------------------------------------------------------------------+
2121

22+
.. include:: /reference/forms/types/options/_debug_form.rst.inc
23+
2224
Inherited Options
2325
-----------------
2426

0 commit comments

Comments
 (0)