merged branch bdmu/ticket_5233 (PR #5234)

fabpot · fabpot · commit 173f23de3474 · 2012-08-21T15:33:05.000+02:00
Commits ------- 47b8538 [Filesystem] missing realpath breaking FilesystemTest class on Windows (one line of code change) Discussion ---------- [Filesystem] missing readlink breaking FilesystemTest class on Windows Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: #5233 Todo: License of the code: MIT Documentation PR: fix for windows plateform $file == 'C:\Users\USERNA~1\...' before touch $file == 'C:\Users\Username\... after the touch and readlink so it can pass following assertEquals --------------------------------------------------------------------------- by bdmu at 2012-08-13T05:35:07Z Hello, Another solution may be (need to test it) to add $this->workspace = realpath($this->workspace); line 36, after the mkdir($this->workspace, 0777, true); in the setup method Regards, Christophe
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -33,6 +33,7 @@ public function setUp()
         $this->filesystem = new Filesystem();
         $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().rand(0, 1000);
         mkdir($this->workspace, 0777, true);
+        $this->workspace = realpath($this->workspace);
     }
 
     public function tearDown()

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public function setUp()`
`33`	`33`	`$this->filesystem = new Filesystem();`
`34`	`34`	`$this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().rand(0, 1000);`
`35`	`35`	`mkdir($this->workspace, 0777, true);`
	`36`	`+ $this->workspace = realpath($this->workspace);`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`public function tearDown()`