Merge branch '3.0'

nicolas-grekas · nicolas-grekas · commit 8361ed04ab5c · 2016-02-04T15:47:41.000+01:00
* 3.0:
  [appveyor] Ignore failures due to STATUS_ACCESS_VIOLATION errors

Conflicts:
	src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php
diff --git a/Tests/Resource/DirectoryResourceTest.php b/Tests/Resource/DirectoryResourceTest.php
@@ -19,7 +19,7 @@ class DirectoryResourceTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->directory = realpath(sys_get_temp_dir()).'/symfonyDirectoryIterator';
+        $this->directory = sys_get_temp_dir().DIRECTORY_SEPARATOR.'symfonyDirectoryIterator';
         if (!file_exists($this->directory)) {
             mkdir($this->directory);
         }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class DirectoryResourceTest extends \PHPUnit_Framework_TestCase`
`19`	`19`
`20`	`20`	`protected function setUp()`
`21`	`21`	`{`
`22`		`- $this->directory = realpath(sys_get_temp_dir()).'/symfonyDirectoryIterator';`
	`22`	`+ $this->directory = sys_get_temp_dir().DIRECTORY_SEPARATOR.'symfonyDirectoryIterator';`
`23`	`23`	`if (!file_exists($this->directory)) {`
`24`	`24`	`mkdir($this->directory);`
`25`	`25`	`}`