use value of DIRECTORY_SEPARATOR to detect Windows

This commit unifies the detection of Windows builds across the Symfony codebase.
symfony · Dec 31, 2014 · ee728f8 · ee728f8
1 parent 3817839
commit ee728f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Filesystem.php b/Filesystem.php
@@ -286,7 +286,7 @@ public function rename($origin, $target, $overwrite = false)
      */
     public function symlink($originDir, $targetDir, $copyOnWindows = false)
     {
-        if (defined('PHP_WINDOWS_VERSION_MAJOR') && $copyOnWindows) {
+        if ('\\' === DIRECTORY_SEPARATOR && $copyOnWindows) {
             $this->mirror($originDir, $targetDir);
 
             return;

diff --git a/Tests/FilesystemTest.php b/Tests/FilesystemTest.php
@@ -59,7 +59,7 @@ public function testCopyFails()
     public function testCopyUnreadableFileFails()
     {
         // skip test on Windows; PHP can't easily set file as unreadable on Windows
-        if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+        if ('\\' === DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('This test cannot run on Windows.');
         }
 
@@ -133,7 +133,7 @@ public function testCopyOverridesExistingFileIfForced()
     public function testCopyWithOverrideWithReadOnlyTargetFails()
     {
         // skip test on Windows; PHP can't easily set file as unwritable on Windows
-        if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+        if ('\\' === DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('This test cannot run on Windows.');
         }