2
0
forked from Wavyzz/dolibarr

FIX: Update swiftmailer librairies

This commit is contained in:
kamel
2021-12-07 17:11:34 +01:00
parent bd52613331
commit 1ca199d796
156 changed files with 2370 additions and 1637 deletions

View File

@@ -20,14 +20,14 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
*
* @var array
*/
private static $map = array();
private static $map = [];
/**
* Factories which have already been loaded.
*
* @var Swift_CharacterReaderFactory[]
*/
private static $loaded = array();
private static $loaded = [];
/**
* Creates a new CharacterReaderFactory.
@@ -44,32 +44,32 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
public function init()
{
if (count(self::$map) > 0) {
if (\count(self::$map) > 0) {
return;
}
$prefix = 'Swift_CharacterReader_';
$singleByte = array(
$singleByte = [
'class' => $prefix.'GenericFixedWidthReader',
'constructor' => array(1),
);
'constructor' => [1],
];
$doubleByte = array(
$doubleByte = [
'class' => $prefix.'GenericFixedWidthReader',
'constructor' => array(2),
);
'constructor' => [2],
];
$fourBytes = array(
$fourBytes = [
'class' => $prefix.'GenericFixedWidthReader',
'constructor' => array(4),
);
'constructor' => [4],
];
// Utf-8
self::$map['utf-?8'] = array(
self::$map['utf-?8'] = [
'class' => $prefix.'Utf8Reader',
'constructor' => array(),
);
'constructor' => [],
];
//7-8 bit charsets
self::$map['(us-)?ascii'] = $singleByte;
@@ -103,11 +103,11 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
*/
public function getReaderFor($charset)
{
$charset = strtolower(trim($charset));
$charset = strtolower(trim($charset ?? ''));
foreach (self::$map as $pattern => $spec) {
$re = '/^'.$pattern.'$/D';
if (preg_match($re, $charset)) {
if (!array_key_exists($pattern, self::$loaded)) {
if (!\array_key_exists($pattern, self::$loaded)) {
$reflector = new ReflectionClass($spec['class']);
if ($reflector->getConstructor()) {
$reader = $reflector->newInstanceArgs($spec['constructor']);