Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit fc6b9ec67e5e · 2017-10-02T10:46:46.000+02:00
* 2.7:
  fix tests
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -23,7 +23,7 @@
     "require-dev": {
         "symfony/stopwatch": "~2.2|~3.0.0",
         "symfony/dependency-injection": "~2.2|~3.0.0",
-        "symfony/form": "^2.8.27|~3.3.10",
+        "symfony/form": "^2.8.28|~3.3.10",
         "symfony/http-kernel": "~2.2|~3.0.0",
         "symfony/property-access": "~2.3|~3.0.0",
         "symfony/property-info": "~2.8|3.0",
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -374,6 +374,9 @@ public function testFilesExists()
      */
     public function testFilesExistsFails()
     {
+        if ('\\' !== DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Long file names are an issue on Windows');
+        }
         $basePath = $this->workspace.'\\directory\\';
         $maxPathLength = PHP_MAXPATHLEN - 2;
 

Original file line number	Diff line number	Diff line change
`@@ -374,6 +374,9 @@ public function testFilesExists()`
`374`	`374`	`*/`
`375`	`375`	`public function testFilesExistsFails()`
`376`	`376`	`{`
	`377`	`+ if ('\\' !== DIRECTORY_SEPARATOR) {`
	`378`	`+ $this->markTestSkipped('Long file names are an issue on Windows');`
	`379`	`+ }`
`377`	`380`	`$basePath = $this->workspace.'\\directory\\';`
`378`	`381`	`$maxPathLength = PHP_MAXPATHLEN - 2;`
`379`	`382`