bug #22374 [Cache] Remove exception false-positive from FilesystemAdapterTrait (nicolas-grekas)

fabpot · fabpot · commit bca09e4933d9 · 2017-04-11T11:23:14.000-07:00
This PR was merged into the 3.2 branch. Discussion ---------- [Cache] Remove exception false-positive from FilesystemAdapterTrait | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #20517 | License | MIT | Doc PR | - As reported in the linked issue, there seem to be a race condition in FilesystemAdapterTrait (maybe related to realpath cache?). Let's remove that exception: if the mkdir really fails, the error will be logged later on when a cache entry will be written (or succeed if the race is over.) Commits ------- a756db7 [Cache] Remove exception false-positive from FilesystemAdapterTrait
diff --git a/src/Symfony/Component/Cache/Adapter/FilesystemAdapterTrait.php b/src/Symfony/Component/Cache/Adapter/FilesystemAdapterTrait.php
@@ -27,26 +27,25 @@ private function init($namespace, $directory)
     {
         if (!isset($directory[0])) {
             $directory = sys_get_temp_dir().'/symfony-cache';
+        } else {
+            $directory = realpath($directory) ?: $directory;
         }
         if (isset($namespace[0])) {
             if (preg_match('#[^-+_.A-Za-z0-9]#', $namespace, $match)) {
                 throw new InvalidArgumentException(sprintf('Namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0]));
             }
-            $directory .= '/'.$namespace;
+            $directory .= DIRECTORY_SEPARATOR.$namespace;
         }
-        if (!file_exists($dir = $directory.'/.')) {
+        if (!file_exists($directory)) {
             @mkdir($directory, 0777, true);
         }
-        if (false === $dir = realpath($dir) ?: (file_exists($dir) ? $dir : false)) {
-            throw new InvalidArgumentException(sprintf('Cache directory does not exist (%s)', $directory));
-        }
-        $dir .= DIRECTORY_SEPARATOR;
+        $directory .= DIRECTORY_SEPARATOR;
         // On Windows the whole path is limited to 258 chars
-        if ('\\' === DIRECTORY_SEPARATOR && strlen($dir) > 234) {
+        if ('\\' === DIRECTORY_SEPARATOR && strlen($directory) > 234) {
             throw new InvalidArgumentException(sprintf('Cache directory too long (%s)', $directory));
         }
 
-        $this->directory = $dir;
+        $this->directory = $directory;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -27,26 +27,25 @@ private function init($namespace, $directory)`
`27`	`27`	`{`
`28`	`28`	`if (!isset($directory[0])) {`
`29`	`29`	`$directory = sys_get_temp_dir().'/symfony-cache';`
	`30`	`+ } else {`
	`31`	`+ $directory = realpath($directory) ?: $directory;`
`30`	`32`	`}`
`31`	`33`	`if (isset($namespace[0])) {`
`32`	`34`	`if (preg_match('#[^-+_.A-Za-z0-9]#', $namespace, $match)) {`
`33`	`35`	`throw new InvalidArgumentException(sprintf('Namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0]));`
`34`	`36`	`}`
`35`		`- $directory .= '/'.$namespace;`
	`37`	`+ $directory .= DIRECTORY_SEPARATOR.$namespace;`
`36`	`38`	`}`
`37`		`- if (!file_exists($dir = $directory.'/.')) {`
	`39`	`+ if (!file_exists($directory)) {`
`38`	`40`	`@mkdir($directory, 0777, true);`
`39`	`41`	`}`
`40`		`- if (false === $dir = realpath($dir) ?: (file_exists($dir) ? $dir : false)) {`
`41`		`- throw new InvalidArgumentException(sprintf('Cache directory does not exist (%s)', $directory));`
`42`		`- }`
`43`		`- $dir .= DIRECTORY_SEPARATOR;`
	`42`	`+ $directory .= DIRECTORY_SEPARATOR;`
`44`	`43`	`// On Windows the whole path is limited to 258 chars`
`45`		`- if ('\\' === DIRECTORY_SEPARATOR && strlen($dir) > 234) {`
	`44`	`+ if ('\\' === DIRECTORY_SEPARATOR && strlen($directory) > 234) {`
`46`	`45`	`throw new InvalidArgumentException(sprintf('Cache directory too long (%s)', $directory));`
`47`	`46`	`}`
`48`	`47`
`49`		`- $this->directory = $dir;`
	`48`	`+ $this->directory = $directory;`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`/**`