remove is_writable check on filesystem cache

4rthem · 4rthem · commit 4dc4f694ca7b · 2016-12-23T13:05:40.000+01:00
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -16,6 +16,7 @@
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Cache\CacheItem;
+use Symfony\Component\Cache\Exception\CacheException;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
@@ -129,6 +130,8 @@ abstract protected function doDelete(array $ids);
      * @param int   $lifetime The lifetime of the cached values, 0 for persisting until manual cleaning
      *
      * @return array|bool The identifiers that failed to be cached or a boolean stating if caching succeeded or not
+     *
+     * @throws CacheException If write can not be performed
      */
     abstract protected function doSave(array $values, $lifetime);
 
diff --git a/src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php b/src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
+use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 
 /**
@@ -39,9 +40,7 @@ public function __construct($namespace = '', $defaultLifetime = 0, $directory =
         if (false === $dir = realpath($dir) ?: (file_exists($dir) ? $dir : false)) {
             throw new InvalidArgumentException(sprintf('Cache directory does not exist (%s)', $directory));
         }
-        if (!is_writable($dir .= DIRECTORY_SEPARATOR)) {
-            throw new InvalidArgumentException(sprintf('Cache directory is not writable (%s)', $directory));
-        }
+        $dir .= DIRECTORY_SEPARATOR;
         // On Windows the whole path is limited to 258 chars
         if ('\\' === DIRECTORY_SEPARATOR && strlen($dir) > 234) {
             throw new InvalidArgumentException(sprintf('Cache directory too long (%s)', $directory));
@@ -141,6 +140,10 @@ protected function doSave(array $values, $lifetime)
             }
         }
 
+        if (!$ok && !is_writable($this->directory)) {
+            throw new CacheException(sprintf('Cache directory is not writable (%s)', $this->directory));
+        }
+
         return $ok;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Cache\Adapter;`
`13`	`13`
	`14`	`+use Symfony\Component\Cache\Exception\CacheException;`
`14`	`15`	`use Symfony\Component\Cache\Exception\InvalidArgumentException;`
`15`	`16`
`16`	`17`	`/**`
`@@ -39,9 +40,7 @@ public function __construct($namespace = '', $defaultLifetime = 0, $directory =`
`39`	`40`	`if (false === $dir = realpath($dir) ?: (file_exists($dir) ? $dir : false)) {`
`40`	`41`	`throw new InvalidArgumentException(sprintf('Cache directory does not exist (%s)', $directory));`
`41`	`42`	`}`
`42`		`- if (!is_writable($dir .= DIRECTORY_SEPARATOR)) {`
`43`		`- throw new InvalidArgumentException(sprintf('Cache directory is not writable (%s)', $directory));`
`44`		`- }`
	`43`	`+ $dir .= DIRECTORY_SEPARATOR;`
`45`	`44`	`// On Windows the whole path is limited to 258 chars`
`46`	`45`	`if ('\\' === DIRECTORY_SEPARATOR && strlen($dir) > 234) {`
`47`	`46`	`throw new InvalidArgumentException(sprintf('Cache directory too long (%s)', $directory));`
`@@ -141,6 +140,10 @@ protected function doSave(array $values, $lifetime)`
`141`	`140`	`}`
`142`	`141`	`}`
`143`	`142`
	`143`	`+ if (!$ok && !is_writable($this->directory)) {`
	`144`	`+ throw new CacheException(sprintf('Cache directory is not writable (%s)', $this->directory));`
	`145`	`+ }`
	`146`	`+`
`144`	`147`	`return $ok;`
`145`	`148`	`}`
`146`	`149`