Skip to content

Commit 84dbdee

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: Add return types in docs to avoid generating more legacy code Update configuration.rst to aviod misunderstanding
2 parents 83fe6a2 + 8013741 commit 84dbdee

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
@@ -764,7 +764,7 @@ Configuring Environment Variables in Production
764764
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
765765

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

770770
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
@@ -195,7 +195,7 @@ retrieved from the token storage::
195195
$this->security = $security;
196196
}
197197

198-
public function supports(Request $request, ArgumentMetadata $argument)
198+
public function supports(Request $request, ArgumentMetadata $argument): bool
199199
{
200200
if (User::class !== $argument->getType()) {
201201
return false;
@@ -204,7 +204,7 @@ retrieved from the token storage::
204204
return $this->security->getUser() instanceof User;
205205
}
206206

207-
public function resolve(Request $request, ArgumentMetadata $argument)
207+
public function resolve(Request $request, ArgumentMetadata $argument): iterable
208208
{
209209
yield $this->security->getUser();
210210
}

0 commit comments

Comments
 (0)