From 6287c94232a5ef2d3c1257f3455687d59bdbdefc Mon Sep 17 00:00:00 2001 From: Alex Tselegidis Date: Sat, 15 Aug 2020 15:58:45 +0300 Subject: [PATCH] Upgraded PHPMailer to ^6.1 --- composer.json | 2 +- composer.lock | 57 +++++++++++++++++++-------------------------------- 2 files changed, 22 insertions(+), 37 deletions(-) diff --git a/composer.json b/composer.json index 128da1b9..f172f2d9 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "ext-mbstring": "*", "ext-gd": "*", "gregwar/captcha": "^1.1", - "phpmailer/phpmailer": "^5.2", + "phpmailer/phpmailer": "^6.1", "codeigniter/framework": "^3.1.6", "jsvrcek/ics": "^0.5.1", "monolog/monolog": "^1", diff --git a/composer.lock b/composer.lock index e20a0804..23ffe7c2 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": "5e591e63759cd306700ad9ed76065ab3", + "content-hash": "5c87a4ae7a51d129a86f46448dd2262b", "packages": [ { "name": "codeigniter/framework", @@ -609,60 +609,45 @@ }, { "name": "phpmailer/phpmailer", - "version": "v5.2.28", + "version": "v6.1.7", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "acba50393dd03da69a50226c139722af8b153b11" + "reference": "2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/acba50393dd03da69a50226c139722af8b153b11", - "reference": "acba50393dd03da69a50226c139722af8b153b11", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0", + "reference": "2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0", "shasum": "" }, "require": { "ext-ctype": "*", - "php": ">=5.0.0" + "ext-filter": "*", + "php": ">=5.5.0" }, "require-dev": { - "doctrine/annotations": "1.2.*", - "jms/serializer": "0.16.*", - "phpdocumentor/phpdocumentor": "2.*", - "phpunit/phpunit": "4.8.*", - "symfony/debug": "2.8.*", - "symfony/filesystem": "2.8.*", - "symfony/translation": "2.8.*", - "symfony/yaml": "2.8.*", - "zendframework/zend-cache": "2.5.1", - "zendframework/zend-config": "2.5.1", - "zendframework/zend-eventmanager": "2.5.1", - "zendframework/zend-filter": "2.5.1", - "zendframework/zend-i18n": "2.5.1", - "zendframework/zend-json": "2.5.1", - "zendframework/zend-math": "2.5.1", - "zendframework/zend-serializer": "2.5.*", - "zendframework/zend-servicemanager": "2.5.*", - "zendframework/zend-stdlib": "2.5.1" + "doctrine/annotations": "^1.2", + "friendsofphp/php-cs-fixer": "^2.2", + "phpunit/phpunit": "^4.8 || ^5.7" }, "suggest": { - "league/oauth2-google": "Needed for Google XOAUTH2 authentication" + "ext-mbstring": "Needed to send email in multibyte encoding charset", + "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication", + "league/oauth2-google": "Needed for Google XOAUTH2 authentication", + "psr/log": "For optional PSR-3 debug logging", + "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication", + "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)" }, "type": "library", "autoload": { - "classmap": [ - "class.phpmailer.php", - "class.phpmaileroauth.php", - "class.phpmaileroauthgoogle.php", - "class.smtp.php", - "class.pop3.php", - "extras/EasyPeasyICS.php", - "extras/ntlm_sasl_client.php" - ] + "psr-4": { + "PHPMailer\\PHPMailer\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL-2.1" + "LGPL-2.1-only" ], "authors": [ { @@ -682,7 +667,7 @@ } ], "description": "PHPMailer is a full-featured email creation and transfer class for PHP", - "time": "2020-03-19T14:29:37+00:00" + "time": "2020-07-14T18:50:27+00:00" }, { "name": "phpseclib/phpseclib",