Skip to content

Commit 5b6a783

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Method getCharset with proper returning type Fix: Linebreak Inappropriate usage of Parameter Conversion [Lock] Add classes's link
2 parents d21417e + 78452d9 commit 5b6a783

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

components/lock.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ method can be safely called repeatedly, even if the lock is already acquired.
7272
Serializing Locks
7373
------------------
7474

75-
The ``Key`` contains the state of the ``Lock`` and can be serialized. This
75+
The :class:`Symfony\\Component\\Lock\\Key` contains the state of the
76+
:class:`Symfony\\Component\\Lock\\Lock` and can be serialized. This
7677
allows the user to begin a long job in a process by acquiring the lock, and
7778
continue the job in another process using the same lock::
7879

reference/configuration/kernel.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ charset::
3939

4040
class Kernel extends BaseKernel
4141
{
42-
public function getCharset()
42+
public function getCharset(): string
4343
{
4444
return 'ISO-8859-1';
4545
}

routing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,7 @@ when importing the routes.
13051305
}
13061306
13071307
#[Route('/{_locale}/posts/{slug}', name: 'show')]
1308-
public function show(Post $post): Response
1308+
public function show(string $slug): Response
13091309
{
13101310
// ...
13111311
}

0 commit comments

Comments
 (0)