MDL-65750 lib: update simplepie to 1.5.2

VincentSD · Jul 10, 2019 · 4155b7a · 4155b7a
1 parent fac49f8
commit 4155b7a
Show file tree

Hide file tree

Showing 28 changed files with 591 additions and 877 deletions.
diff --git a/lib/simplepie/library/SimplePie.php b/lib/simplepie/library/SimplePie.php
diff --git a/lib/simplepie/library/SimplePie/Author.php b/lib/simplepie/library/SimplePie/Author.php
@@ -113,10 +113,8 @@ public function get_name()
 		{
 			return $this->name;
 		}
-		else
-		{
-			return null;
-		}
+
+		return null;
 	}
 
 	/**
@@ -130,10 +128,8 @@ public function get_link()
 		{
 			return $this->link;
 		}
-		else
-		{
-			return null;
-		}
+
+		return null;
 	}
 
 	/**
@@ -147,10 +143,7 @@ public function get_email()
 		{
 			return $this->email;
 		}
-		else
-		{
-			return null;
-		}
+
+		return null;
 	}
 }
-
diff --git a/lib/simplepie/library/SimplePie/Cache/File.php b/lib/simplepie/library/SimplePie/Cache/File.php
@@ -101,7 +101,7 @@ public function __construct($location, $name, $type)
 	 */
 	public function save($data)
 	{
-		if (file_exists($this->name) && is_writeable($this->name) || file_exists($this->location) && is_writeable($this->location))
+		if (file_exists($this->name) && is_writable($this->name) || file_exists($this->location) && is_writable($this->location))
 		{
 			if ($data instanceof SimplePie)
 			{

diff --git a/lib/simplepie/library/SimplePie/Cache/Memcached.php b/lib/simplepie/library/SimplePie/Cache/Memcached.php
diff --git a/lib/simplepie/library/SimplePie/Cache/MySQL.php b/lib/simplepie/library/SimplePie/Cache/MySQL.php
@@ -96,7 +96,7 @@ public function __construct($location, $name, $type)
 				'cache_purge_time' => 2592000
 			),
 		);
-		
+
 		$this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
 
 		// Path is prefixed with a "/"
@@ -395,10 +395,8 @@ public function mtime()
 		{
 			return $time;
 		}
-		else
-		{
-			return false;
-		}
+
+		return false;
 	}
 
 	/**
@@ -416,14 +414,8 @@ public function touch()
 		$query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `mtime` = :time WHERE `id` = :id');
 		$query->bindValue(':time', time());
 		$query->bindValue(':id', $this->id);
-		if ($query->execute() && $query->rowCount() > 0)
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
+
+		return $query->execute() && $query->rowCount() > 0;
 	}
 
 	/**
@@ -442,13 +434,7 @@ public function unlink()
 		$query->bindValue(':id', $this->id);
 		$query2 = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :id');
 		$query2->bindValue(':id', $this->id);
-		if ($query->execute() && $query2->execute())
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
+
+		return $query->execute() && $query2->execute();
 	}
 }
diff --git a/lib/simplepie/library/SimplePie/Cache/Redis.php b/lib/simplepie/library/SimplePie/Cache/Redis.php
@@ -65,6 +65,12 @@ public function __construct($location, $name, $options = null) {
         $parsed = SimplePie_Cache::parse_URL($location);
         $redis = new Redis();
         $redis->connect($parsed['host'], $parsed['port']);
+        if (isset($parsed['pass'])) {
+            $redis->auth($parsed['pass']);
+        }
+        if (isset($parsed['path'])) {
+            $redis->select((int)substr($parsed['path'], 1));
+        }
         $this->cache = $redis;
 
         if (!is_null($options) && is_array($options)) {

diff --git a/lib/simplepie/library/SimplePie/Caption.php b/lib/simplepie/library/SimplePie/Caption.php
@@ -131,10 +131,8 @@ public function get_endtime()
 		{
 			return $this->endTime;
 		}
-		else
-		{
-			return null;
-		}
+
+		return null;
 	}
 
 	/**
@@ -149,10 +147,8 @@ public function get_language()
 		{
 			return $this->lang;
 		}
-		else
-		{
-			return null;
-		}
+
+		return null;
 	}
 
 	/**
@@ -166,10 +162,8 @@ public function get_starttime()
 		{
 			return $this->startTime;
 		}
-		else
-		{
-			return null;
-		}
+
+		return null;
 	}
 
 	/**
@@ -183,10 +177,8 @@ public function get_text()
 		{
 			return $this->text;
 		}
-		else
-		{
-			return null;
-		}
+
+		return null;
 	}
 
 	/**
@@ -200,10 +192,7 @@ public function get_type()
 		{
 			return $this->type;
 		}
-		else
-		{
-			return null;
-		}
+
+		return null;
 	}
 }
-
diff --git a/lib/simplepie/library/SimplePie/Content/Type/Sniffer.php b/lib/simplepie/library/SimplePie/Content/Type/Sniffer.php
@@ -120,24 +120,18 @@ public function get_type()
 				{
 					return $return;
 				}
-				else
-				{
-					return $official;
-				}
+
+				return $official;
 			}
 			elseif ($official === 'text/html')
 			{
 				return $this->feed_or_html();
 			}
-			else
-			{
-				return $official;
-			}
-		}
-		else
-		{
-			return $this->unknown();
+
+			return $official;
 		}
+
+		return $this->unknown();
 	}
 
 	/**
@@ -158,10 +152,8 @@ public function text_or_binary()
 		{
 			return 'application/octect-stream';
 		}
-		else
-		{
-			return 'text/plain';
-		}
+
+		return 'text/plain';
 	}
 
 	/**
@@ -207,10 +199,8 @@ public function unknown()
 		{
 			return 'image/vnd.microsoft.icon';
 		}
-		else
-		{
-			return $this->text_or_binary();
-		}
+
+		return $this->text_or_binary();
 	}
 
 	/**
@@ -241,10 +231,8 @@ public function image()
 		{
 			return 'image/vnd.microsoft.icon';
 		}
-		else
-		{
-			return false;
-		}
+
+		return false;
 	}
 
 	/**
@@ -328,4 +316,3 @@ public function feed_or_html()
 		return 'text/html';
 	}
 }
-
diff --git a/lib/simplepie/library/SimplePie/Copyright.php b/lib/simplepie/library/SimplePie/Copyright.php
@@ -103,10 +103,8 @@ public function get_url()
 		{
 			return $this->url;
 		}
-		else
-		{
-			return null;
-		}
+
+		return null;
 	}
 
 	/**
@@ -120,10 +118,7 @@ public function get_attribution()
 		{
 			return $this->label;
 		}
-		else
-		{
-			return null;
-		}
+
+		return null;
 	}
 }
-
diff --git a/lib/simplepie/library/SimplePie/Credit.php b/lib/simplepie/library/SimplePie/Credit.php
@@ -112,10 +112,8 @@ public function get_role()
 		{
 			return $this->role;
 		}
-		else
-		{
-			return null;
-		}
+
+		return null;
 	}
 
 	/**
@@ -129,10 +127,8 @@ public function get_scheme()
 		{
 			return $this->scheme;
 		}
-		else
-		{
-			return null;
-		}
+
+		return null;
 	}
 
 	/**
@@ -146,10 +142,7 @@ public function get_name()
 		{
 			return $this->name;
 		}
-		else
-		{
-			return null;
-		}
+
+		return null;
 	}
 }
-
diff --git a/lib/simplepie/library/SimplePie/Decode/HTML/Entities.php b/lib/simplepie/library/SimplePie/Decode/HTML/Entities.php
@@ -117,10 +117,8 @@ public function consume()
 			$this->consumed .= $this->data[$this->position];
 			return $this->data[$this->position++];
 		}
-		else
-		{
-			return false;
-		}
+
+		return false;
 	}
 
 	/**
@@ -139,10 +137,8 @@ public function consume_range($chars)
 			$this->position += $len;
 			return $data;
 		}
-		else
-		{
-			return false;
-		}
+
+		return false;
 	}
 
 	/**
@@ -612,4 +608,3 @@ public function entity()
 		}
 	}
 }
-