Merge upstream SimplePie PR details (#3614)

https://github.com/simplepie/simplepie/pull/681
https://github.com/simplepie/simplepie/pull/680
https://github.com/simplepie/simplepie/pull/675

2 files changed, 5 insertions, 3 deletions

diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php
index ec95861cd..15b4dfea4 100644
--- a/lib/SimplePie/SimplePie.php
+++ b/lib/SimplePie/SimplePie.php
@@ -929,6 +929,8 @@ class SimplePie
 
 	/**
 	 * Return the filename (i.e. hash, without path and without extension) of the file to cache a given URL.
+	 * @param string $url The URL of the feed to be cached.
+	 * @return string A filename (i.e. hash, without path and without extension).
 	 */
 	public function get_cache_filename($url)
 	{
diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index 8167ad2fb..9317e71a4 100644
--- a/lib/SimplePie/SimplePie/Misc.php
+++ b/lib/SimplePie/SimplePie/Misc.php
@@ -2255,10 +2255,10 @@ function embed_wmedia(width, height, link) {
 
 	/**
 	 * Sanitize a URL by removing HTTP credentials.
-	 * @param $url the URL to sanitize.
-	 * @return the same URL without HTTP credentials.
+	 * @param string $url the URL to sanitize.
+	 * @return string the same URL without HTTP credentials.
 	 */
-	public static function url_remove_credentials($url)	//FreshRSS
+	public static function url_remove_credentials($url)
 	{
 		return preg_replace('#^(https?://)[^/:@]+:[^/:@]+@#i', '$1', $url);
 	}