Skip to content

Commit 10202ed

Browse files
Merge branch '5.4' into 6.2
* 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
2 parents 58ea5bc + 4340667 commit 10202ed

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Dotenv.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ public function usePutenv(bool $usePutenv = true): static
7272
/**
7373
* Loads one or several .env files.
7474
*
75-
* @param string $path A file to load
76-
* @param string[] ...$extraPaths A list of additional files to load
75+
* @param string $path A file to load
76+
* @param string ...$extraPaths A list of additional files to load
7777
*
7878
* @throws FormatException when a file has a syntax error
7979
* @throws PathException when a file does not exist or is not readable
@@ -158,8 +158,8 @@ public function bootEnv(string $path, string $defaultEnv = 'dev', array $testEnv
158158
/**
159159
* Loads one or several .env files and enables override existing vars.
160160
*
161-
* @param string $path A file to load
162-
* @param string[] ...$extraPaths A list of additional files to load
161+
* @param string $path A file to load
162+
* @param string ...$extraPaths A list of additional files to load
163163
*
164164
* @throws FormatException when a file has a syntax error
165165
* @throws PathException when a file does not exist or is not readable

0 commit comments

Comments
 (0)