Skip to content

Commit f52b8a3

Browse files
Merge branch '2.3' into 2.6
* 2.3: [Routing][DependencyInjection] Support .yaml extension in YAML loaders [DX] improve file loader error for router/other resources in bundle [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors [HttpKernel] Cleanup ExceptionListener CS fixes [DependencyInjection] Show better error when the Yaml component is not installed [2.3] SCA for Components - reference mismatches [2.3] Static Code Analysis for Components [Translation][fixed test] refresh cache when resources are no longer fresh. [Validator] Added missing Simplified Chinese (zh_CN) translations [FrameworkBundle] Workaround php -S ignoring auto_prepend_file Conflicts: src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php src/Symfony/Component/Config/Exception/FileLoaderLoadException.php src/Symfony/Component/Console/Descriptor/TextDescriptor.php src/Symfony/Component/Console/Helper/TableHelper.php src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php src/Symfony/Component/PropertyAccess/PropertyAccessor.php src/Symfony/Component/Yaml/Tests/InlineTest.php
2 parents 85e099e + 3e3c5eb commit f52b8a3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/Iterator/IteratorTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected function assertOrderedIteratorForGroups($expected, \Traversable $itera
5151
foreach ($expected as $subarray) {
5252
$temp = array();
5353
while (count($values) && count($temp) < count($subarray)) {
54-
array_push($temp, array_shift($values));
54+
$temp[] = array_shift($values);
5555
}
5656
sort($temp);
5757
sort($subarray);

0 commit comments

Comments
 (0)