Skip to content

Commit 4125b6e

Browse files
Merge branch '2.3' into 2.6
* 2.3: Minor fixes Towards 100% HHVM compat trigger event with right user (add test) [Security] Initialize SwitchUserEvent::targetUser on attemptExitUser [Form] Fixed: Data mappers always receive forms indexed by their names Conflicts: src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php src/Symfony/Component/Filesystem/Filesystem.php src/Symfony/Component/Process/Tests/AbstractProcessTest.php
2 parents 1a74640 + 66a7614 commit 4125b6e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/Generator/Dumper/PhpGeneratorDumperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected function setUp()
3939

4040
$this->routeCollection = new RouteCollection();
4141
$this->generatorDumper = new PhpGeneratorDumper($this->routeCollection);
42-
$this->testTmpFilepath = sys_get_temp_dir().DIRECTORY_SEPARATOR.'php_generator.php';
42+
$this->testTmpFilepath = sys_get_temp_dir().DIRECTORY_SEPARATOR.'php_generator.'.$this->getName().'.php';
4343
@unlink($this->testTmpFilepath);
4444
}
4545

0 commit comments

Comments
 (0)