Skip to content

Commit

Permalink
Merge branch '5.4' into 6.0
Browse files Browse the repository at this point in the history
* 5.4:
  [5.4] cs fixes
  [5.3] cs fixes
  [Cache] Fix saving items with no expiration through ProxyAdapter
  CS fixes
  [HttpClient] Fix tracing requests made after calling withOptions()
  [Cache] disable lock on CLI
  Revert "feature #41989 [Cache] make `LockRegistry` use semaphores when possible (nicolas-grekas)"
  [HttpKernel] fix how configuring log-level and status-code by exception works
  [VarDumper] add more "transient-on-macos" groups
  • Loading branch information
nicolas-grekas committed Dec 16, 2021
2 parents b8491dc + 1f28b9b commit 5c43c55
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Dotenv.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ public function usePutenv(bool $usePutenv = true): static
/**
* Loads one or several .env files.
*
* @param string $path A file to load
* @param ...string $extraPaths A list of additional files to load
* @param string $path A file to load
* @param string[] ...$extraPaths A list of additional files to load
*
* @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 @@ -158,8 +158,8 @@ public function bootEnv(string $path, string $defaultEnv = 'dev', array $testEnv
/**
* Loads one or several .env files and enables override existing vars.
*
* @param string $path A file to load
* @param ...string $extraPaths A list of additional files to load
* @param string $path A file to load
* @param string[] ...$extraPaths A list of additional files to load
*
* @throws FormatException when a file has a syntax error
* @throws PathException when a file does not exist or is not readable
Expand Down

0 comments on commit 5c43c55

Please sign in to comment.