Merge branch '4.4' into 5.3

javiereguiluz · javiereguiluz · commit 9363130d656a · 2022-01-21T20:05:47.000+01:00
* 4.4:
  Add return types in docs to avoid generating more legacy code
  Update configuration.rst to aviod misunderstanding
diff --git a/configuration.rst b/configuration.rst
@@ -769,7 +769,7 @@ Configuring Environment Variables in Production
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 In production, the ``.env`` files are also parsed and loaded on each request. So
-the easiest way to define env vars is by deploying a ``.env.local`` file to your
+the easiest way to define env vars is by creating a ``.env.local`` file on your
 production server(s) with your production values.
 
 To improve performance, you can optionally run the ``dump-env`` command (available
diff --git a/controller/argument_value_resolver.rst b/controller/argument_value_resolver.rst
@@ -159,7 +159,7 @@ retrieved from the token storage::
             $this->security = $security;
         }
 
-        public function supports(Request $request, ArgumentMetadata $argument)
+        public function supports(Request $request, ArgumentMetadata $argument): bool
         {
             if (User::class !== $argument->getType()) {
                 return false;
@@ -168,7 +168,7 @@ retrieved from the token storage::
             return $this->security->getUser() instanceof User;
         }
 
-        public function resolve(Request $request, ArgumentMetadata $argument)
+        public function resolve(Request $request, ArgumentMetadata $argument): iterable
         {
             yield $this->security->getUser();
         }

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ retrieved from the token storage::`
`159`	`159`	`$this->security = $security;`
`160`	`160`	`}`
`161`	`161`
`162`		`- public function supports(Request $request, ArgumentMetadata $argument)`
	`162`	`+ public function supports(Request $request, ArgumentMetadata $argument): bool`
`163`	`163`	`{`
`164`	`164`	`if (User::class !== $argument->getType()) {`
`165`	`165`	`return false;`
`@@ -168,7 +168,7 @@ retrieved from the token storage::`
`168`	`168`	`return $this->security->getUser() instanceof User;`
`169`	`169`	`}`
`170`	`170`
`171`		`- public function resolve(Request $request, ArgumentMetadata $argument)`
	`171`	`+ public function resolve(Request $request, ArgumentMetadata $argument): iterable`
`172`	`172`	`{`
`173`	`173`	`yield $this->security->getUser();`
`174`	`174`	`}`