Merge branch '6.1' into 6.2

javiereguiluz · javiereguiluz · commit 1cbe3270358d · 2022-09-02T17:50:06.000+02:00
* 6.1:
  Method getCharset with proper returning type
  Fix: Linebreak
  Inappropriate usage of Parameter Conversion
  [Lock] Add classes's link
diff --git a/components/lock.rst b/components/lock.rst
@@ -72,7 +72,8 @@ method can be safely called repeatedly, even if the lock is already acquired.
 Serializing Locks
 ------------------
 
-The ``Key`` contains the state of the ``Lock`` and can be serialized. This
+The :class:`Symfony\\Component\\Lock\\Key` contains the state of the
+:class:`Symfony\\Component\\Lock\\Lock` and can be serialized. This
 allows the user to begin a long job in a process by acquiring the lock, and
 continue the job in another process using the same lock::
 
diff --git a/reference/configuration/kernel.rst b/reference/configuration/kernel.rst
@@ -39,7 +39,7 @@ charset::
 
     class Kernel extends BaseKernel
     {
-        public function getCharset()
+        public function getCharset(): string
         {
             return 'ISO-8859-1';
         }
diff --git a/routing.rst b/routing.rst
@@ -1362,7 +1362,7 @@ when importing the routes.
             }
 
             #[Route('/{_locale}/posts/{slug}', name: 'show')]
-            public function show(Post $post): Response
+            public function show(string $slug): Response
             {
                 // ...
             }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ charset::`
`39`	`39`
`40`	`40`	`class Kernel extends BaseKernel`
`41`	`41`	`{`
`42`		`- public function getCharset()`
	`42`	`+ public function getCharset(): string`
`43`	`43`	`{`
`44`	`44`	`return 'ISO-8859-1';`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1362,7 +1362,7 @@ when importing the routes.`
`1362`	`1362`	`}`
`1363`	`1363`
`1364`	`1364`	`#[Route('/{_locale}/posts/{slug}', name: 'show')]`
`1365`		`- public function show(Post $post): Response`
	`1365`	`+ public function show(string $slug): Response`
`1366`	`1366`	`{`
`1367`	`1367`	`// ...`
`1368`	`1368`	`}`