merged branch adrienbrault/patch-1 (PR #9016)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9016).

Discussion
----------

[Config] Fix FileResource test

I had the following test failing on OS X before:

```
There was 1 failure:

1) Symfony\Component\Config\Tests\Resource\FileResourceTest::testSerializeUnserialize
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-/var/folders/ph/1jns4kxj653gqg7try5m2k780000gn/T/tmp.xml
+/private/var/folders/ph/1jns4kxj653gqg7try5m2k780000gn/T/tmp.xml

symfony/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php:56
```

Commits
-------

76a5b50 [Config] Fix FileResource test
This commit is contained in:
Fabien Potencier 2013-09-13 07:11:26 +02:00
commit 27423104aa
1 changed files with 1 additions and 1 deletions

View File

@ -20,7 +20,7 @@ class FileResourceTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->file = sys_get_temp_dir().'/tmp.xml';
$this->file = realpath(sys_get_temp_dir()).'/tmp.xml';
touch($this->file);
$this->resource = new FileResource($this->file);
}