fix incorrect reading time calculation for entries with CJK characters

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Tools / Utils.php

diff --git a/src/Wallabag/CoreBundle/Tools/Utils.php b/src/Wallabag/CoreBundle/Tools/Utils.php
index b501ce6595503a1f0cfda55aea55b3a9ea5a507c..0a805210872f812b3074595488436234f24e5e13 100644 (file)
--- a/src/Wallabag/CoreBundle/Tools/Utils.php
+++ b/src/Wallabag/CoreBundle/Tools/Utils.php
@@ -7,33 +7,16 @@ class Utils
     /**
      * Generate a token used for RSS.
      *
+     * @param int $length Length of the token
+     *
      * @return string
      */
-    public static function generateToken()
+    public static function generateToken($length = 15)
     {
-        if (ini_get('open_basedir') === '') {
-            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-                // alternative to /dev/urandom for Windows
-                $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
-            } else {
-                $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
-            }
-        } else {
-            $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
-        }
+        $token = substr(base64_encode(random_bytes($length)), 0, $length);
 
         // remove character which can broken the url
-        return str_replace(array('+', '/'), '', $token);
-    }
-
-    /**
-     * @param $words
-     *
-     * @return float
-     */
-    public static function convertWordsToMinutes($words)
-    {
-        return floor($words / 200);
+        return str_replace(['+', '/'], '', $token);
     }
 
     /**
@@ -46,6 +29,6 @@ class Utils
      */
     public static function getReadingTime($text)
     {
-        return self::convertWordsToMinutes(str_word_count(strip_tags($text)));
+        return floor(\count(preg_split('~([^\p{L}\p{N}\']+|\p{Han}|\p{Hiragana}|\p{Katakana}|\p{Hangul})~u', strip_tags($text))) / 200);
     }
 }