Merge pull request dokuwiki#4164 from dokuwiki/strftime

Replace strftime with Intl ICU. Fixes dokuwiki#3573

Author: splitbrain

composer.json

@@ -17,7 +17,8 @@
         "splitbrain/php-cli": "^1.1",
         "splitbrain/slika": "^1.0",
         "kissifrot/php-ixr": "^1.8",
-        "splitbrain/php-jsstrip": "^1.0"
+        "splitbrain/php-jsstrip": "^1.0",
+        "php81_bc/strftime": "dev-fallback-intl"
     },
     "config": {
         "platform": {

composer.lock

@@ -1,8 +1,9 @@
 <?php
 
-use SimplePie\SimplePie;
-use dokuwiki\FeedParserFile;
+namespace dokuwiki\Feed;
+
 use SimplePie\File;
+use SimplePie\SimplePie;
 
 /**
  * We override some methods of the original SimplePie class here
@@ -17,6 +18,7 @@ public function __construct()
         parent::__construct();
         $this->enable_cache(false);
         $this->registry->register(File::class, FeedParserFile::class);
+        $this->registry->register('Item', FeedParserItem::class);
     }
 
     /**

inc/FeedParser.php renamed to inc/Feed/FeedParser.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace dokuwiki;
+namespace dokuwiki\Feed;
 
+use dokuwiki\HTTP\DokuHTTPClient;
 use SimplePie\File;
 use SimplePie\SimplePie;
-use dokuwiki\HTTP\DokuHTTPClient;
 
 /**
  * Fetch an URL using our own HTTPClient

inc/FeedParserFile.php renamed to inc/Feed/FeedParserFile.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace dokuwiki\Feed;
+
+use SimplePie\Item;
+use SimplePie\SimplePie;
+
+class FeedParserItem extends Item
+{
+    /**
+     * replace strftime with PHP81_BC\strftime
+     * @inheritdoc
+     * phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+     */
+    public function get_local_date($date_format = '%c')
+    {
+        if (!$date_format) {
+            return $this->sanitize($this->get_date(''), SimplePie::CONSTRUCT_TEXT);
+        } elseif (($date = $this->get_date('U')) !== null && $date !== false) {
+            return \PHP81_BC\strftime($date_format, $date);
+        }
+
+        return null;
+    }
+}

inc/Feed/FeedParserItem.php

@@ -1500,7 +1500,7 @@ function dformat($dt = null, $format = '')
     if (!$format) $format = $conf['dformat'];
 
     $format = str_replace('%f', datetime_h($dt), $format);
-    return strftime($format, $dt);
+    return \PHP81_BC\strftime($format, $dt);
 }
 
 /**

inc/common.php

@@ -19,3 +19,5 @@ class_alias('\dokuwiki\Extension\CLIPlugin', 'DokuWiki_CLI_Plugin');
 class_alias('\dokuwiki\Extension\Plugin', 'DokuWiki_Plugin');
 class_alias('\dokuwiki\Extension\RemotePlugin', 'DokuWiki_Remote_Plugin');
 class_alias('\dokuwiki\Extension\SyntaxPlugin', 'DokuWiki_Syntax_Plugin');
+
+class_alias('\dokuwiki\Feed\FeedParser', 'FeedParser');

inc/legacy.php

@@ -1,6 +1,7 @@
 <?php
 
 use dokuwiki\ChangeLog\MediaChangeLog;
+use dokuwiki\Feed\FeedParser;
 use dokuwiki\File\MediaResolver;
 use dokuwiki\File\PageResolver;
 use dokuwiki\Utf8\PhpString;
@@ -1333,7 +1334,6 @@ public function rss($url, $params)
         global $lang;
         global $conf;
 
-        require_once(DOKU_INC . 'inc/FeedParser.php');
         $feed = new FeedParser();
         $feed->set_feed_url($url);
 

inc/parser/xhtml.php

@@ -7,5 +7,6 @@
 
 return array(
     'fdc0e9724ddc47859c8bf0c1ea0a623a' => $vendorDir . '/openpsa/universalfeedcreator/lib/constants.php',
+    '9e71c1459ef1226520e4b26dac3a180d' => $vendorDir . '/php81_bc/strftime/src/php-8.1-strftime.php',
     'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
 );

vendor/composer/autoload_files.php

@@ -15,6 +15,7 @@
     'phpseclib3\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
     'SimplePie\\' => array($vendorDir . '/simplepie/simplepie/src'),
     'ParagonIE\\ConstantTime\\' => array($vendorDir . '/paragonie/constant_time_encoding/src'),
+    'PHP81_BC\\strftime\\' => array($vendorDir . '/php81_bc/strftime/src'),
     'LesserPHP\\tests\\' => array($vendorDir . '/splitbrain/lesserphp/tests'),
     'LesserPHP\\' => array($vendorDir . '/splitbrain/lesserphp/src'),
     'IXR\\tests\\' => array($vendorDir . '/kissifrot/php-ixr/tests'),