Skip to content

Commit

Permalink
Merge branch '5.4' into 6.2
Browse files Browse the repository at this point in the history
* 5.4:
  [Serializer] Fix CsvEncoder decode on empty data
  [Tests] Migrate data providers to static ones
  stop using assertObjectHasAttribute()/assertObjectHasNotAttribute()
  [Dotenv] Fix phpdoc Dotenv
  [Config] Fix phpdoc nullable
  Fix some typos
  • Loading branch information
nicolas-grekas committed Feb 6, 2023
2 parents 58ea5bc + 4340667 commit 10202ed
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 10202ed

Please sign in to comment.