merge master in prod

This commit is contained in:
2020-09-08 12:00:45 +02:00
parent b925edaa9e
commit 3e5e731c2c
226 changed files with 8516 additions and 4149 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
Copyright (c) 2015-2018 Fabien Potencier
Copyright (c) 2015-2019 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
+2 -2
View File
@@ -2,8 +2,8 @@ Symfony Polyfill / Iconv
========================
This component provides a native PHP implementation of the
[php.net/iconv](http://php.net/iconv) functions
(short of [`ob_iconv_handler`](http://php.net/manual/en/function.ob-iconv-handler.php)).
[php.net/iconv](https://php.net/iconv) functions
(short of [`ob_iconv_handler`](https://php.net/ob-iconv-handler)).
More information can be found in the
[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
@@ -866,6 +866,7 @@ static $data = array (
'㋼' => '(ヰ)',
'㋽' => '(ヱ)',
'㋾' => '(ヲ)',
'㋿' => '令和',
'㌀' => 'アパート',
'㌁' => 'アルファ',
'㌂' => 'アンペア',
@@ -3133,6 +3134,7 @@ static $data = array (
'🈸' => '申',
'🈹' => '割',
'🈺' => '営',
'🈻' => '配',
'🉀' => '〔本〕',
'🉁' => '〔三〕',
'🉂' => '〔二〕',
@@ -3878,6 +3880,104 @@ static $data = array (
'ỽ' => 'v',
'Ỿ' => 'Y',
'ỿ' => 'y',
'Ⱡ' => 'L',
'ⱡ' => 'l',
'Ɫ' => 'L',
'Ᵽ' => 'P',
'Ɽ' => 'R',
'ⱥ' => 'a',
'ⱦ' => 't',
'Ⱨ' => 'H',
'ⱨ' => 'h',
'Ⱪ' => 'K',
'ⱪ' => 'k',
'Ⱬ' => 'Z',
'ⱬ' => 'z',
'Ɱ' => 'M',
'ⱱ' => 'v',
'Ⱳ' => 'W',
'ⱳ' => 'w',
'ⱴ' => 'v',
'ⱸ' => 'e',
'ⱺ' => 'o',
'Ȿ' => 'S',
'Ɀ' => 'Z',
'ꜰ' => 'F',
'' => 'S',
'Ꜳ' => 'AA',
'ꜳ' => 'aa',
'Ꜵ' => 'AO',
'ꜵ' => 'ao',
'Ꜷ' => 'AU',
'ꜷ' => 'au',
'Ꜹ' => 'AV',
'ꜹ' => 'av',
'Ꜻ' => 'AV',
'ꜻ' => 'av',
'Ꜽ' => 'AY',
'ꜽ' => 'ay',
'Ꝁ' => 'K',
'ꝁ' => 'k',
'Ꝃ' => 'K',
'ꝃ' => 'k',
'Ꝅ' => 'K',
'ꝅ' => 'k',
'Ꝇ' => 'L',
'ꝇ' => 'l',
'Ꝉ' => 'L',
'ꝉ' => 'l',
'Ꝋ' => 'O',
'ꝋ' => 'o',
'Ꝍ' => 'O',
'ꝍ' => 'o',
'Ꝏ' => 'OO',
'ꝏ' => 'oo',
'Ꝑ' => 'P',
'ꝑ' => 'p',
'Ꝓ' => 'P',
'ꝓ' => 'p',
'Ꝕ' => 'P',
'ꝕ' => 'p',
'Ꝗ' => 'Q',
'ꝗ' => 'q',
'Ꝙ' => 'Q',
'ꝙ' => 'q',
'Ꝟ' => 'V',
'ꝟ' => 'v',
'Ꝡ' => 'VY',
'ꝡ' => 'vy',
'Ꝥ' => 'TH',
'ꝥ' => 'th',
'Ꝧ' => 'TH',
'ꝧ' => 'th',
'ꝱ' => 'd',
'ꝲ' => 'l',
'ꝳ' => 'm',
'ꝴ' => 'n',
'ꝵ' => 'r',
'ꝶ' => 'R',
'ꝷ' => 't',
'Ꝺ' => 'D',
'ꝺ' => 'd',
'Ꝼ' => 'F',
'ꝼ' => 'f',
'Ꞇ' => 'T',
'ꞇ' => 't',
'Ꞑ' => 'N',
'ꞑ' => 'n',
'Ꞓ' => 'C',
'ꞓ' => 'c',
'Ꞡ' => 'G',
'ꞡ' => 'g',
'Ꞣ' => 'K',
'ꞣ' => 'k',
'Ꞥ' => 'N',
'ꞥ' => 'n',
'Ꞧ' => 'R',
'ꞧ' => 'r',
'Ꞩ' => 'S',
'ꞩ' => 's',
'Ɦ' => 'H',
'©' => '(C)',
'®' => '(R)',
'₠' => 'CE',
@@ -3887,8 +3987,28 @@ static $data = array (
'₧' => 'Pts',
'₺' => 'TL',
'₹' => 'Rs',
'℗' => '(P)',
'℘' => 'P',
'℞' => 'Rx',
'' => '0',
' ' => ' ',
'' => ' ',
'' => ' ',
'' => ' ',
'' => ' ',
'' => ' ',
'' => ' ',
'' => ' ',
'' => ' ',
'' => ' ',
'' => ' ',
'ʹ' => '\'',
'ʺ' => '"',
'ʻ' => '\'',
'ʼ' => '\'',
'ʽ' => '\'',
'ˈ' => '\'',
'ˋ' => '`',
'' => '\'',
'' => '\'',
'' => ',',
@@ -3904,6 +4024,7 @@ static $data = array (
'»' => '>>',
'' => '<',
'' => '>',
'­' => '-',
'' => '-',
'' => '-',
'' => '-',
@@ -3912,6 +4033,12 @@ static $data = array (
'―' => '-',
'︱' => '-',
'︲' => '-',
'˂' => '<',
'˃' => '>',
'˄' => '^',
'ˆ' => '^',
'ː' => ':',
'˜' => '~',
'‖' => '||',
'' => '/',
'⁅' => '[',
@@ -3952,6 +4079,8 @@ static $data = array (
'﹈' => ']',
'×' => '*',
'÷' => '/',
'˖' => '+',
'˗' => '-',
'' => '-',
'' => '/',
'' => '\\',
@@ -11,12 +11,14 @@
use Symfony\Polyfill\Iconv as p;
if (!function_exists('iconv')) {
if (!defined('ICONV_IMPL')) {
define('ICONV_IMPL', 'Symfony');
define('ICONV_VERSION', '1.0');
define('ICONV_MIME_DECODE_STRICT', 1);
define('ICONV_MIME_DECODE_CONTINUE_ON_ERROR', 2);
}
if (!function_exists('iconv')) {
function iconv($from, $to, $s) { return p\Iconv::iconv($from, $to, $s); }
function iconv_get_encoding($type = 'all') { return p\Iconv::iconv_get_encoding($type); }
function iconv_set_encoding($type, $charset) { return p\Iconv::iconv_set_encoding($type, $charset); }
@@ -28,7 +28,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.15-dev"
}
}
}