Merge branch '2.3' into 2.7

* 2.3:
  Detect Mintty for color support on Windows
  Add a group for tests of the finder against the FTP server
  Fix license headers
  Forbid serializing a Crawler
  Fix phpdoc block of NativeSessionStorage class
  Added exception when setAutoInitialize is called when locked
  [FrameworkBundle] Advanced search templates of bundles
  [Security] Allow user providers to be defined in many files
  Use random_bytes function if it is available for random number generation

Author: fabpot

Tests/Iterator/RecursiveDirectoryIteratorTest.php

@@ -2,12 +2,12 @@
 
 /*
  * This file is part of the Symfony package.
-*
-* (c) Fabien Potencier <[email protected]>
-*
-* For the full copyright and license information, please view the LICENSE
-* file that was distributed with this source code.
-*/
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace Symfony\Component\Finder\Tests\Iterator;
 
@@ -16,42 +16,36 @@
 class RecursiveDirectoryIteratorTest extends IteratorTestCase
 {
     /**
-     * @dataProvider getPaths
-     *
-     * @param string $path
-     * @param bool   $seekable
-     * @param array  $contains
-     * @param string $message
+     * @group network
      */
-    public function testRewind($path, $seekable, $contains, $message = null)
+    public function testRewindOnFtp()
     {
         try {
-            $i = new RecursiveDirectoryIterator($path, \RecursiveDirectoryIterator::SKIP_DOTS);
+            $i = new RecursiveDirectoryIterator('ftp://ftp.mozilla.org/', \RecursiveDirectoryIterator::SKIP_DOTS);
         } catch (\UnexpectedValueException $e) {
-            $this->markTestSkipped(sprintf('Unsupported stream "%s".', $path));
+            $this->markTestSkipped('Unsupported stream "ftp".');
         }
 
         $i->rewind();
 
-        $this->assertTrue(true, $message);
+        $this->assertTrue(true);
     }
 
     /**
-     * @dataProvider getPaths
-     *
-     * @param string $path
-     * @param bool   $seekable
-     * @param array  $contains
-     * @param string $message
+     * @group network
      */
-    public function testSeek($path, $seekable, $contains, $message = null)
+    public function testSeekOnFtp()
     {
         try {
-            $i = new RecursiveDirectoryIterator($path, \RecursiveDirectoryIterator::SKIP_DOTS);
+            $i = new RecursiveDirectoryIterator('ftp://ftp.mozilla.org/', \RecursiveDirectoryIterator::SKIP_DOTS);
         } catch (\UnexpectedValueException $e) {
-            $this->markTestSkipped(sprintf('Unsupported stream "%s".', $path));
+            $this->markTestSkipped('Unsupported stream "ftp".');
         }
 
+        $contains = array(
+            'ftp://ftp.mozilla.org'.DIRECTORY_SEPARATOR.'README',
+            'ftp://ftp.mozilla.org'.DIRECTORY_SEPARATOR.'pub',
+        );
         $actual = array();
 
         $i->seek(0);
@@ -62,18 +56,4 @@ public function testSeek($path, $seekable, $contains, $message = null)
 
         $this->assertEquals($contains, $actual);
     }
-
-    public function getPaths()
-    {
-        $data = array();
-
-        // ftp
-        $contains = array(
-            'ftp://ftp.mozilla.org'.DIRECTORY_SEPARATOR.'README',
-            'ftp://ftp.mozilla.org'.DIRECTORY_SEPARATOR.'pub',
-        );
-        $data[] = array('ftp://ftp.mozilla.org/', false, $contains);
-
-        return $data;
-    }
 }