Skip to content

Commit 21b70ed

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: Add return types in docs to avoid generating more legacy code Update configuration.rst to aviod misunderstanding
2 parents 1b40922 + 9363130 commit 21b70ed

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ Configuring Environment Variables in Production
769769
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
770770

771771
In production, the ``.env`` files are also parsed and loaded on each request. So
772-
the easiest way to define env vars is by deploying a ``.env.local`` file to your
772+
the easiest way to define env vars is by creating a ``.env.local`` file on your
773773
production server(s) with your production values.
774774

775775
To improve performance, you can optionally run the ``dump-env`` command (available

controller/argument_value_resolver.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ retrieved from the token storage::
159159
$this->security = $security;
160160
}
161161

162-
public function supports(Request $request, ArgumentMetadata $argument)
162+
public function supports(Request $request, ArgumentMetadata $argument): bool
163163
{
164164
if (User::class !== $argument->getType()) {
165165
return false;
@@ -168,7 +168,7 @@ retrieved from the token storage::
168168
return $this->security->getUser() instanceof User;
169169
}
170170

171-
public function resolve(Request $request, ArgumentMetadata $argument)
171+
public function resolve(Request $request, ArgumentMetadata $argument): iterable
172172
{
173173
yield $this->security->getUser();
174174
}

0 commit comments

Comments
 (0)