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

Timestamp:

05/01/2020 02:24:42 PM (5 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/Parse/Date.php (modified) (15 diffs)

trunk/src/wp-includes/SimplePie/Parse/Date.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
@@ -100 +99 @@
         // German
         'montag' => 1,
+        'mo' => 1,
         'dienstag' => 2,
+        'di' => 2,
         'mittwoch' => 3,
+        'mi' => 3,
         'donnerstag' => 4,
+        'do' => 4,
         'freitag' => 5,
+        'fr' => 5,
         'samstag' => 6,
+        'sa' => 6,
         'sonnabend' => 6,
+        // AFAIK no short form for sonnabend
+        'so' => 7,
         'sonntag' => 7,
         // Italian
@@ -147 +154 @@
         'Σαβ' => 6,
         'Κυρ' => 7,
+        // Russian
+        'Пн.' => 1,
+        'Вт.' => 2,
+        'Ср.' => 3,
+        'Чт.' => 4,
+        'Пт.' => 5,
+        'Сб.' => 6,
+        'Вс.' => 7,
     );
 
@@ -174 +189 @@
         'august' => 8,
         'sep' => 9,
-        'september' => 8,
+        'september' => 9,
         'oct' => 10,
         'october' => 10,
@@ -209 +224 @@
         // German
         'januar' => 1,
+        'jan' => 1,
         'februar' => 2,
+        'feb' => 2,
         'märz' => 3,
+        'mär' => 3,
         'april' => 4,
-        'mai' => 5,
+        'apr' => 4,
+        'mai' => 5, // no short form for may
         'juni' => 6,
+        'jun' => 6,
         'juli' => 7,
+        'jul' => 7,
         'august' => 8,
+        'aug' => 8,
         'september' => 9,
+        'sep' => 9,
         'oktober' => 10,
+        'okt' => 10,
         'november' => 11,
+        'nov' => 11,
         'dezember' => 12,
+        'dez' => 12,
         // Italian
         'gennaio' => 1,
@@ -291 +317 @@
         'Οκτ' => 10,
         'Νοέ' => 11,
-        'Δεκ' => 12,
+        'Δεκ' => 12,        
+        // Russian
+        'Янв' => 1,
+        'января' => 1,
+        'Фев' => 2,
+        'февраля' => 2,
+        'Мар' => 3,
+        'марта' => 3,
+        'Апр' => 4,
+        'апреля' => 4,
+        'Май' => 5,
+        'мая' => 5,
+        'Июн' => 6,
+        'июня' => 6,
+        'Июл' => 7,
+        'июля' => 7,
+        'Авг' => 8,
+        'августа' => 8,
+        'Сен' => 9,
+        'сентября' => 9,
+        'Окт' => 10,
+        'октября' => 10,
+        'Ноя' => 11,
+        'ноября' => 11,
+        'Дек' => 12,
+        'декабря' => 12,
+
     );
 
@@ -615 +667 @@
      * @final
      * @access public
-     * @param callable $callback
+     * @param callback $callback
      */
     public function add_callback($callback)
@@ -632 +684 @@
      * Parse a superset of W3C-DTF (allows hyphens and colons to be omitted, as
      * well as allowing any of upper or lower case "T", horizontal tabs, or
-     * spaces to be used as the time seperator (including more than one))
+     * spaces to be used as the time separator (including more than one))
      *
      * @access protected
@@ -692 +744 @@
 
             // Convert the number of seconds to an integer, taking decimals into account
-            $second = round($match[6] + $match[7] / pow(10, strlen($match[7])));
+            $second = round((int)$match[6] + (int)$match[7] / (10 ** strlen($match[7])));
 
             return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone;
         }
-        else
-        {
-            return false;
-        }
+
+        return false;
     }
 
@@ -722 +772 @@
             $output .= substr($string, $position, $pos - $position);
             $position = $pos + 1;
-            if ($string[$pos - 1] !== '\\')
+            if ($pos === 0 || $string[$pos - 1] !== '\\')
             {
                 $depth++;
@@ -850 +900 @@
             return gmmktime($match[5], $match[6], $second, $month, $match[2], $match[4]) - $timezone;
         }
-        else
-        {
-            return false;
-        }
+
+        return false;
     }
 
@@ -915 +963 @@
             return gmmktime($match[5], $match[6], $match[7], $month, $match[2], $match[4]) - $timezone;
         }
-        else
-        {
-            return false;
-        }
+
+        return false;
     }
 
@@ -957 +1003 @@
             return gmmktime($match[4], $match[5], $match[6], $month, $match[3], $match[7]);
         }
-        else
-        {
-            return false;
-        }
+
+        return false;
     }
 
@@ -976 +1020 @@
             return false;
         }
-        else
-        {
-            return $strtotime;
-        }
+
+        return $strtotime;
     }
 }
-