Merge branch '2.3' into 2.6

Tobion · Tobion · commit 1a07aedf2717 · 2015-02-21T13:49:08.000+01:00
Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
	src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php
diff --git a/Kernel.php b/Kernel.php
@@ -605,7 +605,7 @@ protected function buildContainer()
     {
         foreach (array('cache' => $this->getCacheDir(), 'logs' => $this->getLogDir()) as $name => $dir) {
             if (!is_dir($dir)) {
-                if (false === @mkdir($dir, 0777, true)) {
+                if (false === @mkdir($dir, 0777, true) && !is_dir($dir)) {
                     throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n", $name, $dir));
                 }
             } elseif (!is_writable($dir)) {

Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,7 @@ protected function buildContainer()`
`605`	`605`	`{`
`606`	`606`	`foreach (array('cache' => $this->getCacheDir(), 'logs' => $this->getLogDir()) as $name => $dir) {`
`607`	`607`	`if (!is_dir($dir)) {`
`608`		`- if (false === @mkdir($dir, 0777, true)) {`
	`608`	`+ if (false === @mkdir($dir, 0777, true) && !is_dir($dir)) {`
`609`	`609`	`throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n", $name, $dir));`
`610`	`610`	`}`
`611`	`611`	`} elseif (!is_writable($dir)) {`