public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #7478 from staabm/patch-1 

prevent preg_replace() calls when cache is not enabled
pull/7483/head
Jordi Boggiano 2018-07-20 11:47:09 +02:00 committed by GitHub
parent 16af52be8a 3b647f8686
commit 145db9ff52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Composer/Cache.php
View File

@ -71,12 +71,14 @@ class Cache
public function read($file) public function read($file)
{ {
if ($this->enabled) {
$file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file); $file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file);
if ($this->enabled && file_exists($this->root . $file)) { if (file_exists($this->root . $file)) {
$this->io->writeError('Reading '.$this->root . $file.' from cache', true, IOInterface::DEBUG); $this->io->writeError('Reading '.$this->root . $file.' from cache', true, IOInterface::DEBUG);
return file_get_contents($this->root . $file); return file_get_contents($this->root . $file);
} }
}
return false; return false;
} }
@ -142,8 +144,9 @@ class Cache
*/ */
public function copyTo($file, $target) public function copyTo($file, $target)
{ {
if ($this->enabled) {
$file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file); $file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file);
if ($this->enabled && file_exists($this->root . $file)) { if (file_exists($this->root . $file)) {
try { try {
touch($this->root . $file, filemtime($this->root . $file), time()); touch($this->root . $file, filemtime($this->root . $file), time());
} catch (\ErrorException $e) { } catch (\ErrorException $e) {
@ -156,6 +159,7 @@ class Cache
return copy($this->root . $file, $target); return copy($this->root . $file, $target);
} }
}
return false; return false;
} }
@ -167,10 +171,12 @@ class Cache
public function remove($file) public function remove($file)
{ {
if ($this->enabled) {
$file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file); $file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file);
if ($this->enabled && file_exists($this->root . $file)) { if (file_exists($this->root . $file)) {
return $this->filesystem->unlink($this->root . $file); return $this->filesystem->unlink($this->root . $file);
} }
}
return false; return false;
} }
@ -216,20 +222,24 @@ class Cache
public function sha1($file) public function sha1($file)
{ {
if ($this->enabled) {
$file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file); $file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file);
if ($this->enabled && file_exists($this->root . $file)) { if (file_exists($this->root . $file)) {
return sha1_file($this->root . $file); return sha1_file($this->root . $file);
} }
}
return false; return false;
} }
public function sha256($file) public function sha256($file)
{ {
if ($this->enabled) {
$file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file); $file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file);
if ($this->enabled && file_exists($this->root . $file)) { if (file_exists($this->root . $file)) {
return hash_file('sha256', $this->root . $file); return hash_file('sha256', $this->root . $file);
} }
}
return false; return false;
} }