Skip to content

Commit 2d6908f

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 c13ca94 + 1759b99 commit 2d6908f

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)