Merge branch '2.6' into 2.7

Tobion · Tobion · commit 1e103a7b24c1 · 2015-02-21T14:05:27.000+01:00
Conflicts:
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
diff --git a/DataCollector/DumpDataCollector.php b/DataCollector/DumpDataCollector.php
@@ -115,7 +115,7 @@ public function dump(Data $data)
 
         if (false === $name) {
             $name = strtr($file, '\\', '/');
-            $name = substr($file, strrpos($file, '/') + 1);
+            $name = substr($name, strrpos($name, '/') + 1);
         }
 
         $this->data[] = compact('data', 'name', 'file', 'line', 'fileExcerpt');
diff --git a/Kernel.php b/Kernel.php
@@ -614,7 +614,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
`@@ -115,7 +115,7 @@ public function dump(Data $data)`
`115`	`115`
`116`	`116`	`if (false === $name) {`
`117`	`117`	`$name = strtr($file, '\\', '/');`
`118`		`- $name = substr($file, strrpos($file, '/') + 1);`
	`118`	`+ $name = substr($name, strrpos($name, '/') + 1);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`$this->data[] = compact('data', 'name', 'file', 'line', 'fileExcerpt');`
Original file line number	Diff line number	Diff line change
`@@ -614,7 +614,7 @@ protected function buildContainer()`
`614`	`614`	`{`
`615`	`615`	`foreach (array('cache' => $this->getCacheDir(), 'logs' => $this->getLogDir()) as $name => $dir) {`
`616`	`616`	`if (!is_dir($dir)) {`
`617`		`- if (false === @mkdir($dir, 0777, true)) {`
	`617`	`+ if (false === @mkdir($dir, 0777, true) && !is_dir($dir)) {`
`618`	`618`	`throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n", $name, $dir));`
`619`	`619`	`}`
`620`	`620`	`} elseif (!is_writable($dir)) {`