Merge branch 'master' into master

src/Netresearch/Composer/Patches/Downloader/Composer.php

@@ -24,12 +24,6 @@ class Composer implements DownloaderInterface {
 	 */
 	protected $remoteFileSystem;
 
-	/**
-	 * Very simple cache system
-	 * @var array
-	 */
-	protected $cache = array();
-
 	/**
 	 * Construct the RFS
 	 * 
@@ -69,13 +63,8 @@ protected function resolveVendorPath($url) {
 	 * @return string Contents of the URL
 	 */
 	public function getContents($url) {
-	    if (array_key_exists($url, $this->cache)) {
-		return $this->cache[$url];
-	    }
-
 	    $path = $this->resolveVendorPath($url);
-
-	    return $this->cache[$url] = $this->remoteFileSystem->getContents($this->getOriginUrl($url), $path, false);
+		  return $this->cache[$url] = $this->remoteFileSystem->getContents($this->getOriginUrl($url), $path, false);
 	}
 
     /**
@@ -85,12 +74,8 @@ public function getContents($url) {
 	 * @return stdClass
 	 */
 	public function getJson($url) {
-		$key = 'json://' . $url;
-		if (array_key_exists($key, $this->cache)) {
-			return $this->cache[$key];
-		}
 		$json = new \Composer\Json\JsonFile($url, $this->remoteFileSystem);
-		return $this->cache[$key] = $json->read();
+		return $json->read();
 	}
 }
 ?>