Skip to content

Commit

Permalink
Update PHPMailer to 5.2.14
Browse files Browse the repository at this point in the history
  • Loading branch information
@wilsonge
wilsonge committed Dec 23, 2015
1 parent d67f578 commit 4861b21
Show file tree
Hide file tree
Showing 20 changed files with 5,797 additions and 1,712 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Expand Up @@ -106,6 +106,8 @@ Desktop.ini
/libraries/vendor/phpmailer/phpmailer/composer.json
/libraries/vendor/phpmailer/phpmailer/README.md
/libraries/vendor/phpmailer/phpmailer/travis.phpunit.xml.dist
/libraries/vendor/phpmailer/phpmailer/extras/README.md
/libraries/vendor/phpmailer/phpmailer/get_oauth_token.php
/libraries/vendor/psr/log/Psr/Log/Test
/libraries/vendor/psr/log/.gitignore
/libraries/vendor/psr/log/composer.json
Expand Down
1 change: 1 addition & 0 deletions administrator/components/com_admin/script.php
View file
Expand Up @@ -1471,6 +1471,7 @@ public function deleteUnexistingFiles()
'/libraries/vendor/symfony/yaml/Symfony/Component',
'/libraries/vendor/symfony/yaml/Symfony',
'/administrator/components/com_tags/helpers',
'/libraries/vendor/phpmailer/phpmailer/extras/class.html2text.php',
);

jimport('joomla.filesystem.file');
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Expand Up @@ -21,7 +21,7 @@
"ircmaxell/password-compat": "1.*",
"leafo/lessphp": "0.3.9",
"paragonie/random_compat": "~1.0",
"phpmailer/phpmailer": "5.2.9",
"phpmailer/phpmailer": "5.2.14",
"symfony/polyfill-php56": "~1.0",
"symfony/yaml": "2.*"
},
Expand Down
26 changes: 17 additions & 9 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions libraries/vendor/composer/ClassLoader.php
View file
Expand Up @@ -13,9 +13,7 @@
namespace Composer\Autoload;

/**
* ClassLoader implements a PSR-0 class loader
*
* See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
* ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
*
* $loader = new \Composer\Autoload\ClassLoader();
*
Expand All @@ -39,6 +37,8 @@
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Jordi Boggiano <j.boggiano@seld.be>
* @see http://www.php-fig.org/psr/psr-0/
* @see http://www.php-fig.org/psr/psr-4/
*/
class ClassLoader
{
Expand Down
4 changes: 4 additions & 0 deletions libraries/vendor/composer/autoload_classmap.php
View file
Expand Up @@ -7,14 +7,18 @@

return array(
'CallbackFilterIterator' => $vendorDir . '/joomla/compat/src/CallbackFilterIterator.php',
'EasyPeasyICS' => $vendorDir . '/phpmailer/phpmailer/extras/EasyPeasyICS.php',
'JsonSerializable' => $vendorDir . '/joomla/compat/src/JsonSerializable.php',
'PHPMailer' => $vendorDir . '/phpmailer/phpmailer/class.phpmailer.php',
'PHPMailerOAuth' => $vendorDir . '/phpmailer/phpmailer/class.phpmaileroauth.php',
'PHPMailerOAuthGoogle' => $vendorDir . '/phpmailer/phpmailer/class.phpmaileroauthgoogle.php',
'POP3' => $vendorDir . '/phpmailer/phpmailer/class.pop3.php',
'SMTP' => $vendorDir . '/phpmailer/phpmailer/class.smtp.php',
'lessc' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
'lessc_formatter_classic' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
'lessc_formatter_compressed' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
'lessc_formatter_lessjs' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
'lessc_parser' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
'ntlm_sasl_client_class' => $vendorDir . '/phpmailer/phpmailer/extras/ntlm_sasl_client.php',
'phpmailerException' => $vendorDir . '/phpmailer/phpmailer/class.phpmailer.php',
);
6 changes: 3 additions & 3 deletions libraries/vendor/composer/autoload_files.php
View file
Expand Up @@ -6,7 +6,7 @@
$baseDir = dirname(dirname($vendorDir));

return array(
$vendorDir . '/ircmaxell/password-compat/lib/password.php',
$vendorDir . '/paragonie/random_compat/lib/random.php',
$vendorDir . '/symfony/polyfill-php56/bootstrap.php',
'e40631d46120a9c38ea139981f8dab26' => $vendorDir . '/ircmaxell/password-compat/lib/password.php',
'5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
);
12 changes: 8 additions & 4 deletions libraries/vendor/composer/autoload_real.php
View file
Expand Up @@ -41,15 +41,19 @@ public static function getLoader()
$loader->register(true);

$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
composerRequire0efb534ee20646bcb987f4359c38b3aa($file);
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire0efb534ee20646bcb987f4359c38b3aa($fileIdentifier, $file);
}

return $loader;
}
}

function composerRequire0efb534ee20646bcb987f4359c38b3aa($file)
function composerRequire0efb534ee20646bcb987f4359c38b3aa($fileIdentifier, $file)
{
require $file;
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
}
}
118 changes: 63 additions & 55 deletions libraries/vendor/composer/installed.json
View file
Expand Up @@ -215,61 +215,6 @@
"password"
]
},
{
"name": "phpmailer/phpmailer",
"version": "v5.2.9",
"version_normalized": "5.2.9.0",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
"reference": "73b61679809615850706f1dbf88e6df2ddc05745"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/73b61679809615850706f1dbf88e6df2ddc05745",
"reference": "73b61679809615850706f1dbf88e6df2ddc05745",
"shasum": ""
},
"require": {
"php": ">=5.0.0"
},
"require-dev": {
"phpdocumentor/phpdocumentor": "*",
"phpunit/phpunit": "4.1.*"
},
"time": "2014-09-26 18:33:30",
"type": "library",
"installation-source": "dist",
"autoload": {
"classmap": [
"class.phpmailer.php",
"class.pop3.php",
"class.smtp.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-2.1"
],
"authors": [
{
"name": "Jim Jagielski",
"email": "jimjag@gmail.com"
},
{
"name": "Marcus Bointon",
"email": "phpmailer@synchromedia.co.uk"
},
{
"name": "Andy Prevost",
"email": "codeworxtech@users.sourceforge.net"
},
{
"name": "Brent R. Matzelle"
}
],
"description": "PHPMailer is a full-featured email creation and transfer class for PHP"
},
{
"name": "joomla/utilities",
"version": "1.3.3",
Expand Down Expand Up @@ -925,5 +870,68 @@
"portable",
"shim"
]
},
{
"name": "phpmailer/phpmailer",
"version": "v5.2.14",
"version_normalized": "5.2.14.0",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
"reference": "e774bc9152de85547336e22b8926189e582ece95"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/e774bc9152de85547336e22b8926189e582ece95",
"reference": "e774bc9152de85547336e22b8926189e582ece95",
"shasum": ""
},
"require": {
"php": ">=5.0.0"
},
"require-dev": {
"phpdocumentor/phpdocumentor": "*",
"phpunit/phpunit": "4.7.*"
},
"suggest": {
"league/oauth2-client": "Needed for XOAUTH2 authentication",
"league/oauth2-google": "Needed for Gmail XOAUTH2"
},
"time": "2015-11-01 10:15:28",
"type": "library",
"installation-source": "dist",
"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"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-2.1"
],
"authors": [
{
"name": "Jim Jagielski",
"email": "jimjag@gmail.com"
},
{
"name": "Marcus Bointon",
"email": "phpmailer@synchromedia.co.uk"
},
{
"name": "Andy Prevost",
"email": "codeworxtech@users.sourceforge.net"
},
{
"name": "Brent R. Matzelle"
}
],
"description": "PHPMailer is a full-featured email creation and transfer class for PHP"
}
]
1 change: 1 addition & 0 deletions libraries/vendor/phpmailer/phpmailer/VERSION
View file
@@ -0,0 +1 @@
5.2.14

0 comments on commit 4861b21

Please sign in to comment.