Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/3rdparty.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCôme Chilliet <come.chilliet@nextcloud.com>2022-11-10 17:33:42 +0300
committerCôme Chilliet <come.chilliet@nextcloud.com>2022-11-10 17:33:42 +0300
commite812179b90c683b4d3c6c00c9166c58271684dcd (patch)
tree699da9583ab2f3eddf5146c5aee1a0251a844c5f
parentc1fe9577fcc7006273d35848598df01eaa708b4f (diff)
Bump swiftmailer/swiftmailer to 6.3.0
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
-rw-r--r--composer.json2
-rw-r--r--composer.lock146
-rw-r--r--composer/installed.json158
-rw-r--r--composer/installed.php46
-rw-r--r--doctrine/lexer/README.md2
-rw-r--r--doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php43
-rw-r--r--doctrine/lexer/psalm.xml15
-rw-r--r--swiftmailer/swiftmailer/README.md6
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift.php2
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php2
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php2
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Message.php2
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php4
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php2
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php20
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php2
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php3
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php24
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php2
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php10
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php14
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php6
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php2
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php6
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php2
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php2
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php4
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php2
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php6
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php4
-rw-r--r--swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php2
-rw-r--r--swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php10
-rw-r--r--symfony/polyfill-iconv/README.md2
-rw-r--r--symfony/polyfill-iconv/bootstrap.php2
-rw-r--r--symfony/polyfill-iconv/bootstrap80.php2
-rw-r--r--symfony/polyfill-iconv/composer.json5
-rw-r--r--symfony/polyfill-intl-idn/Idn.php2
-rw-r--r--symfony/polyfill-intl-idn/README.md2
-rw-r--r--symfony/polyfill-intl-idn/bootstrap80.php4
-rw-r--r--symfony/polyfill-intl-idn/composer.json2
-rw-r--r--symfony/polyfill-intl-normalizer/Normalizer.php2
-rw-r--r--symfony/polyfill-intl-normalizer/README.md2
-rw-r--r--symfony/polyfill-intl-normalizer/composer.json2
-rw-r--r--symfony/polyfill-mbstring/Mbstring.php61
-rw-r--r--symfony/polyfill-mbstring/composer.json2
-rw-r--r--symfony/polyfill-php72/Php72.php6
-rw-r--r--symfony/polyfill-php72/README.md9
-rw-r--r--symfony/polyfill-php72/composer.json2
48 files changed, 356 insertions, 304 deletions
diff --git a/composer.json b/composer.json
index d700146a..f4549fb9 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,7 @@
"sabre/dav": "^4.4.0",
"scssphp/scssphp": "^1.8.1",
"stecman/symfony-console-completion": "^0.11.0",
- "swiftmailer/swiftmailer": "^6.0",
+ "swiftmailer/swiftmailer": "^6.3.0",
"symfony/console": "4.4.30",
"symfony/event-dispatcher": "4.4.30",
"symfony/event-dispatcher-contracts": "1.1.9",
diff --git a/composer.lock b/composer.lock
index f00e435c..2d3cd6f1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -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": "d2b492639f133e19e03d552b16686e16",
+ "content-hash": "a1604425ae48e816f49a424526091ad7",
"packages": [
{
"name": "aws/aws-crt-php",
@@ -922,32 +922,28 @@
},
{
"name": "doctrine/lexer",
- "version": "1.2.1",
+ "version": "1.2.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
- "reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
+ "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
- "reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
+ "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229",
+ "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229",
"shasum": ""
},
"require": {
- "php": "^7.2 || ^8.0"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
- "doctrine/coding-standard": "^6.0",
- "phpstan/phpstan": "^0.11.8",
- "phpunit/phpunit": "^8.2"
+ "doctrine/coding-standard": "^9.0",
+ "phpstan/phpstan": "^1.3",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+ "vimeo/psalm": "^4.11"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.2.x-dev"
- }
- },
"autoload": {
"psr-4": {
"Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
@@ -982,7 +978,7 @@
],
"support": {
"issues": "https://github.com/doctrine/lexer/issues",
- "source": "https://github.com/doctrine/lexer/tree/1.2.1"
+ "source": "https://github.com/doctrine/lexer/tree/1.2.3"
},
"funding": [
{
@@ -998,7 +994,7 @@
"type": "tidelift"
}
],
- "time": "2020-05-25T17:44:05+00:00"
+ "time": "2022-02-28T11:07:21+00:00"
},
{
"name": "egulias/email-validator",
@@ -4599,16 +4595,16 @@
},
{
"name": "swiftmailer/swiftmailer",
- "version": "v6.2.7",
+ "version": "v6.3.0",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "15f7faf8508e04471f666633addacf54c0ab5933"
+ "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/15f7faf8508e04471f666633addacf54c0ab5933",
- "reference": "15f7faf8508e04471f666633addacf54c0ab5933",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c",
+ "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c",
"shasum": ""
},
"require": {
@@ -4620,7 +4616,7 @@
},
"require-dev": {
"mockery/mockery": "^1.0",
- "symfony/phpunit-bridge": "^4.4|^5.0"
+ "symfony/phpunit-bridge": "^4.4|^5.4"
},
"suggest": {
"ext-intl": "Needed to support internationalized email addresses"
@@ -4658,7 +4654,7 @@
],
"support": {
"issues": "https://github.com/swiftmailer/swiftmailer/issues",
- "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.7"
+ "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.3.0"
},
"funding": [
{
@@ -4670,7 +4666,8 @@
"type": "tidelift"
}
],
- "time": "2021-03-09T12:30:35+00:00"
+ "abandoned": "symfony/mailer",
+ "time": "2021-10-18T15:26:12+00:00"
},
{
"name": "symfony/console",
@@ -5287,28 +5284,31 @@
},
{
"name": "symfony/polyfill-iconv",
- "version": "v1.23.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git",
- "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933"
+ "reference": "927013f3aac555983a5059aada98e1907d842695"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933",
- "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933",
+ "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/927013f3aac555983a5059aada98e1907d842695",
+ "reference": "927013f3aac555983a5059aada98e1907d842695",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
+ "provide": {
+ "ext-iconv": "*"
+ },
"suggest": {
"ext-iconv": "For best performance"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.23-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -5316,12 +5316,12 @@
}
},
"autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Iconv\\": ""
- },
"files": [
"bootstrap.php"
- ]
+ ],
+ "psr-4": {
+ "Symfony\\Polyfill\\Iconv\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -5347,7 +5347,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-iconv/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-iconv/tree/v1.27.0"
},
"funding": [
{
@@ -5363,7 +5363,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-27T09:27:20+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
@@ -5448,16 +5448,16 @@
},
{
"name": "symfony/polyfill-intl-idn",
- "version": "v1.23.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
- "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65"
+ "reference": "639084e360537a19f9ee352433b84ce831f3d2da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65",
- "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da",
+ "reference": "639084e360537a19f9ee352433b84ce831f3d2da",
"shasum": ""
},
"require": {
@@ -5471,7 +5471,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.23-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -5479,12 +5479,12 @@
}
},
"autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Intl\\Idn\\": ""
- },
"files": [
"bootstrap.php"
- ]
+ ],
+ "psr-4": {
+ "Symfony\\Polyfill\\Intl\\Idn\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -5515,7 +5515,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0"
},
"funding": [
{
@@ -5531,20 +5531,20 @@
"type": "tidelift"
}
],
- "time": "2021-05-27T09:27:20+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.23.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
+ "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
- "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6",
+ "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6",
"shasum": ""
},
"require": {
@@ -5556,7 +5556,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.23-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -5564,12 +5564,12 @@
}
},
"autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
- },
"files": [
"bootstrap.php"
],
+ "psr-4": {
+ "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+ },
"classmap": [
"Resources/stubs"
]
@@ -5599,7 +5599,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0"
},
"funding": [
{
@@ -5615,20 +5615,20 @@
"type": "tidelift"
}
],
- "time": "2021-02-19T12:13:01+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.26.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
+ "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
- "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+ "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
"shasum": ""
},
"require": {
@@ -5643,7 +5643,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.26-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -5682,7 +5682,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
},
"funding": [
{
@@ -5698,20 +5698,20 @@
"type": "tidelift"
}
],
- "time": "2022-05-24T11:49:31+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.23.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "9a142215a36a3888e30d0a9eeea9766764e96976"
+ "reference": "869329b1e9894268a8a61dabb69153029b7a8c97"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976",
- "reference": "9a142215a36a3888e30d0a9eeea9766764e96976",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97",
+ "reference": "869329b1e9894268a8a61dabb69153029b7a8c97",
"shasum": ""
},
"require": {
@@ -5720,7 +5720,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.23-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -5728,12 +5728,12 @@
}
},
"autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Php72\\": ""
- },
"files": [
"bootstrap.php"
- ]
+ ],
+ "psr-4": {
+ "Symfony\\Polyfill\\Php72\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -5758,7 +5758,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0"
},
"funding": [
{
@@ -5774,7 +5774,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-27T09:17:38+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-php73",
diff --git a/composer/installed.json b/composer/installed.json
index 0286a2fe..811e97f7 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -958,34 +958,30 @@
},
{
"name": "doctrine/lexer",
- "version": "1.2.1",
- "version_normalized": "1.2.1.0",
+ "version": "1.2.3",
+ "version_normalized": "1.2.3.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
- "reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
+ "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
- "reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
+ "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229",
+ "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229",
"shasum": ""
},
"require": {
- "php": "^7.2 || ^8.0"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
- "doctrine/coding-standard": "^6.0",
- "phpstan/phpstan": "^0.11.8",
- "phpunit/phpunit": "^8.2"
+ "doctrine/coding-standard": "^9.0",
+ "phpstan/phpstan": "^1.3",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+ "vimeo/psalm": "^4.11"
},
- "time": "2020-05-25T17:44:05+00:00",
+ "time": "2022-02-28T11:07:21+00:00",
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.2.x-dev"
- }
- },
"installation-source": "dist",
"autoload": {
"psr-4": {
@@ -1021,7 +1017,7 @@
],
"support": {
"issues": "https://github.com/doctrine/lexer/issues",
- "source": "https://github.com/doctrine/lexer/tree/1.2.1"
+ "source": "https://github.com/doctrine/lexer/tree/1.2.3"
},
"funding": [
{
@@ -4803,17 +4799,17 @@
},
{
"name": "swiftmailer/swiftmailer",
- "version": "v6.2.7",
- "version_normalized": "6.2.7.0",
+ "version": "v6.3.0",
+ "version_normalized": "6.3.0.0",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "15f7faf8508e04471f666633addacf54c0ab5933"
+ "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/15f7faf8508e04471f666633addacf54c0ab5933",
- "reference": "15f7faf8508e04471f666633addacf54c0ab5933",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c",
+ "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c",
"shasum": ""
},
"require": {
@@ -4825,12 +4821,12 @@
},
"require-dev": {
"mockery/mockery": "^1.0",
- "symfony/phpunit-bridge": "^4.4|^5.0"
+ "symfony/phpunit-bridge": "^4.4|^5.4"
},
"suggest": {
"ext-intl": "Needed to support internationalized email addresses"
},
- "time": "2021-03-09T12:30:35+00:00",
+ "time": "2021-10-18T15:26:12+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -4865,7 +4861,7 @@
],
"support": {
"issues": "https://github.com/swiftmailer/swiftmailer/issues",
- "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.7"
+ "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.3.0"
},
"funding": [
{
@@ -4877,6 +4873,7 @@
"type": "tidelift"
}
],
+ "abandoned": "symfony/mailer",
"install-path": "../swiftmailer/swiftmailer"
},
{
@@ -5518,30 +5515,33 @@
},
{
"name": "symfony/polyfill-iconv",
- "version": "v1.23.0",
- "version_normalized": "1.23.0.0",
+ "version": "v1.27.0",
+ "version_normalized": "1.27.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git",
- "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933"
+ "reference": "927013f3aac555983a5059aada98e1907d842695"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933",
- "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933",
+ "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/927013f3aac555983a5059aada98e1907d842695",
+ "reference": "927013f3aac555983a5059aada98e1907d842695",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
+ "provide": {
+ "ext-iconv": "*"
+ },
"suggest": {
"ext-iconv": "For best performance"
},
- "time": "2021-05-27T09:27:20+00:00",
+ "time": "2022-11-03T14:55:06+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.23-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -5550,12 +5550,12 @@
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Iconv\\": ""
- },
"files": [
"bootstrap.php"
- ]
+ ],
+ "psr-4": {
+ "Symfony\\Polyfill\\Iconv\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -5581,7 +5581,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-iconv/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-iconv/tree/v1.27.0"
},
"funding": [
{
@@ -5685,17 +5685,17 @@
},
{
"name": "symfony/polyfill-intl-idn",
- "version": "v1.23.0",
- "version_normalized": "1.23.0.0",
+ "version": "v1.27.0",
+ "version_normalized": "1.27.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
- "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65"
+ "reference": "639084e360537a19f9ee352433b84ce831f3d2da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65",
- "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da",
+ "reference": "639084e360537a19f9ee352433b84ce831f3d2da",
"shasum": ""
},
"require": {
@@ -5706,11 +5706,11 @@
"suggest": {
"ext-intl": "For best performance"
},
- "time": "2021-05-27T09:27:20+00:00",
+ "time": "2022-11-03T14:55:06+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.23-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -5719,12 +5719,12 @@
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Intl\\Idn\\": ""
- },
"files": [
"bootstrap.php"
- ]
+ ],
+ "psr-4": {
+ "Symfony\\Polyfill\\Intl\\Idn\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -5755,7 +5755,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0"
},
"funding": [
{
@@ -5775,17 +5775,17 @@
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.23.0",
- "version_normalized": "1.23.0.0",
+ "version": "v1.27.0",
+ "version_normalized": "1.27.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
+ "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
- "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6",
+ "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6",
"shasum": ""
},
"require": {
@@ -5794,11 +5794,11 @@
"suggest": {
"ext-intl": "For best performance"
},
- "time": "2021-02-19T12:13:01+00:00",
+ "time": "2022-11-03T14:55:06+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.23-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -5807,12 +5807,12 @@
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
- },
"files": [
"bootstrap.php"
],
+ "psr-4": {
+ "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+ },
"classmap": [
"Resources/stubs"
]
@@ -5842,7 +5842,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0"
},
"funding": [
{
@@ -5862,17 +5862,17 @@
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.26.0",
- "version_normalized": "1.26.0.0",
+ "version": "v1.27.0",
+ "version_normalized": "1.27.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
+ "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
- "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+ "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
"shasum": ""
},
"require": {
@@ -5884,11 +5884,11 @@
"suggest": {
"ext-mbstring": "For best performance"
},
- "time": "2022-05-24T11:49:31+00:00",
+ "time": "2022-11-03T14:55:06+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.26-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -5928,7 +5928,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
},
"funding": [
{
@@ -5948,27 +5948,27 @@
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.23.0",
- "version_normalized": "1.23.0.0",
+ "version": "v1.27.0",
+ "version_normalized": "1.27.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "9a142215a36a3888e30d0a9eeea9766764e96976"
+ "reference": "869329b1e9894268a8a61dabb69153029b7a8c97"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976",
- "reference": "9a142215a36a3888e30d0a9eeea9766764e96976",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97",
+ "reference": "869329b1e9894268a8a61dabb69153029b7a8c97",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
- "time": "2021-05-27T09:17:38+00:00",
+ "time": "2022-11-03T14:55:06+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.23-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -5977,12 +5977,12 @@
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Php72\\": ""
- },
"files": [
"bootstrap.php"
- ]
+ ],
+ "psr-4": {
+ "Symfony\\Polyfill\\Php72\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -6007,7 +6007,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0"
},
"funding": [
{
diff --git a/composer/installed.php b/composer/installed.php
index 293abb41..75343ccc 100644
--- a/composer/installed.php
+++ b/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'nextcloud/3rdparty',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => '3a81ffcc3c0807a9349bb5fa0df8ee08130e0c00',
+ 'reference' => 'c1fe9577fcc7006273d35848598df01eaa708b4f',
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
@@ -137,9 +137,9 @@
'dev_requirement' => false,
),
'doctrine/lexer' => array(
- 'pretty_version' => '1.2.1',
- 'version' => '1.2.1.0',
- 'reference' => 'e864bbf5904cb8f5bb334f99209b48018522f042',
+ 'pretty_version' => '1.2.3',
+ 'version' => '1.2.3.0',
+ 'reference' => 'c268e882d4dbdd85e36e4ad69e02dc284f89d229',
'type' => 'library',
'install_path' => __DIR__ . '/../doctrine/lexer',
'aliases' => array(),
@@ -337,7 +337,7 @@
'nextcloud/3rdparty' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => '3a81ffcc3c0807a9349bb5fa0df8ee08130e0c00',
+ 'reference' => 'c1fe9577fcc7006273d35848598df01eaa708b4f',
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
@@ -722,9 +722,9 @@
'dev_requirement' => false,
),
'swiftmailer/swiftmailer' => array(
- 'pretty_version' => 'v6.2.7',
- 'version' => '6.2.7.0',
- 'reference' => '15f7faf8508e04471f666633addacf54c0ab5933',
+ 'pretty_version' => 'v6.3.0',
+ 'version' => '6.3.0.0',
+ 'reference' => '8a5d5072dca8f48460fce2f4131fcc495eec654c',
'type' => 'library',
'install_path' => __DIR__ . '/../swiftmailer/swiftmailer',
'aliases' => array(),
@@ -809,9 +809,9 @@
'dev_requirement' => false,
),
'symfony/polyfill-iconv' => array(
- 'pretty_version' => 'v1.23.0',
- 'version' => '1.23.0.0',
- 'reference' => '63b5bb7db83e5673936d6e3b8b3e022ff6474933',
+ 'pretty_version' => 'v1.27.0',
+ 'version' => '1.27.0.0',
+ 'reference' => '927013f3aac555983a5059aada98e1907d842695',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-iconv',
'aliases' => array(),
@@ -827,36 +827,36 @@
'dev_requirement' => false,
),
'symfony/polyfill-intl-idn' => array(
- 'pretty_version' => 'v1.23.0',
- 'version' => '1.23.0.0',
- 'reference' => '65bd267525e82759e7d8c4e8ceea44f398838e65',
+ 'pretty_version' => 'v1.27.0',
+ 'version' => '1.27.0.0',
+ 'reference' => '639084e360537a19f9ee352433b84ce831f3d2da',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-intl-idn',
'aliases' => array(),
'dev_requirement' => false,
),
'symfony/polyfill-intl-normalizer' => array(
- 'pretty_version' => 'v1.23.0',
- 'version' => '1.23.0.0',
- 'reference' => '8590a5f561694770bdcd3f9b5c69dde6945028e8',
+ 'pretty_version' => 'v1.27.0',
+ 'version' => '1.27.0.0',
+ 'reference' => '19bd1e4fcd5b91116f14d8533c57831ed00571b6',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer',
'aliases' => array(),
'dev_requirement' => false,
),
'symfony/polyfill-mbstring' => array(
- 'pretty_version' => 'v1.26.0',
- 'version' => '1.26.0.0',
- 'reference' => '9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e',
+ 'pretty_version' => 'v1.27.0',
+ 'version' => '1.27.0.0',
+ 'reference' => '8ad114f6b39e2c98a8b0e3bd907732c207c2b534',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
'aliases' => array(),
'dev_requirement' => false,
),
'symfony/polyfill-php72' => array(
- 'pretty_version' => 'v1.23.0',
- 'version' => '1.23.0.0',
- 'reference' => '9a142215a36a3888e30d0a9eeea9766764e96976',
+ 'pretty_version' => 'v1.27.0',
+ 'version' => '1.27.0.0',
+ 'reference' => '869329b1e9894268a8a61dabb69153029b7a8c97',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-php72',
'aliases' => array(),
diff --git a/doctrine/lexer/README.md b/doctrine/lexer/README.md
index e1b419a6..784f2a27 100644
--- a/doctrine/lexer/README.md
+++ b/doctrine/lexer/README.md
@@ -1,6 +1,6 @@
# Doctrine Lexer
-Build Status: [![Build Status](https://travis-ci.org/doctrine/lexer.svg?branch=master)](https://travis-ci.org/doctrine/lexer)
+[![Build Status](https://github.com/doctrine/lexer/workflows/Continuous%20Integration/badge.svg)](https://github.com/doctrine/lexer/actions)
Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.
diff --git a/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php b/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
index 385643a4..7e8a11d4 100644
--- a/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
+++ b/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
@@ -5,17 +5,21 @@ declare(strict_types=1);
namespace Doctrine\Common\Lexer;
use ReflectionClass;
-use const PREG_SPLIT_DELIM_CAPTURE;
-use const PREG_SPLIT_NO_EMPTY;
-use const PREG_SPLIT_OFFSET_CAPTURE;
+
use function implode;
use function in_array;
use function preg_split;
use function sprintf;
use function substr;
+use const PREG_SPLIT_DELIM_CAPTURE;
+use const PREG_SPLIT_NO_EMPTY;
+use const PREG_SPLIT_OFFSET_CAPTURE;
+
/**
* Base class for writing simple lexers, i.e. for creating small DSLs.
+ *
+ * @psalm-type Token = array{value: int|string, type:string|int|null, position:int}
*/
abstract class AbstractLexer
{
@@ -35,7 +39,8 @@ abstract class AbstractLexer
* parameter, none)
* - 'position' : the position of the token in the input string
*
- * @var array
+ * @var mixed[][]
+ * @psalm-var list<Token>
*/
private $tokens = [];
@@ -56,21 +61,23 @@ abstract class AbstractLexer
/**
* The next token in the input.
*
- * @var array|null
+ * @var mixed[]|null
+ * @psalm-var Token|null
*/
public $lookahead;
/**
* The last matched/seen token.
*
- * @var array|null
+ * @var mixed[]|null
+ * @psalm-var Token|null
*/
public $token;
/**
* Composed regex for input parsing.
*
- * @var string
+ * @var string|null
*/
private $regex;
@@ -143,25 +150,25 @@ abstract class AbstractLexer
/**
* Checks whether a given token matches the current lookahead.
*
- * @param int|string $token
+ * @param int|string $type
*
* @return bool
*/
- public function isNextToken($token)
+ public function isNextToken($type)
{
- return $this->lookahead !== null && $this->lookahead['type'] === $token;
+ return $this->lookahead !== null && $this->lookahead['type'] === $type;
}
/**
* Checks whether any of the given tokens matches the current lookahead.
*
- * @param array $tokens
+ * @param list<int|string> $types
*
* @return bool
*/
- public function isNextTokenAny(array $tokens)
+ public function isNextTokenAny(array $types)
{
- return $this->lookahead !== null && in_array($this->lookahead['type'], $tokens, true);
+ return $this->lookahead !== null && in_array($this->lookahead['type'], $types, true);
}
/**
@@ -209,7 +216,8 @@ abstract class AbstractLexer
/**
* Moves the lookahead token forward.
*
- * @return array|null The next token or NULL if there are no more tokens ahead.
+ * @return mixed[]|null The next token or NULL if there are no more tokens ahead.
+ * @psalm-return Token|null
*/
public function peek()
{
@@ -223,7 +231,8 @@ abstract class AbstractLexer
/**
* Peeks at the next token, returns it and immediately resets the peek.
*
- * @return array|null The next token or NULL if there are no more tokens ahead.
+ * @return mixed[]|null The next token or NULL if there are no more tokens ahead.
+ * @psalm-return Token|null
*/
public function glimpse()
{
@@ -306,14 +315,14 @@ abstract class AbstractLexer
/**
* Lexical catchable patterns.
*
- * @return array
+ * @return string[]
*/
abstract protected function getCatchablePatterns();
/**
* Lexical non-catchable patterns.
*
- * @return array
+ * @return string[]
*/
abstract protected function getNonCatchablePatterns();
diff --git a/doctrine/lexer/psalm.xml b/doctrine/lexer/psalm.xml
new file mode 100644
index 00000000..f331e50c
--- /dev/null
+++ b/doctrine/lexer/psalm.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<psalm
+ errorLevel="5"
+ resolveFromConfigFile="true"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="https://getpsalm.org/schema/config"
+ xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+ <projectFiles>
+ <directory name="lib/Doctrine/Common/Lexer" />
+ <ignoreFiles>
+ <directory name="vendor" />
+ </ignoreFiles>
+ </projectFiles>
+</psalm>
diff --git a/swiftmailer/swiftmailer/README.md b/swiftmailer/swiftmailer/README.md
index 0e1fb4ce..788d7223 100644
--- a/swiftmailer/swiftmailer/README.md
+++ b/swiftmailer/swiftmailer/README.md
@@ -1,6 +1,12 @@
Swift Mailer
------------
+**Swiftmailer will stop being maintained at the end of November 2021.**
+
+Please, move to [Symfony Mailer](https://symfony.com/doc/current/mailer.html) at your earliest convenience.
+[Symfony Mailer](https://symfony.com/doc/current/mailer.html) is the next evolution of Swiftmailer.
+It provides the same features with support for modern PHP code and support for third-party providers.
+
Swift Mailer is a component based mailing solution for PHP.
It is released under the MIT license.
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift.php b/swiftmailer/swiftmailer/lib/classes/Swift.php
index ffe5a488..51b19c9c 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift.php
@@ -15,7 +15,7 @@
*/
abstract class Swift
{
- const VERSION = '6.2.7';
+ const VERSION = '6.3.0';
public static $initialized = false;
public static $inits = [];
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php b/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
index debab675..86900894 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
@@ -103,7 +103,7 @@ 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)) {
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php b/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
index 0e7b2a1b..b1eedaa0 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
@@ -34,7 +34,7 @@ class Swift_Encoder_Base64Encoder implements Swift_Encoder
$maxLineLength = 76;
}
- $encodedString = base64_encode($string);
+ $encodedString = base64_encode($string ?? '');
$firstLine = '';
if (0 != $firstLineOffset) {
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Message.php b/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
index 819ffc38..5c5834e2 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
@@ -224,7 +224,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
protected function saveHeaders(array $altered)
{
foreach ($altered as $head) {
- $lc = strtolower($head);
+ $lc = strtolower($head ?? '');
if (!isset($this->savedMessage['headers'][$lc])) {
$this->savedMessage['headers'][$lc] = $this->getHeaders()->getAll($head);
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php b/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
index 2751130d..b7e1e028 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
@@ -27,7 +27,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
}
$remainder = 0;
- $base64ReadBufferRemainderBytes = null;
+ $base64ReadBufferRemainderBytes = '';
// To reduce memory usage, the output buffer is streamed to the input buffer like so:
// Output Stream => base64encode => wrap line length => Input Stream
@@ -45,7 +45,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
} else {
$streamTheseBytes = $base64ReadBufferRemainderBytes.$readBytes;
}
- $base64ReadBufferRemainderBytes = null;
+ $base64ReadBufferRemainderBytes = '';
$bytesLength = \strlen($streamTheseBytes);
if (0 === $bytesLength) { // no data left to encode
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php b/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
index c4403575..21c8aaab 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
@@ -41,7 +41,7 @@ class Swift_Mime_HeaderEncoder_Base64HeaderEncoder extends Swift_Encoder_Base64E
*/
public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0, $charset = 'utf-8')
{
- if ('iso-2022-jp' === strtolower($charset)) {
+ if ('iso-2022-jp' === strtolower($charset ?? '')) {
$old = mb_internal_encoding();
mb_internal_encoding('utf-8');
$newstring = mb_encode_mimeheader($string, $charset, $this->getName(), "\r\n");
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php b/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
index 22caeb23..25740d11 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
@@ -309,7 +309,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
$encodedToken = '';
// Split at all whitespace boundaries
- foreach (preg_split('~(?=[\t ])~', $string) as $token) {
+ foreach (preg_split('~(?=[\t ])~', $string ?? '') as $token) {
if ($this->tokenNeedsEncoding($token)) {
$encodedToken .= $token;
} else {
@@ -354,10 +354,10 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
$encodedTextLines = explode("\r\n",
$this->encoder->encodeString(
$token, $firstLineOffset, 75 - $encodingWrapperLength, $this->charset
- )
+ ) ?? ''
);
- if ('iso-2022-jp' !== strtolower($this->charset)) {
+ if ('iso-2022-jp' !== strtolower($this->charset ?? '')) {
// special encoding for iso-2022-jp using mb_encode_mimeheader
foreach ($encodedTextLines as $lineNum => $line) {
$encodedTextLines[$lineNum] = '=?'.$charsetDecl.
@@ -378,7 +378,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
*/
protected function generateTokenLines($token)
{
- return preg_split('~(\r\n)~', $token, -1, PREG_SPLIT_DELIM_CAPTURE);
+ return preg_split('~(\r\n)~', $token ?? '', -1, PREG_SPLIT_DELIM_CAPTURE);
}
/**
@@ -429,7 +429,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
$tokens = [];
// Generate atoms; split at all invisible boundaries followed by WSP
- foreach (preg_split('~(?=[ \t])~', $string) as $token) {
+ foreach (preg_split('~(?=[ \t])~', $string ?? '') as $token) {
$newTokens = $this->generateTokenLines($token);
foreach ($newTokens as $newToken) {
$tokens[] = $newToken;
@@ -473,4 +473,14 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
// Implode with FWS (RFC 2822, 2.2.3)
return implode("\r\n", $headerLines)."\r\n";
}
+
+ /**
+ * Make a deep copy of object.
+ */
+ public function __clone()
+ {
+ if ($this->encoder) {
+ $this->encoder = clone $this->encoder;
+ }
+ }
}
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php b/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
index fa0726a3..d0b2e658 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
@@ -189,7 +189,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
/** Encode charset when charset is not utf-8 */
protected function convertString($string)
{
- $charset = strtolower($this->getCharset());
+ $charset = strtolower($this->getCharset() ?? '');
if (!\in_array($charset, ['utf-8', 'iso-8859-1', 'iso-8859-15', ''])) {
return mb_convert_encoding($string, $charset, 'utf-8');
}
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php b/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
index b4345f43..ab3ce6b1 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
@@ -113,7 +113,7 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
*/
public function createParameterizedHeader($name, $value = null, $params = [])
{
- $header = new Swift_Mime_Headers_ParameterizedHeader($name, $this->encoder, ('content-disposition' == strtolower($name)) ? $this->paramEncoder : null);
+ $header = new Swift_Mime_Headers_ParameterizedHeader($name, $this->encoder, ('content-disposition' == strtolower($name ?? '')) ? $this->paramEncoder : null);
if (isset($value)) {
$header->setFieldBodyModel($value);
}
@@ -182,6 +182,7 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
{
$this->encoder = clone $this->encoder;
$this->paramEncoder = clone $this->paramEncoder;
+ $this->addressEncoder = clone $this->addressEncoder;
}
/** Apply the charset to the Header */
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php b/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
index 3eed5517..5195bcf4 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
@@ -138,7 +138,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
*/
public function has($name, $index = 0)
{
- $lowerName = strtolower($name);
+ $lowerName = strtolower($name ?? '');
if (!\array_key_exists($lowerName, $this->headers)) {
return false;
@@ -181,7 +181,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
*/
public function get($name, $index = 0)
{
- $name = strtolower($name);
+ $name = strtolower($name ?? '');
if (\func_num_args() < 2) {
if ($this->has($name)) {
@@ -214,7 +214,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
return $headers;
}
- $lowerName = strtolower($name);
+ $lowerName = strtolower($name ?? '');
if (!\array_key_exists($lowerName, $this->headers)) {
return [];
}
@@ -247,7 +247,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
*/
public function remove($name, $index = 0)
{
- $lowerName = strtolower($name);
+ $lowerName = strtolower($name ?? '');
unset($this->headers[$lowerName][$index]);
}
@@ -258,7 +258,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
*/
public function removeAll($name)
{
- $lowerName = strtolower($name);
+ $lowerName = strtolower($name ?? '');
unset($this->headers[$lowerName]);
}
@@ -330,13 +330,13 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
/** Save a Header to the internal collection */
private function storeHeader($name, Swift_Mime_Header $header, $offset = null)
{
- if (!isset($this->headers[strtolower($name)])) {
- $this->headers[strtolower($name)] = [];
+ if (!isset($this->headers[strtolower($name ?? '')])) {
+ $this->headers[strtolower($name ?? '')] = [];
}
if (!isset($offset)) {
- $this->headers[strtolower($name)][] = $header;
+ $this->headers[strtolower($name ?? '')][] = $header;
} else {
- $this->headers[strtolower($name)][$offset] = $header;
+ $this->headers[strtolower($name ?? '')][$offset] = $header;
}
}
@@ -349,8 +349,8 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
/** uksort() algorithm for Header ordering */
private function sortHeaders($a, $b)
{
- $lowerA = strtolower($a);
- $lowerB = strtolower($b);
+ $lowerA = strtolower($a ?? '');
+ $lowerB = strtolower($b ?? '');
$aPos = \array_key_exists($lowerA, $this->order) ? $this->order[$lowerA] : -1;
$bPos = \array_key_exists($lowerB, $this->order) ? $this->order[$lowerB] : -1;
@@ -371,7 +371,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
/** Test if the given Header is always displayed */
private function isDisplayed(Swift_Mime_Header $header)
{
- return \array_key_exists(strtolower($header->getFieldName()), $this->required);
+ return \array_key_exists(strtolower($header->getFieldName() ?? ''), $this->required);
}
/** Notify all Headers of the new charset */
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php b/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
index fa18aa8d..03eaf472 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
@@ -731,7 +731,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
}
$realLevel = $child->getNestingLevel();
- $lowercaseType = strtolower($child->getContentType());
+ $lowercaseType = strtolower($child->getContentType() ?? '');
if (isset($filter[$realLevel]) && isset($filter[$realLevel][$lowercaseType])) {
return $filter[$realLevel][$lowercaseType];
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
index 1ecfce05..94485940 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
@@ -137,7 +137,7 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
$this->socket = $socket;
if (false === $greeting = fgets($this->socket)) {
- throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to connect to POP3 host [%s]', trim($greeting)));
+ throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to connect to POP3 host [%s]', trim($greeting ?? '')));
}
$this->assertOk($greeting);
@@ -205,11 +205,11 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
private function command($command)
{
if (!fwrite($this->socket, $command)) {
- throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to write command [%s] to POP3 host', trim($command)));
+ throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to write command [%s] to POP3 host', trim($command ?? '')));
}
if (false === $response = fgets($this->socket)) {
- throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to read from POP3 host after command [%s]', trim($command)));
+ throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to read from POP3 host after command [%s]', trim($command ?? '')));
}
$this->assertOk($response);
@@ -220,14 +220,14 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
private function assertOk($response)
{
if ('+OK' != substr($response, 0, 3)) {
- throw new Swift_Plugins_Pop_Pop3Exception(sprintf('POP3 command failed [%s]', trim($response)));
+ throw new Swift_Plugins_Pop_Pop3Exception(sprintf('POP3 command failed [%s]', trim($response ?? '')));
}
}
private function getHostString()
{
$host = $this->host;
- switch (strtolower($this->crypto)) {
+ switch (strtolower($this->crypto ?? '')) {
case 'ssl':
$host = 'ssl://'.$host;
break;
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php b/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
index 9a26abd3..ec82dc05 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
@@ -469,7 +469,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
*/
public function ignoreHeader($header_name)
{
- $this->ignoredHeaders[strtolower($header_name)] = true;
+ $this->ignoredHeaders[strtolower($header_name ?? '')] = true;
return $this;
}
@@ -486,7 +486,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
$listHeaders = $headers->listAll();
foreach ($listHeaders as $hName) {
// Check if we need to ignore Header
- if (!isset($this->ignoredHeaders[strtolower($hName)])) {
+ if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
if ($headers->has($hName)) {
$tmp = $headers->getAll($hName);
foreach ($tmp as $header) {
@@ -510,7 +510,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
public function addSignature(Swift_Mime_SimpleHeaderSet $headers)
{
// Prepare the DKIM-Signature
- $params = ['v' => '1', 'a' => $this->hashAlgorithm, 'bh' => base64_encode($this->bodyHash), 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'i' => $this->signerIdentity, 's' => $this->selector];
+ $params = ['v' => '1', 'a' => $this->hashAlgorithm, 'bh' => base64_encode($this->bodyHash ?? ''), 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'i' => $this->signerIdentity, 's' => $this->selector];
if ('simple' != $this->bodyCanon) {
$params['c'] = $this->headerCanon.'/'.$this->bodyCanon;
} elseif ('simple' != $this->headerCanon) {
@@ -544,11 +544,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
// Add the last DKIM-Signature
$tmp = $headers->getAll('DKIM-Signature');
$this->dkimHeader = end($tmp);
- $this->addHeader(trim($this->dkimHeader->toString())."\r\n b=", true);
+ $this->addHeader(trim($this->dkimHeader->toString() ?? '')."\r\n b=", true);
if ($this->debugHeaders) {
- $headers->addTextHeader('X-DebugHash', base64_encode($this->headerHash));
+ $headers->addTextHeader('X-DebugHash', base64_encode($this->headerHash ?? ''));
}
- $this->dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->getEncryptedHash()), 73, ' ')));
+ $this->dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->getEncryptedHash() ?? ''), 73, ' ')));
return $this;
}
@@ -649,7 +649,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
private function addToHeaderHash($header)
{
if ($this->debugHeaders) {
- $this->debugHeadersData[] = trim($header);
+ $this->debugHeadersData[] = trim($header ?? '');
}
$this->headerCanonData .= $header;
}
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php b/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
index 8833765b..5e2b67b6 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
@@ -332,7 +332,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
*/
public function ignoreHeader($header_name)
{
- $this->ignoredHeaders[strtolower($header_name)] = true;
+ $this->ignoredHeaders[strtolower($header_name ?? '')] = true;
return $this;
}
@@ -350,7 +350,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
$listHeaders = $headers->listAll();
foreach ($listHeaders as $hName) {
// Check if we need to ignore Header
- if (!isset($this->ignoredHeaders[strtolower($hName)])) {
+ if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
if ($headers->has($hName)) {
$tmp = $headers->getAll($hName);
foreach ($tmp as $header) {
@@ -375,7 +375,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
public function addSignature(Swift_Mime_SimpleHeaderSet $headers)
{
// Prepare the DomainKey-Signature Header
- $params = ['a' => $this->hashAlgorithm, 'b' => chunk_split(base64_encode($this->getEncryptedHash()), 73, ' '), 'c' => $this->canon, 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'q' => 'dns', 's' => $this->selector];
+ $params = ['a' => $this->hashAlgorithm, 'b' => chunk_split(base64_encode($this->getEncryptedHash() ?? ''), 73, ' '), 'c' => $this->canon, 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'q' => 'dns', 's' => $this->selector];
$string = '';
foreach ($params as $k => $v) {
$string .= $k.'='.$v.'; ';
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php b/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
index 6d7b589c..520bcc15 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
@@ -75,7 +75,7 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
$listHeaders = $headers->listAll();
foreach ($listHeaders as $hName) {
// Check if we need to ignore Header
- if (!isset($this->ignoredHeaders[strtolower($hName)])) {
+ if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
$tmp = $headers->getAll($hName);
if ($headers->has($hName)) {
foreach ($tmp as $header) {
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php b/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
index 30f3cbdf..3dd3cd05 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
@@ -496,13 +496,13 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
foreach ($headerLines as $headerLine) {
// Handle headers that span multiple lines
if (false === strpos($headerLine, ':')) {
- $headers[$currentHeaderName] .= ' '.trim($headerLine);
+ $headers[$currentHeaderName] .= ' '.trim($headerLine ?? '');
continue;
}
$header = explode(':', $headerLine, 2);
- $currentHeaderName = strtolower($header[0]);
- $headers[$currentHeaderName] = trim($header[1]);
+ $currentHeaderName = strtolower($header[0] ?? '');
+ $headers[$currentHeaderName] = trim($header[1] ?? '');
}
// Read the entire email body into a byte stream
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php b/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
index ff4d7faa..56b62323 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
@@ -36,7 +36,7 @@ class Swift_SmtpTransport extends Swift_Transport_EsmtpTransport
[$this, 'Swift_Transport_EsmtpTransport::__construct'],
Swift_DependencyContainer::getInstance()
->createDependenciesFor('transport.smtp')
- );
+ );
$this->setHost($host);
$this->setPort($port);
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php b/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
index e7ccf6db..bb3a1615 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
@@ -35,7 +35,7 @@ class Swift_Transport_Esmtp_Auth_CramMd5Authenticator implements Swift_Transport
$challenge = base64_decode(substr($challenge, 4));
$message = base64_encode(
$username.' '.$this->getResponse($password, $challenge)
- );
+ );
$agent->executeCommand(sprintf("%s\r\n", $message), [235]);
return true;
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php b/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
index 458c0383..0b9d81b8 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
@@ -32,8 +32,8 @@ class Swift_Transport_Esmtp_Auth_LoginAuthenticator implements Swift_Transport_E
{
try {
$agent->executeCommand("AUTH LOGIN\r\n", [334]);
- $agent->executeCommand(sprintf("%s\r\n", base64_encode($username)), [334]);
- $agent->executeCommand(sprintf("%s\r\n", base64_encode($password)), [235]);
+ $agent->executeCommand(sprintf("%s\r\n", base64_encode($username ?? '')), [334]);
+ $agent->executeCommand(sprintf("%s\r\n", base64_encode($password ?? '')), [235]);
return true;
} catch (Swift_TransportException $e) {
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php b/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
index 21c070e3..41931fdd 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
@@ -48,7 +48,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
try {
// execute AUTH command and filter out the code at the beginning
// AUTH NTLM xxxx
- $response = base64_decode(substr(trim($this->sendMessage1($agent)), 4));
+ $response = base64_decode(substr(trim($this->sendMessage1($agent) ?? ''), 4));
// extra parameters for our unit cases
$timestamp = \func_num_args() > 3 ? func_get_arg(3) : $this->getCorrectTimestamp(bcmul(microtime(true), '1000'));
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php b/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
index dd559132..53a90a87 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
@@ -171,7 +171,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
$count = 0;
$errors = [];
foreach ($this->getAuthenticatorsForAgent() as $authenticator) {
- if (\in_array(strtolower($authenticator->getAuthKeyword()), array_map('strtolower', $this->esmtpParams))) {
+ if (\in_array(strtolower($authenticator->getAuthKeyword() ?? ''), array_map('strtolower', $this->esmtpParams))) {
++$count;
try {
if ($authenticator->authenticate($agent, $this->username, $this->password)) {
@@ -253,12 +253,12 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
*/
protected function getAuthenticatorsForAgent()
{
- if (!$mode = strtolower($this->auth_mode)) {
+ if (!$mode = strtolower($this->auth_mode ?? '')) {
return $this->authenticators;
}
foreach ($this->authenticators as $authenticator) {
- if (strtolower($authenticator->getAuthKeyword()) == $mode) {
+ if (strtolower($authenticator->getAuthKeyword() ?? '') == $mode) {
return [$authenticator];
}
}
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php b/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
index bce0cdd4..36545f51 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
@@ -141,7 +141,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
*/
public function setEncryption($encryption)
{
- $encryption = strtolower($encryption);
+ $encryption = strtolower($encryption ?? '');
if ('tls' == $encryption) {
$this->params['protocol'] = 'tcp';
$this->params['tls'] = true;
@@ -406,7 +406,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
private function getCapabilities($ehloResponse)
{
$capabilities = [];
- $ehloResponse = trim($ehloResponse);
+ $ehloResponse = trim($ehloResponse ?? '');
$lines = explode("\r\n", $ehloResponse);
array_shift($lines);
foreach ($lines as $line) {
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php b/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
index 72ddae84..65a434d1 100644
--- a/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
+++ b/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
@@ -111,7 +111,7 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
}
if (false === strpos($command, ' -f')) {
- $command .= ' -f'.escapeshellarg($this->getReversePath($message));
+ $command .= ' -f'.escapeshellarg($this->getReversePath($message) ?? '');
}
$buffer->initialize(array_merge($this->params, ['command' => $command]));
diff --git a/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php b/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php
index c9e19d32..ad8fd2aa 100644
--- a/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php
+++ b/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php
@@ -106,7 +106,7 @@ function generateUpToDateMimeArray()
// all extensions from second match
foreach ($matches[2] as $i => $extensions) {
// explode multiple extensions from string
- $extensions = explode(' ', strtolower($extensions));
+ $extensions = explode(' ', strtolower($extensions ?? ''));
// force array for foreach
if (!\is_array($extensions)) {
@@ -139,21 +139,21 @@ function generateUpToDateMimeArray()
// get all matching extensions from match
foreach ((array) $node->glob['pattern'] as $extension) {
// skip none glob extensions
- if (false === strpos($extension, '.')) {
+ if (false === strpos($extension ?? '', '.')) {
continue;
}
// remove get only last part
- $extension = explode('.', strtolower($extension));
+ $extension = explode('.', strtolower($extension ?? ''));
$extension = end($extension);
}
if (isset($node->glob['pattern'][0])) {
// mime type
- $mime_type = strtolower((string) $node['type']);
+ $mime_type = strtolower((string) $node['type'] ?? '');
// get first extension
- $extension = strtolower(trim($node->glob['ddpattern'][0], '*.'));
+ $extension = strtolower(trim($node->glob['ddpattern'][0] ?? '', '*.'));
// skip none glob extensions and check if string length between 1 and 10
if (false !== strpos($extension, '.') || \strlen($extension) < 1 || \strlen($extension) > 9) {
diff --git a/symfony/polyfill-iconv/README.md b/symfony/polyfill-iconv/README.md
index b0c8984c..b089088b 100644
--- a/symfony/polyfill-iconv/README.md
+++ b/symfony/polyfill-iconv/README.md
@@ -6,7 +6,7 @@ This component provides a native PHP implementation of the
(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).
+[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
License
=======
diff --git a/symfony/polyfill-iconv/bootstrap.php b/symfony/polyfill-iconv/bootstrap.php
index 91fdba0d..c11df3b3 100644
--- a/symfony/polyfill-iconv/bootstrap.php
+++ b/symfony/polyfill-iconv/bootstrap.php
@@ -62,7 +62,7 @@ if (extension_loaded('mbstring')) {
function iconv_substr($string, $offset, $length = 2147483647, $encoding = null) { null === $encoding && $encoding = p\Iconv::$internalEncoding; return mb_substr($string, $offset, $length, $encoding); }
}
if (!function_exists('iconv_mime_decode')) {
- function iconv_mime_decode($string, $mode = 0, $encoding = null) { null === $encoding && $encoding = p\Iconv::$internalEncoding; return mb_decode_mimeheader($string, $mode, $encoding); }
+ function iconv_mime_decode($string, $mode = 0, $encoding = null) { $currentMbEncoding = mb_internal_encoding(); null === $encoding && $encoding = p\Iconv::$internalEncoding; mb_internal_encoding($encoding); $decoded = mb_decode_mimeheader($string); mb_internal_encoding($currentMbEncoding); return $decoded; }
}
} else {
if (!function_exists('iconv_strlen')) {
diff --git a/symfony/polyfill-iconv/bootstrap80.php b/symfony/polyfill-iconv/bootstrap80.php
index cf895574..04b1473b 100644
--- a/symfony/polyfill-iconv/bootstrap80.php
+++ b/symfony/polyfill-iconv/bootstrap80.php
@@ -54,7 +54,7 @@ if (extension_loaded('mbstring')) {
function iconv_substr(?string $string, ?int $offset, ?int $length = null, ?string $encoding = null): string|false { null === $encoding && $encoding = p\Iconv::$internalEncoding; return mb_substr((string) $string, (int) $offset, $length, $encoding); }
}
if (!function_exists('iconv_mime_decode')) {
- function iconv_mime_decode($string, $mode = 0, $encoding = null) { null === $encoding && $encoding = p\Iconv::$internalEncoding; return mb_decode_mimeheader($string, $mode, $encoding); }
+ function iconv_mime_decode($string, $mode = 0, $encoding = null) { $currentMbEncoding = mb_internal_encoding(); null === $encoding && $encoding = p\Iconv::$internalEncoding; mb_internal_encoding($encoding); $decoded = mb_decode_mimeheader($string); mb_internal_encoding($currentMbEncoding); return $decoded; }
}
} else {
if (!function_exists('iconv_strlen')) {
diff --git a/symfony/polyfill-iconv/composer.json b/symfony/polyfill-iconv/composer.json
index 17483e00..361f5554 100644
--- a/symfony/polyfill-iconv/composer.json
+++ b/symfony/polyfill-iconv/composer.json
@@ -18,6 +18,9 @@
"require": {
"php": ">=7.1"
},
+ "provide": {
+ "ext-iconv": "*"
+ },
"autoload": {
"psr-4": { "Symfony\\Polyfill\\Iconv\\": "" },
"files": [ "bootstrap.php" ]
@@ -28,7 +31,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.23-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/symfony/polyfill-intl-idn/Idn.php b/symfony/polyfill-intl-idn/Idn.php
index fee3026d..86710b94 100644
--- a/symfony/polyfill-intl-idn/Idn.php
+++ b/symfony/polyfill-intl-idn/Idn.php
@@ -723,7 +723,7 @@ final class Idn
$qMinusT = $q - $t;
$baseMinusT = self::BASE - $t;
- $output .= self::encodeDigit($t + ($qMinusT) % ($baseMinusT), false);
+ $output .= self::encodeDigit($t + $qMinusT % $baseMinusT, false);
++$out;
$q = intdiv($qMinusT, $baseMinusT);
}
diff --git a/symfony/polyfill-intl-idn/README.md b/symfony/polyfill-intl-idn/README.md
index 2e75f2e5..cae55170 100644
--- a/symfony/polyfill-intl-idn/README.md
+++ b/symfony/polyfill-intl-idn/README.md
@@ -4,7 +4,7 @@ Symfony Polyfill / Intl: Idn
This component provides [`idn_to_ascii`](https://php.net/idn-to-ascii) and [`idn_to_utf8`](https://php.net/idn-to-utf8) functions to users who run php versions without the [Intl](https://php.net/intl) extension.
More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
License
=======
diff --git a/symfony/polyfill-intl-idn/bootstrap80.php b/symfony/polyfill-intl-idn/bootstrap80.php
index a42ab81a..a62c2d69 100644
--- a/symfony/polyfill-intl-idn/bootstrap80.php
+++ b/symfony/polyfill-intl-idn/bootstrap80.php
@@ -118,8 +118,8 @@ if (!defined('IDNA_ERROR_CONTEXTJ')) {
}
if (!function_exists('idn_to_ascii')) {
- function idn_to_ascii(?string $domain, ?int $flags = 0, ?int $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = null): string|false { return p\Idn::idn_to_ascii((string) $domain, (int) $flags, (int) $variant, $idna_info); }
+ function idn_to_ascii(?string $domain, ?int $flags = IDNA_DEFAULT, ?int $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = null): string|false { return p\Idn::idn_to_ascii((string) $domain, (int) $flags, (int) $variant, $idna_info); }
}
if (!function_exists('idn_to_utf8')) {
- function idn_to_utf8(?string $domain, ?int $flags = 0, ?int $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = null): string|false { return p\Idn::idn_to_utf8((string) $domain, (int) $flags, (int) $variant, $idna_info); }
+ function idn_to_utf8(?string $domain, ?int $flags = IDNA_DEFAULT, ?int $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = null): string|false { return p\Idn::idn_to_utf8((string) $domain, (int) $flags, (int) $variant, $idna_info); }
}
diff --git a/symfony/polyfill-intl-idn/composer.json b/symfony/polyfill-intl-idn/composer.json
index c5a2a462..105e3d06 100644
--- a/symfony/polyfill-intl-idn/composer.json
+++ b/symfony/polyfill-intl-idn/composer.json
@@ -34,7 +34,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.23-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/symfony/polyfill-intl-normalizer/Normalizer.php b/symfony/polyfill-intl-normalizer/Normalizer.php
index 4443c232..81704ab3 100644
--- a/symfony/polyfill-intl-normalizer/Normalizer.php
+++ b/symfony/polyfill-intl-normalizer/Normalizer.php
@@ -90,7 +90,7 @@ class Normalizer
self::$cC = self::getData('combiningClass');
}
- if (null !== $mbEncoding = (2 /* MB_OVERLOAD_STRING */ & (int) ini_get('mbstring.func_overload')) ? mb_internal_encoding() : null) {
+ if (null !== $mbEncoding = (2 /* MB_OVERLOAD_STRING */ & (int) \ini_get('mbstring.func_overload')) ? mb_internal_encoding() : null) {
mb_internal_encoding('8bit');
}
diff --git a/symfony/polyfill-intl-normalizer/README.md b/symfony/polyfill-intl-normalizer/README.md
index 15060c5f..b9b762e8 100644
--- a/symfony/polyfill-intl-normalizer/README.md
+++ b/symfony/polyfill-intl-normalizer/README.md
@@ -6,7 +6,7 @@ This component provides a fallback implementation for the
by the [Intl](https://php.net/intl) extension.
More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
License
=======
diff --git a/symfony/polyfill-intl-normalizer/composer.json b/symfony/polyfill-intl-normalizer/composer.json
index 393edf70..65f72d64 100644
--- a/symfony/polyfill-intl-normalizer/composer.json
+++ b/symfony/polyfill-intl-normalizer/composer.json
@@ -29,7 +29,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.23-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/symfony/polyfill-mbstring/Mbstring.php b/symfony/polyfill-mbstring/Mbstring.php
index 693749f2..bce5c4a8 100644
--- a/symfony/polyfill-mbstring/Mbstring.php
+++ b/symfony/polyfill-mbstring/Mbstring.php
@@ -80,7 +80,7 @@ final class Mbstring
public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null)
{
- if (\is_array($fromEncoding) || ($fromEncoding !== null && false !== strpos($fromEncoding, ','))) {
+ if (\is_array($fromEncoding) || (null !== $fromEncoding && false !== strpos($fromEncoding, ','))) {
$fromEncoding = self::mb_detect_encoding($s, $fromEncoding);
} else {
$fromEncoding = self::getEncoding($fromEncoding);
@@ -102,7 +102,7 @@ final class Mbstring
$fromEncoding = 'Windows-1252';
}
if ('UTF-8' !== $fromEncoding) {
- $s = \iconv($fromEncoding, 'UTF-8//IGNORE', $s);
+ $s = iconv($fromEncoding, 'UTF-8//IGNORE', $s);
}
return preg_replace_callback('/[\x80-\xFF]+/', [__CLASS__, 'html_encoding_callback'], $s);
@@ -113,7 +113,7 @@ final class Mbstring
$fromEncoding = 'UTF-8';
}
- return \iconv($fromEncoding, $toEncoding.'//IGNORE', $s);
+ return iconv($fromEncoding, $toEncoding.'//IGNORE', $s);
}
public static function mb_convert_variables($toEncoding, $fromEncoding, &...$vars)
@@ -130,7 +130,7 @@ final class Mbstring
public static function mb_decode_mimeheader($s)
{
- return \iconv_mime_decode($s, 2, self::$internalEncoding);
+ return iconv_mime_decode($s, 2, self::$internalEncoding);
}
public static function mb_encode_mimeheader($s, $charset = null, $transferEncoding = null, $linefeed = null, $indent = null)
@@ -140,7 +140,7 @@ final class Mbstring
public static function mb_decode_numericentity($s, $convmap, $encoding = null)
{
- if (null !== $s && !is_scalar($s) && !(\is_object($s) && method_exists($s, '__toString'))) {
+ if (null !== $s && !\is_scalar($s) && !(\is_object($s) && method_exists($s, '__toString'))) {
trigger_error('mb_decode_numericentity() expects parameter 1 to be string, '.\gettype($s).' given', \E_USER_WARNING);
return null;
@@ -150,7 +150,7 @@ final class Mbstring
return false;
}
- if (null !== $encoding && !is_scalar($encoding)) {
+ if (null !== $encoding && !\is_scalar($encoding)) {
trigger_error('mb_decode_numericentity() expects parameter 3 to be string, '.\gettype($s).' given', \E_USER_WARNING);
return ''; // Instead of null (cf. mb_encode_numericentity).
@@ -166,10 +166,10 @@ final class Mbstring
if ('UTF-8' === $encoding) {
$encoding = null;
if (!preg_match('//u', $s)) {
- $s = @\iconv('UTF-8', 'UTF-8//IGNORE', $s);
+ $s = @iconv('UTF-8', 'UTF-8//IGNORE', $s);
}
} else {
- $s = \iconv($encoding, 'UTF-8//IGNORE', $s);
+ $s = iconv($encoding, 'UTF-8//IGNORE', $s);
}
$cnt = floor(\count($convmap) / 4) * 4;
@@ -195,12 +195,12 @@ final class Mbstring
return $s;
}
- return \iconv('UTF-8', $encoding.'//IGNORE', $s);
+ return iconv('UTF-8', $encoding.'//IGNORE', $s);
}
public static function mb_encode_numericentity($s, $convmap, $encoding = null, $is_hex = false)
{
- if (null !== $s && !is_scalar($s) && !(\is_object($s) && method_exists($s, '__toString'))) {
+ if (null !== $s && !\is_scalar($s) && !(\is_object($s) && method_exists($s, '__toString'))) {
trigger_error('mb_encode_numericentity() expects parameter 1 to be string, '.\gettype($s).' given', \E_USER_WARNING);
return null;
@@ -210,13 +210,13 @@ final class Mbstring
return false;
}
- if (null !== $encoding && !is_scalar($encoding)) {
+ if (null !== $encoding && !\is_scalar($encoding)) {
trigger_error('mb_encode_numericentity() expects parameter 3 to be string, '.\gettype($s).' given', \E_USER_WARNING);
return null; // Instead of '' (cf. mb_decode_numericentity).
}
- if (null !== $is_hex && !is_scalar($is_hex)) {
+ if (null !== $is_hex && !\is_scalar($is_hex)) {
trigger_error('mb_encode_numericentity() expects parameter 4 to be boolean, '.\gettype($s).' given', \E_USER_WARNING);
return null;
@@ -232,10 +232,10 @@ final class Mbstring
if ('UTF-8' === $encoding) {
$encoding = null;
if (!preg_match('//u', $s)) {
- $s = @\iconv('UTF-8', 'UTF-8//IGNORE', $s);
+ $s = @iconv('UTF-8', 'UTF-8//IGNORE', $s);
}
} else {
- $s = \iconv($encoding, 'UTF-8//IGNORE', $s);
+ $s = iconv($encoding, 'UTF-8//IGNORE', $s);
}
static $ulenMask = ["\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4];
@@ -265,7 +265,7 @@ final class Mbstring
return $result;
}
- return \iconv('UTF-8', $encoding.'//IGNORE', $result);
+ return iconv('UTF-8', $encoding.'//IGNORE', $result);
}
public static function mb_convert_case($s, $mode, $encoding = null)
@@ -280,10 +280,10 @@ final class Mbstring
if ('UTF-8' === $encoding) {
$encoding = null;
if (!preg_match('//u', $s)) {
- $s = @\iconv('UTF-8', 'UTF-8//IGNORE', $s);
+ $s = @iconv('UTF-8', 'UTF-8//IGNORE', $s);
}
} else {
- $s = \iconv($encoding, 'UTF-8//IGNORE', $s);
+ $s = iconv($encoding, 'UTF-8//IGNORE', $s);
}
if (\MB_CASE_TITLE == $mode) {
@@ -343,7 +343,7 @@ final class Mbstring
return $s;
}
- return \iconv('UTF-8', $encoding.'//IGNORE', $s);
+ return iconv('UTF-8', $encoding.'//IGNORE', $s);
}
public static function mb_internal_encoding($encoding = null)
@@ -354,7 +354,7 @@ final class Mbstring
$normalizedEncoding = self::getEncoding($encoding);
- if ('UTF-8' === $normalizedEncoding || false !== @\iconv($normalizedEncoding, $normalizedEncoding, ' ')) {
+ if ('UTF-8' === $normalizedEncoding || false !== @iconv($normalizedEncoding, $normalizedEncoding, ' ')) {
self::$internalEncoding = $normalizedEncoding;
return true;
@@ -413,7 +413,7 @@ final class Mbstring
$encoding = self::$internalEncoding;
}
- return self::mb_detect_encoding($var, [$encoding]) || false !== @\iconv($encoding, $encoding, $var);
+ return self::mb_detect_encoding($var, [$encoding]) || false !== @iconv($encoding, $encoding, $var);
}
public static function mb_detect_encoding($str, $encodingList = null, $strict = false)
@@ -488,7 +488,7 @@ final class Mbstring
return \strlen($s);
}
- return @\iconv_strlen($s, $encoding);
+ return @iconv_strlen($s, $encoding);
}
public static function mb_strpos($haystack, $needle, $offset = 0, $encoding = null)
@@ -509,7 +509,7 @@ final class Mbstring
return 0;
}
- return \iconv_strpos($haystack, $needle, $offset, $encoding);
+ return iconv_strpos($haystack, $needle, $offset, $encoding);
}
public static function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null)
@@ -533,7 +533,7 @@ final class Mbstring
}
$pos = '' !== $needle || 80000 > \PHP_VERSION_ID
- ? \iconv_strrpos($haystack, $needle, $encoding)
+ ? iconv_strrpos($haystack, $needle, $encoding)
: self::mb_strlen($haystack, $encoding);
return false !== $pos ? $offset + $pos : false;
@@ -541,7 +541,7 @@ final class Mbstring
public static function mb_str_split($string, $split_length = 1, $encoding = null)
{
- if (null !== $string && !is_scalar($string) && !(\is_object($string) && method_exists($string, '__toString'))) {
+ if (null !== $string && !\is_scalar($string) && !(\is_object($string) && method_exists($string, '__toString'))) {
trigger_error('mb_str_split() expects parameter 1 to be string, '.\gettype($string).' given', \E_USER_WARNING);
return null;
@@ -550,6 +550,7 @@ final class Mbstring
if (1 > $split_length = (int) $split_length) {
if (80000 > \PHP_VERSION_ID) {
trigger_error('The length of each segment must be greater than zero', \E_USER_WARNING);
+
return false;
}
@@ -617,7 +618,7 @@ final class Mbstring
}
if ($start < 0) {
- $start = \iconv_strlen($s, $encoding) + $start;
+ $start = iconv_strlen($s, $encoding) + $start;
if ($start < 0) {
$start = 0;
}
@@ -626,13 +627,13 @@ final class Mbstring
if (null === $length) {
$length = 2147483647;
} elseif ($length < 0) {
- $length = \iconv_strlen($s, $encoding) + $length - $start;
+ $length = iconv_strlen($s, $encoding) + $length - $start;
if ($length < 0) {
return '';
}
}
- return (string) \iconv_substr($s, $start, $length, $encoding);
+ return (string) iconv_substr($s, $start, $length, $encoding);
}
public static function mb_stripos($haystack, $needle, $offset = 0, $encoding = null)
@@ -657,7 +658,7 @@ final class Mbstring
$pos = strrpos($haystack, $needle);
} else {
$needle = self::mb_substr($needle, 0, 1, $encoding);
- $pos = \iconv_strrpos($haystack, $needle, $encoding);
+ $pos = iconv_strrpos($haystack, $needle, $encoding);
}
return self::getSubpart($pos, $part, $haystack, $encoding);
@@ -736,12 +737,12 @@ final class Mbstring
$encoding = self::getEncoding($encoding);
if ('UTF-8' !== $encoding) {
- $s = \iconv($encoding, 'UTF-8//IGNORE', $s);
+ $s = iconv($encoding, 'UTF-8//IGNORE', $s);
}
$s = preg_replace('/[\x{1100}-\x{115F}\x{2329}\x{232A}\x{2E80}-\x{303E}\x{3040}-\x{A4CF}\x{AC00}-\x{D7A3}\x{F900}-\x{FAFF}\x{FE10}-\x{FE19}\x{FE30}-\x{FE6F}\x{FF00}-\x{FF60}\x{FFE0}-\x{FFE6}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}]/u', '', $s, -1, $wide);
- return ($wide << 1) + \iconv_strlen($s, 'UTF-8');
+ return ($wide << 1) + iconv_strlen($s, 'UTF-8');
}
public static function mb_substr_count($haystack, $needle, $encoding = null)
diff --git a/symfony/polyfill-mbstring/composer.json b/symfony/polyfill-mbstring/composer.json
index 9cd2e924..44895536 100644
--- a/symfony/polyfill-mbstring/composer.json
+++ b/symfony/polyfill-mbstring/composer.json
@@ -31,7 +31,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.26-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/symfony/polyfill-php72/Php72.php b/symfony/polyfill-php72/Php72.php
index 5e20d5bf..7bf96c99 100644
--- a/symfony/polyfill-php72/Php72.php
+++ b/symfony/polyfill-php72/Php72.php
@@ -83,7 +83,7 @@ final class Php72
'SunOS' => 'Solaris',
];
- return isset($map[\PHP_OS]) ? $map[\PHP_OS] : 'Unknown';
+ return $map[\PHP_OS] ?? 'Unknown';
}
public static function spl_object_id($object)
@@ -96,7 +96,7 @@ final class Php72
}
// On 32-bit systems, PHP_INT_SIZE is 4,
- return self::$hashMask ^ hexdec(substr($hash, 16 - (\PHP_INT_SIZE * 2 - 1), (\PHP_INT_SIZE * 2 - 1)));
+ return self::$hashMask ^ hexdec(substr($hash, 16 - (\PHP_INT_SIZE * 2 - 1), \PHP_INT_SIZE * 2 - 1));
}
public static function sapi_windows_vt100_support($stream, $enable = null)
@@ -167,7 +167,7 @@ final class Php72
self::$hashMask = (int) substr(ob_get_clean(), 17);
}
- self::$hashMask ^= hexdec(substr(spl_object_hash($obj), 16 - (\PHP_INT_SIZE * 2 - 1), (\PHP_INT_SIZE * 2 - 1)));
+ self::$hashMask ^= hexdec(substr(spl_object_hash($obj), 16 - (\PHP_INT_SIZE * 2 - 1), \PHP_INT_SIZE * 2 - 1));
}
public static function mb_chr($code, $encoding = null)
diff --git a/symfony/polyfill-php72/README.md b/symfony/polyfill-php72/README.md
index 59dec8a2..ed190505 100644
--- a/symfony/polyfill-php72/README.md
+++ b/symfony/polyfill-php72/README.md
@@ -6,6 +6,12 @@ This component provides functions added to PHP 7.2 core:
- [`spl_object_id`](https://php.net/spl_object_id)
- [`stream_isatty`](https://php.net/stream_isatty)
+And also functions added to PHP 7.2 mbstring:
+
+- [`mb_ord`](https://php.net/mb_ord)
+- [`mb_chr`](https://php.net/mb_chr)
+- [`mb_scrub`](https://php.net/mb_scrub)
+
On Windows only:
- [`sapi_windows_vt100_support`](https://php.net/sapi_windows_vt100_support)
@@ -16,11 +22,12 @@ Moved to core since 7.2 (was in the optional XML extension earlier):
- [`utf8_decode`](https://php.net/utf8_decode)
Also, it provides constants added to PHP 7.2:
+
- [`PHP_FLOAT_*`](https://php.net/reserved.constants#constant.php-float-dig)
- [`PHP_OS_FAMILY`](https://php.net/reserved.constants#constant.php-os-family)
More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
License
=======
diff --git a/symfony/polyfill-php72/composer.json b/symfony/polyfill-php72/composer.json
index c96c8447..5f17af34 100644
--- a/symfony/polyfill-php72/composer.json
+++ b/symfony/polyfill-php72/composer.json
@@ -25,7 +25,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.23-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",