From d07019d5636a29108627c464d1c48d0aa2985c33 Mon Sep 17 00:00:00 2001 From: Tobias Krebs Date: Tue, 8 Nov 2022 13:10:00 +0100 Subject: [PATCH] Fix Punycode exception on email sending, fixes #567 --- README.md | 6 +- UPDATE.md | 19 +++-- VERSION | 2 +- composer.json | 4 +- composer.lock | 136 ++++++++++++++++++++++++++++++++- config/autoload/local.php.dist | 2 +- 6 files changed, 156 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index b0e000ee..59b29b15 100644 --- a/README.md +++ b/README.md @@ -44,9 +44,11 @@ https://github.com/tkrebs/ep3-bs where you can find stable and (latest) development releases. -## Version +## Versions -The current version is 1.8.0 from October 2022. +The current version is 1.8.1 from November 2022. + +Version 1.8.1 fixes an email sending related bug. Version 1.8.0 provides compatibility with PHP 8.1 by overriding and fixing the essential Zend Framework 2 components. It also fixes some bugs, added a file-storage-only mail option and removes some legacy code (mainly, the file manager). diff --git a/UPDATE.md b/UPDATE.md index dc9b9ec4..74ee040e 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -17,7 +17,12 @@ If you haven't made any changes to the core files, your configuration, customiza after the update. -## Update to `1.8.0` +## Update from 1.8.0 to `1.8.1` + +- Replace the `vendor/` directory + + +## Update from 1.7.0 to `1.8.0` 🚨 Warnings: @@ -56,7 +61,7 @@ Update steps: - `README` (without file extension) -## Update to `1.7.0` +## Update from 1.6.4 to `1.7.0` Replace the following directories: @@ -64,12 +69,12 @@ Replace the following directories: - `vendor/` -## Update to `1.6.4` +## Update from 1.6.3 to `1.6.4` There are no steps necessary when updating from version `1.6.3`. -## Update to `1.6.3` +## Update from 1.6.2 to `1.6.3` Replace the following directories: @@ -86,7 +91,7 @@ Replace the following directories: - All single files in the project root directory -## Update to `1.6.2` +## Update from 1.6 to `1.6.2` There have been some internal changes to the configuration directory. Replace the following files: @@ -104,7 +109,7 @@ There have been some internal changes to the configuration directory. Replace th - All single files in the project root directory -## Update to `1.6` +## Update from 1.4 or 1.5 to `1.6` Replace the following directories and files with the new ones: @@ -122,7 +127,7 @@ Replace the following directories and files with the new ones: - `public/index.php` -## Update to `1.4 / 1.5` +## Update from older versions to `1.4` or `1.5` Replace the following directories and files with the new ones: diff --git a/VERSION b/VERSION index 230b4a5c..74c212a8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.8.0 +1.8.1 diff --git a/composer.json b/composer.json index 508d3349..657e56c7 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,9 @@ "zendframework/zend-file": "^2.8.3", "zendframework/zend-i18n-resources": "^2.6.1", "zendframework/zend-log": "^2.12.0", - "zendframework/zend-version": "^2.5.1" + "zendframework/zend-version": "^2.5.1", + + "true/punycode": "^2.1" }, "autoload": { diff --git a/composer.lock b/composer.lock index 1000b445..2f216071 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": "91d12a34aacf7acabac8115ee8872f6d", + "content-hash": "28dc6fe48293fba425952137c8a8009e", "packages": [ { "name": "container-interop/container-interop", @@ -348,6 +348,140 @@ }, "time": "2017-10-23T01:57:42+00:00" }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.26.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.26-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-05-24T11:49:31+00:00" + }, + { + "name": "true/punycode", + "version": "v2.1.1", + "source": { + "type": "git", + "url": "https://github.com/true/php-punycode.git", + "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/true/php-punycode/zipball/a4d0c11a36dd7f4e7cd7096076cab6d3378a071e", + "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "symfony/polyfill-mbstring": "^1.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.7", + "squizlabs/php_codesniffer": "~2.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "TrueBV\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Renan Gonçalves", + "email": "renan.saddam@gmail.com" + } + ], + "description": "A Bootstring encoding of Unicode for Internationalized Domain Names in Applications (IDNA)", + "homepage": "https://github.com/true/php-punycode", + "keywords": [ + "idna", + "punycode" + ], + "support": { + "issues": "https://github.com/true/php-punycode/issues", + "source": "https://github.com/true/php-punycode/tree/master" + }, + "abandoned": true, + "time": "2016-11-16T10:37:54+00:00" + }, { "name": "zendframework/zend-authentication", "version": "2.7.0", diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist index 2fdf72b3..42d3f231 100644 --- a/config/autoload/local.php.dist +++ b/config/autoload/local.php.dist @@ -16,7 +16,7 @@ return array( 'port' => null, ), 'mail' => array( - 'type' => 'sendmail', // or 'smtp' or 'smtp-tls' (or 'file', to not send, but save to file) + 'type' => 'sendmail', // or 'smtp' or 'smtp-tls' (or 'file', to not send, but save to file (data/mails/)) 'address' => 'info@bookings.example.com', // Make sure 'bookings.example.com' matches the hosting domain when using type 'sendmail'