diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index 225e55fcf..f37882e9f 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php @@ -14,6 +14,7 @@ use Symfony\Component\Validator\Constraints as Assert; use Wallabag\AnnotationBundle\Entity\Annotation; use Wallabag\CoreBundle\Helper\EntityTimestampsTrait; use Wallabag\CoreBundle\Helper\UrlHasher; +use Wallabag\CoreBundle\Tools\Utils; use Wallabag\UserBundle\Entity\User; /** @@ -663,7 +664,7 @@ class Entry */ public function getUserReadingTime() { - return round($this->readingTime / $this->getUser()->getConfig()->getReadingSpeed() * 200); + return round($this->readingTime / $this->getUser()->getConfig()->getReadingSpeed() * Utils::DEFAULT_WORDS_PER_MINUTE); } /** diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php index 2642f9e27..757578444 100644 --- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php @@ -16,6 +16,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Wallabag\CoreBundle\Repository\EntryRepository; +use Wallabag\CoreBundle\Tools\Utils; use Wallabag\UserBundle\Entity\User; class EntryFilterType extends AbstractType @@ -57,8 +58,8 @@ class EntryFilterType extends AbstractType return; } - $min = (int) ($lower * $user->getConfig()->getReadingSpeed() / 200); - $max = (int) ($upper * $user->getConfig()->getReadingSpeed() / 200); + $min = (int) ($lower * $user->getConfig()->getReadingSpeed() / Utils::DEFAULT_WORDS_PER_MINUTE); + $max = (int) ($upper * $user->getConfig()->getReadingSpeed() / Utils::DEFAULT_WORDS_PER_MINUTE); if (null === $lower && null !== $upper) { // only lower value is defined: query all entries with reading LOWER THAN this value diff --git a/src/Wallabag/CoreBundle/Tools/Utils.php b/src/Wallabag/CoreBundle/Tools/Utils.php index b7ad79664..6431ba5a0 100644 --- a/src/Wallabag/CoreBundle/Tools/Utils.php +++ b/src/Wallabag/CoreBundle/Tools/Utils.php @@ -4,6 +4,8 @@ namespace Wallabag\CoreBundle\Tools; class Utils { + public const DEFAULT_WORDS_PER_MINUTE = 200; + /** * Generate a token used for Feeds. * @@ -28,6 +30,6 @@ class Utils */ public static function getReadingTime($text) { - return floor(\count(preg_split('~([^\p{L}\p{N}\']+|(\p{Han}|\p{Hiragana}|\p{Katakana}|\p{Hangul}){1,2})~u', strip_tags($text))) / 200); + return floor(\count(preg_split('~([^\p{L}\p{N}\']+|(\p{Han}|\p{Hiragana}|\p{Katakana}|\p{Hangul}){1,2})~u', strip_tags($text))) / self::DEFAULT_WORDS_PER_MINUTE); } }