Changeset 47733 for trunk/src/wp-includes/SimplePie/Misc.php

Timestamp:

05/01/2020 02:24:42 PM (6 years ago)

Author:

desrosj

Message:

External Libraries: Update the SimplePie library to the latest version (1.5.5).

This brings SimplePie in sync with the most up to date version, 1.5.5.

This update brings many bug fixes, small enhancements, and PHP compatibility fixes for newer versions of PHP.

For a full list of changes, see ​https://github.com/simplepie/simplepie/blob/master/CHANGELOG.md#155-may-1-2020.

Props dshanske, slushman, etruel, wpshades, dmenard, desrosj, hareesh-pillai, stevenkword, jrf, Ipstenu, johnbillion.
Fixes #36669.

File:

• trunk/src/wp-includes/SimplePie/Misc.php (modified) (14 diffs)

trunk/src/wp-includes/SimplePie/Misc.php

@@ -6 +6 @@
  * Takes the hard work out of managing a complete RSS/Atom solution.
  *
- * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
  * All rights reserved.
  *
@@ -34 +34 @@
  *
  * @package SimplePie
- * @version 1.3.1
- * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
  * @author Ryan Parman
- * @author Geoffrey Sneddon
+ * @author Sam Sneddon
  * @author Ryan McCue
  * @link http://simplepie.org/ SimplePie
@@ -139 +138 @@
         {
             $key = strtolower($key);
-            $full .= " $key=\"" . htmlspecialchars($value['data']) . '"';
+            $full .= " $key=\"" . htmlspecialchars($value['data'], ENT_COMPAT, 'UTF-8') . '"';
         }
         if ($element['self_closing'])
@@ -219 +218 @@
             return substr_replace($url, 'itpc', 0, 4);
         }
-        else
-        {
-            return $url;
-        }
+
+        return $url;
+    }
+
+    public static function array_merge_recursive($array1, $array2)
+    {
+        foreach ($array2 as $key => $value)
+        {
+            if (is_array($value))
+            {
+                $array1[$key] = SimplePie_Misc::array_merge_recursive($array1[$key], $value);
+            }
+            else
+            {
+                $array1[$key] = $value;
+            }
+        }
+
+        return $array1;
     }
 
@@ -261 +275 @@
             return chr($integer);
         }
-        else
-        {
-            return strtoupper($match[0]);
-        }
+
+        return strtoupper($match[0]);
     }
 
@@ -318 +330 @@
             return $return;
         }
+        // This is third, as behaviour of this varies with OS userland and PHP version
+        elseif (function_exists('iconv') && ($return = SimplePie_Misc::change_encoding_iconv($data, $input, $output)))
+        {
+            return $return;
+        }
         // This is last, as behaviour of this varies with OS userland and PHP version
-        elseif (function_exists('iconv') && ($return = SimplePie_Misc::change_encoding_iconv($data, $input, $output)))
+        elseif (class_exists('\UConverter') && ($return = SimplePie_Misc::change_encoding_uconverter($data, $input, $output)))
         {
             return $return;
         }
+
         // If we can't do anything, just fail
-        else
-        {
-            return false;
-        }
+        return false;
     }
 
@@ -371 +386 @@
     {
         return @iconv($input, $output, $data);
+    }
+
+    /**
+     * @param string $data
+     * @param string $input
+     * @param string $output
+     * @return string|false
+     */
+    protected static function change_encoding_uconverter($data, $input, $output)
+    {
+        return @\UConverter::transcode($data, $output, $input);
     }
 
@@ -1827 +1853 @@
             return trim($mime);
         }
-        else
-        {
-            return trim(substr($mime, 0, $pos));
-        }
+
+        return trim(substr($mime, 0, $pos));
     }
 
@@ -1863 +1887 @@
             }
         }
-        else
-        {
-            return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
-        }
+
+        return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
     }
 
@@ -1916 +1938 @@
             }
         }
-        else
-        {
-            return SIMPLEPIE_CONSTRUCT_TEXT;
-        }
+
+        return SIMPLEPIE_CONSTRUCT_TEXT;
     }
 
@@ -1927 +1947 @@
     }
 
-    public static function space_seperated_tokens($string)
+    public static function space_separated_tokens($string)
     {
         $space_characters = "\x20\x09\x0A\x0B\x0C\x0D";
@@ -1976 +1996 @@
             return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
         }
-        else
-        {
-            // U+FFFD REPLACEMENT CHARACTER
-            return "\xEF\xBF\xBD";
-        }
+
+        // U+FFFD REPLACEMENT CHARACTER
+        return "\xEF\xBF\xBD";
     }
 
@@ -2184 +2202 @@
             return filemtime(dirname(__FILE__) . '/Core.php');
         }
-        else
-        {
-            return filemtime(__FILE__);
-        }
+
+        return filemtime(__FILE__);
     }
 
@@ -2245 +2261 @@
     }
 }
-