Fix other issues with readonly caches, refs #10906

Seldaek · Seldaek · commit c3bb27960b73 · 2022-07-01T11:55:43.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ### [2.2.15] 2022-07-01
 
-  * Fixed support for read-only caches where the filesystem is not writable (#10906)
+  * Fixed support for `cache-read-only` where the filesystem is not writable (#10906)
   * Fixed type error when using `allow-plugins: true` (#10909)
   * Fixed @putenv scripts receiving arguments passed to the command (#10846)
   * Fixed support for spaces in paths with binary proxies on Windows (#10836)
diff --git a/src/Composer/Cache.php b/src/Composer/Cache.php
@@ -104,7 +104,7 @@ public function isEnabled()
                     || !is_writable($this->root)
                 )
             ) {
-                $this->io->writeError('<warning>Cannot create cache directory ' . $this->root . ', or directory is not writable. Proceeding without cache</warning>');
+                $this->io->writeError('<warning>Cannot create cache directory ' . $this->root . ', or directory is not writable. Proceeding without cache. See also cache-read-only config if your filesystem is read-only.</warning>');
                 $this->enabled = false;
             }
         }
@@ -265,7 +265,7 @@ public function gcIsNecessary()
      */
     public function remove($file)
     {
-        if ($this->isEnabled()) {
+        if ($this->isEnabled() && !$this->readOnly) {
             $file = Preg::replace('{[^'.$this->allowlist.']}i', '-', $file);
             if (file_exists($this->root . $file)) {
                 return $this->filesystem->unlink($this->root . $file);
@@ -280,7 +280,7 @@ public function remove($file)
      */
     public function clear()
     {
-        if ($this->isEnabled()) {
+        if ($this->isEnabled() && !$this->readOnly) {
             $this->filesystem->emptyDirectory($this->root);
 
             return true;
@@ -314,7 +314,7 @@ public function getAge($file)
      */
     public function gc($ttl, $maxSize)
     {
-        if ($this->isEnabled()) {
+        if ($this->isEnabled() && !$this->readOnly) {
             $expire = new \DateTime();
             $expire->modify('-'.$ttl.' seconds');
 

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function isEnabled()`
`104`	`104`	`\|\| !is_writable($this->root)`
`105`	`105`	`)`
`106`	`106`	`) {`
`107`		`- $this->io->writeError('<warning>Cannot create cache directory ' . $this->root . ', or directory is not writable. Proceeding without cache</warning>');`
	`107`	`+ $this->io->writeError('<warning>Cannot create cache directory ' . $this->root . ', or directory is not writable. Proceeding without cache. See also cache-read-only config if your filesystem is read-only.</warning>');`
`108`	`108`	`$this->enabled = false;`
`109`	`109`	`}`
`110`	`110`	`}`
`@@ -265,7 +265,7 @@ public function gcIsNecessary()`
`265`	`265`	`*/`
`266`	`266`	`public function remove($file)`
`267`	`267`	`{`
`268`		`- if ($this->isEnabled()) {`
	`268`	`+ if ($this->isEnabled() && !$this->readOnly) {`
`269`	`269`	`$file = Preg::replace('{[^'.$this->allowlist.']}i', '-', $file);`
`270`	`270`	`if (file_exists($this->root . $file)) {`
`271`	`271`	`return $this->filesystem->unlink($this->root . $file);`
`@@ -280,7 +280,7 @@ public function remove($file)`
`280`	`280`	`*/`
`281`	`281`	`public function clear()`
`282`	`282`	`{`
`283`		`- if ($this->isEnabled()) {`
	`283`	`+ if ($this->isEnabled() && !$this->readOnly) {`
`284`	`284`	`$this->filesystem->emptyDirectory($this->root);`
`285`	`285`
`286`	`286`	`return true;`
`@@ -314,7 +314,7 @@ public function getAge($file)`
`314`	`314`	`*/`
`315`	`315`	`public function gc($ttl, $maxSize)`
`316`	`316`	`{`
`317`		`- if ($this->isEnabled()) {`
	`317`	`+ if ($this->isEnabled() && !$this->readOnly) {`
`318`	`318`	`$expire = new \DateTime();`
`319`	`319`	`$expire->modify('-'.$ttl.' seconds');`
`320`	`320`