Skip to content

Commit 2dcc5e6

Browse files
Merge branch '2.7' into 2.8
* 2.7: [SecurityBundle] Fix syntax error in test [Console] Remove remaining dead code bumped Symfony version to 2.7.39 updated VERSION for 2.7.38 updated CHANGELOG for 2.7.38 Replace array|\Traversable by iterable Fix ambiguous pattern
2 parents ae2802c + debf4c6 commit 2dcc5e6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Data/Bundle/Writer/TextBundleWriter.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,11 @@ private function writeArray($file, array $value, $indentation)
195195
/**
196196
* Writes a "table" node.
197197
*
198-
* @param resource $file The file handle to write to
199-
* @param array|\Traversable $value The value of the node
200-
* @param int $indentation The number of levels to indent
201-
* @param bool $fallback Whether the table should be merged
202-
* with the fallback locale
198+
* @param resource $file The file handle to write to
199+
* @param iterable $value The value of the node
200+
* @param int $indentation The number of levels to indent
201+
* @param bool $fallback Whether the table should be merged
202+
* with the fallback locale
203203
*
204204
* @throws UnexpectedTypeException when $value is not an array and not a
205205
* \Traversable instance

0 commit comments

Comments
 (0)