Merge branch '2.3' into 2.5

* 2.3: [Form] Remove a redundant test. use value of DIRECTORY_SEPARATOR to detect Windows Conflicts: src/Symfony/Component/Console/Application.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php src/Symfony/Component/Process/Process.php
symfony · Dec 30, 2014 · 6dd0826 · 6dd0826
2 parents 00de485 + c2cc86b
commit 6dd0826
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Iterator/PathFilterIterator.php b/Iterator/PathFilterIterator.php
@@ -28,7 +28,7 @@ public function accept()
     {
         $filename = $this->current()->getRelativePathname();
 
-        if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+        if ('\\' === DIRECTORY_SEPARATOR) {
             $filename = strtr($filename, '\\', '/');
         }
 

diff --git a/Tests/FinderTest.php b/Tests/FinderTest.php
@@ -745,7 +745,7 @@ public function getTestPathData()
      */
     public function testAccessDeniedException(Adapter\AdapterInterface $adapter)
     {
-        if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+        if ('\\' === DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('chmod is not supported on Windows');
         }
 
@@ -784,7 +784,7 @@ public function testAccessDeniedException(Adapter\AdapterInterface $adapter)
      */
     public function testIgnoredAccessDeniedException(Adapter\AdapterInterface $adapter)
     {
-        if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+        if ('\\' === DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('chmod is not supported on Windows');
         }