makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6251 from rxu/ticket/16822-master

Browse source 
[ticket/16822] Replace patchwork/utf8 with symfony/polyfill
This commit is contained in:
Marc Alexander 2021-07-22 10:51:31 +02:00 • committed by GitHub
commit 0b17914866
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/composer.json
View file

@ -39,7 +39,6 @@
"guzzlehttp/guzzle": "~6.3",
"lusitanian/oauth": "^0.8.1",
"marc1706/fast-image-size": "^1.1",
"patchwork/utf8": "^1.1",
"s9e/text-formatter": "^2.0",
"symfony/config": "^5.0",
"symfony/console": "^5.0",
@ -50,6 +49,9 @@
"symfony/finder": "^5.0",
"symfony/http-foundation": "^5.0",
"symfony/http-kernel": "^5.0",
"symfony/polyfill-intl-normalizer": "^1.23",
"symfony/polyfill-mbstring": "^1.23",
"symfony/polyfill-php72": "^1.23",
"symfony/mime": "^5.0",
"symfony/process": "^5.0",
"symfony/proxy-manager-bridge": "^5.0",

79
phpBB/composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "8fbda7129b53a2b65cb181d3a996a522",
"content-hash": "cce68be4bf35f93b109b45f1a6d9a9ea",
"packages": [
{
"name": "bantu/ini-get-wrapper",
@ -1851,83 +1851,6 @@
},
"time": "2019-12-07T08:02:07+00:00"
},
{
"name": "patchwork/utf8",
"version": "v1.3.3",
"source": {
"type": "git",
"url": "https://github.com/tchwork/utf8.git",
"reference": "e1fa4d4a57896d074c9a8d01742b688d5db4e9d5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/tchwork/utf8/zipball/e1fa4d4a57896d074c9a8d01742b688d5db4e9d5",
"reference": "e1fa4d4a57896d074c9a8d01742b688d5db4e9d5",
"shasum": ""
},
"require": {
"lib-pcre": ">=7.3",
"php": ">=5.3.0"
},
"require-dev": {
"symfony/phpunit-bridge": "^3.4|^4.4"
},
"suggest": {
"ext-iconv": "Use iconv for best performance",
"ext-intl": "Use Intl for best performance",
"ext-mbstring": "Use Mbstring for best performance",
"ext-wfio": "Use WFIO for UTF-8 filesystem access on Windows"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.3-dev"
}
},
"autoload": {
"psr-4": {
"Patchwork\\": "src/Patchwork/"
},
"classmap": [
"src/Normalizer.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"(Apache-2.0 or GPL-2.0)"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
}
],
"description": "Portable and performant UTF-8, Unicode and Grapheme Clusters for PHP",
"homepage": "https://github.com/tchwork/utf8",
"keywords": [
"grapheme",
"i18n",
"unicode",
"utf-8",
"utf8"
],
"support": {
"issues": "https://github.com/tchwork/utf8/issues",
"source": "https://github.com/tchwork/utf8/tree/v1.3.3"
},
"funding": [
{
"url": "https://github.com/nicolas-grekas",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/patchwork/utf8",
"type": "tidelift"
}
],
"abandoned": "symfony/polyfill-mbstring or symfony/string",
"time": "2021-01-07T16:38:58+00:00"
},
{
"name": "psr/container",
"version": "1.1.1",

8
phpBB/includes/utf/utf_tools.php
View file

@ -22,11 +22,9 @@ if (!defined('IN_PHPBB'))
setlocale(LC_CTYPE, 'C');
/**
* Setup the UTF-8 portability layer
*/
Patchwork\Utf8\Bootup::initUtf8Encode();
Patchwork\Utf8\Bootup::initMbstring();
Patchwork\Utf8\Bootup::initIntl();
* UTF-8 portability layer is provided by
* symfony/polyfill-mbstring, symfony/polyfill-intl-normalizer, symfony/polyfill-php72
*/
/**
* UTF-8 tools