Merge branch '6.1' into 6.2

OskarStark · OskarStark · commit 942fd5641d2b · 2022-10-06T08:37:48.000+02:00
* 6.1:
  Add missing space
diff --git a/quick_tour/flex_recipes.rst b/quick_tour/flex_recipes.rst
@@ -165,7 +165,7 @@ Are you building an API? You can already return JSON from any controller::
         // ...
 
         #[Route('/api/hello/{name}', methods: ['GET'])]
-        public function apiHello(string$name): JsonResponse
+        public function apiHello(string $name): JsonResponse
         {
             return $this->json([
                 'name' => $name,

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ Are you building an API? You can already return JSON from any controller::`
`165`	`165`	`// ...`
`166`	`166`
`167`	`167`	`#[Route('/api/hello/{name}', methods: ['GET'])]`
`168`		`- public function apiHello(string$name): JsonResponse`
	`168`	`+ public function apiHello(string $name): JsonResponse`
`169`	`169`	`{`
`170`	`170`	`return $this->json([`
`171`	`171`	`'name' => $name,`