merged branch webfactory/fix-finder-test-osx (PR #7536)

fabpot · fabpot · commit b70bb448faa9 · 2013-04-01T09:51:50.000+02:00
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7536). Discussion ---------- Fix Finder tests on OS X ... where sys_get_temp_dir() does not return a realpath(). Commits ------- 0ed8441 On OS X, sys_get_tmp_dir() returns /var/private/..., which really is below /private/var.
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php b/src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php
@@ -19,7 +19,7 @@ abstract class RealIteratorTestCase extends IteratorTestCase
 
     public static function setUpBeforeClass()
     {
-        self::$tmpDir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'symfony2_finder';
+        self::$tmpDir = realpath(sys_get_temp_dir()) . DIRECTORY_SEPARATOR . 'symfony2_finder';
 
         self::$files = array(
             '.git/',
@@ -75,7 +75,7 @@ protected static function toAbsolute($files = null)
          * Without the call to setUpBeforeClass() property can be null.
          */
         if (!self::$tmpDir) {
-            self::$tmpDir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'symfony2_finder';
+            self::$tmpDir = realpath(sys_get_temp_dir()) . DIRECTORY_SEPARATOR . 'symfony2_finder';
         }
 
         if (is_array($files)) {

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ abstract class RealIteratorTestCase extends IteratorTestCase`
`19`	`19`
`20`	`20`	`public static function setUpBeforeClass()`
`21`	`21`	`{`
`22`		`- self::$tmpDir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'symfony2_finder';`
	`22`	`+ self::$tmpDir = realpath(sys_get_temp_dir()) . DIRECTORY_SEPARATOR . 'symfony2_finder';`
`23`	`23`
`24`	`24`	`self::$files = array(`
`25`	`25`	`'.git/',`
`@@ -75,7 +75,7 @@ protected static function toAbsolute($files = null)`
`75`	`75`	`* Without the call to setUpBeforeClass() property can be null.`
`76`	`76`	`*/`
`77`	`77`	`if (!self::$tmpDir) {`
`78`		`- self::$tmpDir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'symfony2_finder';`
	`78`	`+ self::$tmpDir = realpath(sys_get_temp_dir()) . DIRECTORY_SEPARATOR . 'symfony2_finder';`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`if (is_array($files)) {`