Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit f92c205

Browse filesBrowse files
committed
Merge branch '3.4' into 4.1
* 3.4: Clarify a sentence Update serializer.rst Fix typos and improve wording for the Lock component documentation
2 parents d4d41bc + 0f4eed5 commit f92c205
Copy full SHA for f92c205

File tree

Expand file treeCollapse file tree

3 files changed

+7
-7
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+7
-7
lines changed

‎components/http_kernel.rst

Copy file name to clipboardExpand all lines: components/http_kernel.rst
+2-2Lines 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

Copy file name to clipboardExpand all lines: components/lock.rst
+4-4Lines 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
// ...
@@ -388,8 +388,8 @@ Some file systems (such as some types of NFS) do not support locking.
388388
always be locked on the same machine or to use a well configured shared file
389389
system.
390390

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

@@ -418,7 +418,7 @@ needs space to add new items.
418418

419419
.. caution::
420420

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

‎components/serializer.rst

Copy file name to clipboardExpand all lines: components/serializer.rst
+1-1Lines 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

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.