Skip to content

Commit b183dc6

Browse files
Merge branch '3.4'
* 3.4: (26 commits) [Bridge\PhpUnit] Disable broken auto-require mechanism of phpunit [Console] Fix disabling lazy commands [DI] Remove scalar typehint in class used in test case Remove the `server:log` command if monolog is not loaded [SecurityBundle] Fix syntax error in test [Console] Remove remaining dead code Throw on service:method factory notation in PHP-based DI configuration Test that named arguments are prioritized over typehinted bumped Symfony version to 3.3.14 bumped Symfony version to 2.8.32 bumped Symfony version to 2.7.39 Prove that change is working with tests updated VERSION for 3.3.13 updated CHANGELOG for 3.3.13 updated VERSION for 2.8.31 updated CHANGELOG for 2.8.31 updated VERSION for 2.7.38 updated CHANGELOG for 2.7.38 Replace array|\Traversable by iterable [DI] Fix by-type args injection ...
2 parents 5518e13 + 1d8193e commit b183dc6

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

Filesystem.php

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ public function copy($originFile, $targetFile, $overwriteNewerFiles = false)
8484
/**
8585
* Creates a directory recursively.
8686
*
87-
* @param string|array|\Traversable $dirs The directory path
88-
* @param int $mode The directory mode
87+
* @param string|iterable $dirs The directory path
88+
* @param int $mode The directory mode
8989
*
9090
* @throws IOException On any directory creation failure
9191
*/
@@ -112,7 +112,7 @@ public function mkdir($dirs, $mode = 0777)
112112
/**
113113
* Checks the existence of files or directories.
114114
*
115-
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to check
115+
* @param string|iterable $files A filename, an array of files, or a \Traversable instance to check
116116
*
117117
* @return bool true if the file exists, false otherwise
118118
*/
@@ -136,9 +136,9 @@ public function exists($files)
136136
/**
137137
* Sets access and modification time of file.
138138
*
139-
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to create
140-
* @param int $time The touch time as a Unix timestamp
141-
* @param int $atime The access time as a Unix timestamp
139+
* @param string|iterable $files A filename, an array of files, or a \Traversable instance to create
140+
* @param int $time The touch time as a Unix timestamp
141+
* @param int $atime The access time as a Unix timestamp
142142
*
143143
* @throws IOException When touch fails
144144
*/
@@ -155,7 +155,7 @@ public function touch($files, $time = null, $atime = null)
155155
/**
156156
* Removes files or directories.
157157
*
158-
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to remove
158+
* @param string|iterable $files A filename, an array of files, or a \Traversable instance to remove
159159
*
160160
* @throws IOException When removal fails
161161
*/
@@ -191,10 +191,10 @@ public function remove($files)
191191
/**
192192
* Change mode for an array of files or directories.
193193
*
194-
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to change mode
195-
* @param int $mode The new mode (octal)
196-
* @param int $umask The mode mask (octal)
197-
* @param bool $recursive Whether change the mod recursively or not
194+
* @param string|iterable $files A filename, an array of files, or a \Traversable instance to change mode
195+
* @param int $mode The new mode (octal)
196+
* @param int $umask The mode mask (octal)
197+
* @param bool $recursive Whether change the mod recursively or not
198198
*
199199
* @throws IOException When the change fail
200200
*/
@@ -213,9 +213,9 @@ public function chmod($files, $mode, $umask = 0000, $recursive = false)
213213
/**
214214
* Change the owner of an array of files or directories.
215215
*
216-
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to change owner
217-
* @param string $user The new owner user name
218-
* @param bool $recursive Whether change the owner recursively or not
216+
* @param string|iterable $files A filename, an array of files, or a \Traversable instance to change owner
217+
* @param string $user The new owner user name
218+
* @param bool $recursive Whether change the owner recursively or not
219219
*
220220
* @throws IOException When the change fail
221221
*/
@@ -240,9 +240,9 @@ public function chown($files, $user, $recursive = false)
240240
/**
241241
* Change the group of an array of files or directories.
242242
*
243-
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to change group
244-
* @param string $group The group name
245-
* @param bool $recursive Whether change the group recursively or not
243+
* @param string|iterable $files A filename, an array of files, or a \Traversable instance to change group
244+
* @param string $group The group name
245+
* @param bool $recursive Whether change the group recursively or not
246246
*
247247
* @throws IOException When the change fail
248248
*/

0 commit comments

Comments
 (0)