Skip to content

Commit 782d55c

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: [6.3] Remove unused test fixture [5.4] Remove unused test fixtures [Dotent] Add PHPDoc for `$overrideExistingVars` [SecurityBundle] Fix missing login-link element in xsd schema [Validator] Add missing Chinese translations #51934 replace a not-existing virtual request stack with the real one [Messenger] add handler description as array key to `HandlerFailedException::getWrappedExceptions()` [Serializer] Fix using `DateIntervalNormalizer` with union types [Validator] fix: add missing translations for for Thai (th) fix #52273 [doctrine-messenger] DB table locks on messenger_messages with many failures [Serializer] Handle defaultContext for DateTimeNormalizer declare constructor argument as optional for backwards compatibility [CI] Add step to verify symfony/deprecation-contracts requirements
2 parents 4d66f30 + d0d584a commit 782d55c

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Dotenv.php

+6-5
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,11 @@ public function load(string $path, string ...$extraPaths): void
8989
* .env.local is always ignored in test env because tests should produce the same results for everyone.
9090
* .env.dist is loaded when it exists and .env is not found.
9191
*
92-
* @param string $path A file to load
93-
* @param string|null $envKey The name of the env vars that defines the app env
94-
* @param string $defaultEnv The app env to use when none is defined
95-
* @param array $testEnvs A list of app envs for which .env.local should be ignored
92+
* @param string $path A file to load
93+
* @param string|null $envKey The name of the env vars that defines the app env
94+
* @param string $defaultEnv The app env to use when none is defined
95+
* @param array $testEnvs A list of app envs for which .env.local should be ignored
96+
* @param bool $overrideExistingVars Whether existing environment variables set by the system should be overridden
9697
*
9798
* @throws FormatException when a file has a syntax error
9899
* @throws PathException when a file does not exist or is not readable
@@ -173,7 +174,7 @@ public function overload(string $path, string ...$extraPaths): void
173174
* Sets values as environment variables (via putenv, $_ENV, and $_SERVER).
174175
*
175176
* @param array $values An array of env variables
176-
* @param bool $overrideExistingVars true when existing environment variables must be overridden
177+
* @param bool $overrideExistingVars Whether existing environment variables set by the system should be overridden
177178
*/
178179
public function populate(array $values, bool $overrideExistingVars = false): void
179180
{

0 commit comments

Comments
 (0)