mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-03 05:49:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5680 from wallabag/impr/intl

Browse source 
Replace `iconv()` calls with Transliterator
This commit is contained in:
Kevin Decherf 2022-03-21 22:28:49 +01:00 committed by GitHub
parent b7ed531c31 1608bf5a4e
commit 8f2fefe233
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
composer.json
View file

@ -40,6 +40,7 @@
"ext-gd": "*", "ext-gd": "*",
"ext-hash": "*", "ext-hash": "*",
"ext-iconv": "*", "ext-iconv": "*",
"ext-intl": "*",
"ext-json": "*", "ext-json": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-pcre": "*", "ext-pcre": "*",

4
src/Wallabag/CoreBundle/Helper/ContentProxy.php
View file

@ -236,7 +236,9 @@ class ContentProxy
return $rawText; return $rawText;
} }
return iconv('UTF-8', 'UTF-8//IGNORE', $rawText); mb_substitute_character('none');
return mb_convert_encoding($rawText, 'UTF-8', 'UTF-8');
} }
/** /**

4
src/Wallabag/CoreBundle/Helper/EntriesExport.php
View file

@ -527,6 +527,8 @@ class EntriesExport
*/ */
private function getSanitizedFilename() private function getSanitizedFilename()
{ {
return preg_replace('/[^A-Za-z0-9\- \']/', '', iconv('utf-8', 'us-ascii//TRANSLIT', $this->title)); $transliterator = \Transliterator::createFromRules(':: Any-Latin; :: Latin-ASCII; :: NFD; :: [:Nonspacing Mark:] Remove; :: NFC;', \Transliterator::FORWARD);
return preg_replace('/[^A-Za-z0-9\- \']/', '', $transliterator->transliterate($this->title));
} }
} }

4
tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php
View file

@ -347,6 +347,8 @@ class ExportControllerTest extends WallabagCoreTestCase
private function getSanitizedFilename($title) private function getSanitizedFilename($title)
{ {
return preg_replace('/[^A-Za-z0-9\- \']/', '', iconv('utf-8', 'us-ascii//TRANSLIT', $title)); $transliterator = \Transliterator::createFromRules(':: Any-Latin; :: Latin-ASCII; :: NFD; :: [:Nonspacing Mark:] Remove; :: NFC;', \Transliterator::FORWARD);
return preg_replace('/[^A-Za-z0-9\- \']/', '', $transliterator->transliterate($title));
} }
} }

6
var/SymfonyRequirements.php
View file

@ -455,12 +455,6 @@ class SymfonyRequirements extends RequirementCollection
); );
} }
$this->addRequirement(
function_exists('iconv'),
'iconv() must be available',
'Install and enable the <strong>iconv</strong> extension.'
);
$this->addRequirement( $this->addRequirement(
function_exists('json_encode'), function_exists('json_encode'),
'json_encode() must be available', 'json_encode() must be available',