minor #16986 Fix Filesystem tests on Windows (WouterJ)

fabpot · fabpot · commit 025f761798e2 · 2016-01-27T08:39:45.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- Fix Filesystem tests on Windows | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #16985 | License | MIT | Doc PR | - PHP's symlink function doesn't support relative symlinks on Windows. Running the filesystem tests in Windows resulted in 2 erroring tests because of this. After this PR, these tests are skipped on Windows. The error wasn't catched by appveyor, as appveyor doesn't support symlinks at all. Commits ------- c376cf3 Fix FileSystem tests on Windows
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -884,7 +884,7 @@ public function testMirrorCopiesLinks()
 
     public function testMirrorCopiesLinkedDirectoryContents()
     {
-        $this->markAsSkippedIfSymlinkIsMissing();
+        $this->markAsSkippedIfSymlinkIsMissing(true);
 
         $sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;
 
@@ -904,7 +904,7 @@ public function testMirrorCopiesLinkedDirectoryContents()
 
     public function testMirrorCopiesRelativeLinkedContents()
     {
-        $this->markAsSkippedIfSymlinkIsMissing();
+        $this->markAsSkippedIfSymlinkIsMissing(true);
 
         $sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;
         $oldPath = getcwd();
@@ -1028,7 +1028,10 @@ private function getFileGroup($filepath)
         $this->markTestSkipped('Unable to retrieve file group name');
     }
 
-    private function markAsSkippedIfSymlinkIsMissing()
+    /**
+     * @param bool $relative Whether support for relative symlinks is required
+     */
+    private function markAsSkippedIfSymlinkIsMissing($relative = false)
     {
         if (!function_exists('symlink')) {
             $this->markTestSkipped('symlink is not supported');
@@ -1037,6 +1040,11 @@ private function markAsSkippedIfSymlinkIsMissing()
         if (false === self::$symlinkOnWindows) {
             $this->markTestSkipped('symlink requires "Create symbolic links" privilege on Windows');
         }
+
+        // https://bugs.php.net/bug.php?id=69473
+        if ($relative && '\\' === DIRECTORY_SEPARATOR && 1 === PHP_ZTS) {
+            $this->markTestSkipped('symlink does not support relative paths on thread safe Windows PHP versions');
+        }
     }
 
     private function markAsSkippedIfChmodIsMissing()

Original file line number	Diff line number	Diff line change
`@@ -884,7 +884,7 @@ public function testMirrorCopiesLinks()`
`884`	`884`
`885`	`885`	`public function testMirrorCopiesLinkedDirectoryContents()`
`886`	`886`	`{`
`887`		`- $this->markAsSkippedIfSymlinkIsMissing();`
	`887`	`+ $this->markAsSkippedIfSymlinkIsMissing(true);`
`888`	`888`
`889`	`889`	`$sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;`
`890`	`890`
`@@ -904,7 +904,7 @@ public function testMirrorCopiesLinkedDirectoryContents()`
`904`	`904`
`905`	`905`	`public function testMirrorCopiesRelativeLinkedContents()`
`906`	`906`	`{`
`907`		`- $this->markAsSkippedIfSymlinkIsMissing();`
	`907`	`+ $this->markAsSkippedIfSymlinkIsMissing(true);`
`908`	`908`
`909`	`909`	`$sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;`
`910`	`910`	`$oldPath = getcwd();`
`@@ -1028,7 +1028,10 @@ private function getFileGroup($filepath)`
`1028`	`1028`	`$this->markTestSkipped('Unable to retrieve file group name');`
`1029`	`1029`	`}`
`1030`	`1030`
`1031`		`- private function markAsSkippedIfSymlinkIsMissing()`
	`1031`	`+ /**`
	`1032`	`+ * @param bool $relative Whether support for relative symlinks is required`
	`1033`	`+ */`
	`1034`	`+ private function markAsSkippedIfSymlinkIsMissing($relative = false)`
`1032`	`1035`	`{`
`1033`	`1036`	`if (!function_exists('symlink')) {`
`1034`	`1037`	`$this->markTestSkipped('symlink is not supported');`
`@@ -1037,6 +1040,11 @@ private function markAsSkippedIfSymlinkIsMissing()`
`1037`	`1040`	`if (false === self::$symlinkOnWindows) {`
`1038`	`1041`	`$this->markTestSkipped('symlink requires "Create symbolic links" privilege on Windows');`
`1039`	`1042`	`}`
	`1043`	`+`
	`1044`	`+ // https://bugs.php.net/bug.php?id=69473`
	`1045`	`+ if ($relative && '\\' === DIRECTORY_SEPARATOR && 1 === PHP_ZTS) {`
	`1046`	`+ $this->markTestSkipped('symlink does not support relative paths on thread safe Windows PHP versions');`
	`1047`	`+ }`
`1040`	`1048`	`}`
`1041`	`1049`
`1042`	`1050`	`private function markAsSkippedIfChmodIsMissing()`