Skip to content

Commit 013e9ec

Browse files
Merge branch '2.6' into 2.7
* 2.6: [2.6] Towards 100% HHVM compat [Security/Http] Fix test [Stopwatch] Fix test Minor fixes Towards 100% HHVM compat unify default AccessDeniedExeption message 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/Bundle/FrameworkBundle/Controller/Controller.php src/Symfony/Component/VarDumper/Tests/CliDumperTest.php src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
2 parents b5e2a38 + 4125b6e commit 013e9ec

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)