Skip to content

Commit

Permalink
Merge branch '6.3' into 6.4
Browse files Browse the repository at this point in the history
* 6.3:
  [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
  [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
  • Loading branch information
fabpot committed Oct 26, 2023
2 parents 4a5a0c2 + 7dfbe29 commit d0d584a
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions Dotenv.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,11 @@ public function load(string $path, string ...$extraPaths): void
* .env.local is always ignored in test env because tests should produce the same results for everyone.
* .env.dist is loaded when it exists and .env is not found.
*
* @param string $path A file to load
* @param string|null $envKey The name of the env vars that defines the app env
* @param string $defaultEnv The app env to use when none is defined
* @param array $testEnvs A list of app envs for which .env.local should be ignored
* @param string $path A file to load
* @param string|null $envKey The name of the env vars that defines the app env
* @param string $defaultEnv The app env to use when none is defined
* @param array $testEnvs A list of app envs for which .env.local should be ignored
* @param bool $overrideExistingVars Whether existing environment variables set by the system should be overridden
*
* @throws FormatException when a file has a syntax error
* @throws PathException when a file does not exist or is not readable
Expand Down Expand Up @@ -173,7 +174,7 @@ public function overload(string $path, string ...$extraPaths): void
* Sets values as environment variables (via putenv, $_ENV, and $_SERVER).
*
* @param array $values An array of env variables
* @param bool $overrideExistingVars true when existing environment variables must be overridden
* @param bool $overrideExistingVars Whether existing environment variables set by the system should be overridden
*/
public function populate(array $values, bool $overrideExistingVars = false): void
{
Expand Down

0 comments on commit d0d584a

Please sign in to comment.