Merge branch '2.8'

* 2.8: (28 commits)
  Detect Mintty for color support on Windows
  Detect Mintty for color support on Windows
  [WebProfilerBundle] Fix search button click listener
  [Form][Type Date/Time] added choice_translation_domain option.
  Massively simplifying the BC and deprecated-throwing code thanks to suggestions by stof in #15870
  Making all "debug" messages use the debug router
  Making GuardTokenInterface extend TokenInterface
  Updating behavior to not continue after an authenticator has set the response
  Add a group for tests of the finder against the FTP server
  Fix trigger_error calls
  Fix legacy security tests
  tweaking message related to configuration edge case that we want to be helpful with
  Minor tweaks - lowering the required security-http requirement and nulling out a test field
  Fix license headers
  Fix license headers
  Fix license headers
  Ensure the ClockMock is loaded before using it in the testsuite
  Allow serializer 3.0 in the PropertyInfo component
  Add the replace rules for the security-guard component
  Forbid serializing a Crawler
  ...

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;
-    }
 }