Merge pull request #94 from oleg-andreyev/unify-getcacheid

ashnazg · web-flow · commit e28643ec3ac9 · 2019-11-19T12:18:47.000-06:00
Updated logic in useLocalCache to reuse getCacheId
diff --git a/PEAR/REST.php b/PEAR/REST.php
@@ -173,13 +173,7 @@ function retrieveData($url, $accept = false, $forcestring = false, $channel = fa
     function useLocalCache($url, $cacheid = null)
     {
         if (!is_array($cacheid)) {
-            $cacheidfile = $this->config->get('cache_dir') . DIRECTORY_SEPARATOR .
-                md5($url) . 'rest.cacheid';
-            if (!file_exists($cacheidfile)) {
-                return false;
-            }
-
-            $cacheid = unserialize(implode('', file($cacheidfile)));
+            $cacheid = $this->getCacheId($url);
         }
 
         $cachettl = $this->config->get('cache_ttl');
@@ -191,6 +185,11 @@ function useLocalCache($url, $cacheid = null)
         return false;
     }
 
+    /**
+     * @param string $url
+     *
+     * @return bool|mixed
+     */
     function getCacheId($url)
     {
         $cacheidfile = $this->config->get('cache_dir') . DIRECTORY_SEPARATOR .

Original file line number	Diff line number	Diff line change
`@@ -173,13 +173,7 @@ function retrieveData($url, $accept = false, $forcestring = false, $channel = fa`
`173`	`173`	`function useLocalCache($url, $cacheid = null)`
`174`	`174`	`{`
`175`	`175`	`if (!is_array($cacheid)) {`
`176`		`- $cacheidfile = $this->config->get('cache_dir') . DIRECTORY_SEPARATOR .`
`177`		`- md5($url) . 'rest.cacheid';`
`178`		`- if (!file_exists($cacheidfile)) {`
`179`		`- return false;`
`180`		`- }`
`181`		`-`
`182`		`- $cacheid = unserialize(implode('', file($cacheidfile)));`
	`176`	`+ $cacheid = $this->getCacheId($url);`
`183`	`177`	`}`
`184`	`178`
`185`	`179`	`$cachettl = $this->config->get('cache_ttl');`
`@@ -191,6 +185,11 @@ function useLocalCache($url, $cacheid = null)`
`191`	`185`	`return false;`
`192`	`186`	`}`
`193`	`187`
	`188`	`+ /**`
	`189`	`+ * @param string $url`
	`190`	`+ *`
	`191`	`+ * @return bool\|mixed`
	`192`	`+ */`
`194`	`193`	`function getCacheId($url)`
`195`	`194`	`{`
`196`	`195`	`$cacheidfile = $this->config->get('cache_dir') . DIRECTORY_SEPARATOR .`