bug #11726 [Filesystem Component] mkdir race condition fix #11626 (kcassam)

fabpot · fabpot · commit bb9790368461 · 2014-08-27T14:38:41.000+02:00
This PR was squashed before being merged into the 2.3 branch (closes #11726). Discussion ---------- [Filesystem Component] mkdir race condition fix #11626 [Filesystem Component] Fix mkdir race condition | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #11626 | License | MIT | Doc PR | none Commits ------- 0483452 [Filesystem Component] mkdir race condition fix #11626
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -78,7 +78,14 @@ public function mkdir($dirs, $mode = 0777)
             }
 
             if (true !== @mkdir($dir, $mode, true)) {
-                throw new IOException(sprintf('Failed to create %s', $dir));
+                $error = error_get_last();
+                if (!is_dir($dir)) {
+                    // The directory was not created by a concurrent process. Let's throw an exception with a developer friendly error message if we have one
+                    if ($error) {
+                        throw new IOException(sprintf('Failed to create "%s": %s.', $dir, $error['message']));
+                    }
+                    throw new IOException(sprintf('Failed to create "%s"', $dir));
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,14 @@ public function mkdir($dirs, $mode = 0777)`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`if (true !== @mkdir($dir, $mode, true)) {`
`81`		`- throw new IOException(sprintf('Failed to create %s', $dir));`
	`81`	`+ $error = error_get_last();`
	`82`	`+ if (!is_dir($dir)) {`
	`83`	`+ // The directory was not created by a concurrent process. Let's throw an exception with a developer friendly error message if we have one`
	`84`	`+ if ($error) {`
	`85`	`+ throw new IOException(sprintf('Failed to create "%s": %s.', $dir, $error['message']));`
	`86`	`+ }`
	`87`	`+ throw new IOException(sprintf('Failed to create "%s"', $dir));`
	`88`	`+ }`
`82`	`89`	`}`
`83`	`90`	`}`
`84`	`91`	`}`