Commit7ba7089

committed

Merge branch '6.0' into 6.1

* 6.0: Method getCharset with proper returning type Fix: Linebreak Inappropriate usage of Parameter Conversion [Lock] Add classes's link

2 parents7551fa0 +5b6a783 commit7ba7089Copy full SHA for 7ba7089

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@ method can be safely called repeatedly, even if the lock is already acquired.`
`72`	`72`	`Serializing Locks`
`73`	`73`	`------------------`
`74`	`74`
`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
`76`	`77`	`allows the user to begin a long job in a process by acquiring the lock, and`
`77`	`78`	`continue the job in another process using the same lock::`
`78`	`79`

Lines changed: 1 addition & 1 deletion

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`	`}`

Lines changed: 1 addition & 1 deletion

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`	`}`

Comments

(0)