Skip to content

Commit ca032cc

Browse files
committed
Merge branch '3.1' into 3.2
* 3.1: (31 commits) fixed CS fixed CS fixed CS fixer config fixed typo Revert "fixed typo" fixed typo fixed CS Avoid setting request attributes from signature arguments in AnnotationClassLoader [DependencyInjection] Add some missing typehints in YamlFileLoader [DependencyInjection] minor: Fix a DocBlock [HttpKernel] Give higher priority to adding request formats [PropertyInfo] Don't try to access a property thru a static method [PropertyInfo] Exclude static methods form properties guessing [FrameworkBundle] Fix third level headers for MarkdownDescriptor [Ldap] Using Ldap stored username instead of form submitted one [Ldap] load users with the good username case [DoctrineBridge] Fixed invalid unique value as composite key [Doctrine Bridge] fix UniqueEntityValidator for composite object primary keys [TwigBundle] do not lose already set method calls #20411 fix Yaml parsing for very long quoted strings ...
2 parents 6520f3d + d5a20fa commit ca032cc

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/Dumper/FileDumperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function testDump()
2626
$dumper = new ConcreteFileDumper();
2727
$dumper->dump($catalogue, array('path' => $tempDir));
2828

29-
$this->assertTrue(file_exists($tempDir.'/messages.en.concrete'));
29+
$this->assertFileExists($tempDir.'/messages.en.concrete');
3030
}
3131

3232
/**

Util/ArrayConverter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private static function &getElementByPath(array &$tree, array $parts)
6262
* $tree['foo'] was string before we found array {bar: test2}.
6363
* Treat new element as string too, e.g. add $tree['foo.bar'] = 'test2';
6464
*/
65-
$elem = &$elem[ implode('.', array_slice($parts, $i)) ];
65+
$elem = &$elem[implode('.', array_slice($parts, $i))];
6666
break;
6767
}
6868
$parentOfElem = &$elem;

0 commit comments

Comments
 (0)