Merge branch '2.3' into 2.7

* 2.3:
  Windows and Intl fixes
  Add appveyor.yml for C.I. on Windows
  [travis] merge php: nightly and deps=high test-matrix lines
  [Security] Add missing docblock in PreAuthenticatedToken

Conflicts:
	.travis.yml
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/HttpFoundation/JsonResponse.php
	src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php

Author: nicolas-grekas

Tests/Iterator/RecursiveDirectoryIteratorTest.php

@@ -60,9 +60,6 @@ public function testSeek($path, $seekable, $contains, $message = null)
         $i->seek(1);
         $actual[] = $i->getPathname();
 
-        $i->seek(2);
-        $actual[] = $i->getPathname();
-
         $this->assertEquals($contains, $actual);
     }
 
@@ -73,7 +70,6 @@ public function getPaths()
         // ftp
         $contains = array(
             'ftp://ftp.mozilla.org'.DIRECTORY_SEPARATOR.'README',
-            'ftp://ftp.mozilla.org'.DIRECTORY_SEPARATOR.'index.html',
             'ftp://ftp.mozilla.org'.DIRECTORY_SEPARATOR.'pub',
         );
         $data[] = array('ftp://ftp.mozilla.org/', false, $contains);

Tests/Iterator/SortableIteratorTest.php

@@ -33,7 +33,11 @@ public function testAccept($mode, $expected)
         if (!is_callable($mode)) {
             switch ($mode) {
                 case SortableIterator::SORT_BY_ACCESSED_TIME :
-                    file_get_contents(self::toAbsolute('.git'));
+                    if ('\\' === DIRECTORY_SEPARATOR) {
+                        touch(self::toAbsolute('.git'));
+                    } else {
+                        file_get_contents(self::toAbsolute('.git'));
+                    }
                     sleep(1);
                     file_get_contents(self::toAbsolute('.bar'));
                     break;
@@ -56,7 +60,11 @@ public function testAccept($mode, $expected)
 
         if ($mode === SortableIterator::SORT_BY_ACCESSED_TIME
             || $mode === SortableIterator::SORT_BY_CHANGED_TIME
-            || $mode === SortableIterator::SORT_BY_MODIFIED_TIME) {
+            || $mode === SortableIterator::SORT_BY_MODIFIED_TIME
+        ) {
+            if ('\\' === DIRECTORY_SEPARATOR && SortableIterator::SORT_BY_MODIFIED_TIME !== $mode) {
+                $this->markTestSkipped('Sorting by atime or ctime is not supported on Windows');
+            }
             $this->assertOrderedIteratorForGroups($expected, $iterator);
         } else {
             $this->assertOrderedIterator($expected, $iterator);

Tests/Shell/CommandTest.php

@@ -86,7 +86,7 @@ public function testArg()
         $cmd = Command::create()->add('--force');
 
         $cmd->arg('--run');
-        $this->assertSame('--force \'--run\'', $cmd->join());
+        $this->assertSame('--force '.escapeshellarg('--run'), $cmd->join());
     }
 
     public function testCmd()