First draft of 5.4
This commit is contained in:
Synchro
parent
37d3550706
commit
9b3e13dc14
|
|
@ -31,10 +31,6 @@ tools:
|
|||
enabled: true
|
||||
config:
|
||||
standard: PSR2
|
||||
sniffs:
|
||||
generic:
|
||||
files:
|
||||
one_class_per_file_sniff: false
|
||||
filter:
|
||||
excluded_paths:
|
||||
- 'docs/*'
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ php:
|
|||
- 5.6
|
||||
- 5.5
|
||||
- 5.4
|
||||
- 5.3
|
||||
- hhvm
|
||||
|
||||
matrix:
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* PHPMailer SPL autoloader.
|
||||
* PHP Version 5
|
||||
* @package PHPMailer
|
||||
* @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
|
||||
* @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
|
||||
* @author Jim Jagielski (jimjag) <jimjag@gmail.com>
|
||||
* @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
|
||||
* @author Brent R. Matzelle (original founder)
|
||||
* @copyright 2012 - 2014 Marcus Bointon
|
||||
* @copyright 2010 - 2012 Jim Jagielski
|
||||
* @copyright 2004 - 2009 Andy Prevost
|
||||
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
|
||||
* @note This program is distributed in the hope that it will be useful - WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* PHPMailer SPL autoloader.
|
||||
* @param string $classname The name of the class to load
|
||||
*/
|
||||
function PHPMailerAutoload($classname)
|
||||
{
|
||||
//Can't use __DIR__ as it's only in PHP 5.3+
|
||||
$filename = dirname(__FILE__).DIRECTORY_SEPARATOR.'class.'.strtolower($classname).'.php';
|
||||
if (is_readable($filename)) {
|
||||
require $filename;
|
||||
}
|
||||
}
|
||||
|
||||
if (version_compare(PHP_VERSION, '5.1.2', '>=')) {
|
||||
//SPL autoloading was introduced in PHP 5.1.2
|
||||
if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
|
||||
spl_autoload_register('PHPMailerAutoload', true, true);
|
||||
} else {
|
||||
spl_autoload_register('PHPMailerAutoload');
|
||||
}
|
||||
} else {
|
||||
/**
|
||||
* Fall back to traditional autoload for old PHP versions
|
||||
* @param string $classname The name of the class to load
|
||||
*/
|
||||
function __autoload($classname)
|
||||
{
|
||||
PHPMailerAutoload($classname);
|
||||
}
|
||||
}
|
||||
33
README.md
33
README.md
|
|
@ -38,37 +38,36 @@ software availability and distribution.
|
|||
|
||||
## Installation & loading
|
||||
|
||||
PHPMailer is available via [Composer/Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic versioning), so just add this line to your `composer.json` file:
|
||||
PHPMailer is available on [Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic versioning), and installation via composer is the recommended way to install PHPMailer. Just add this line to your `composer.json` file:
|
||||
|
||||
```json
|
||||
"phpmailer/phpmailer": "~5.2"
|
||||
"phpmailer/phpmailer": "~5.4"
|
||||
```
|
||||
|
||||
or
|
||||
or run
|
||||
|
||||
```sh
|
||||
composer require phpmailer/phpmailer
|
||||
```
|
||||
|
||||
If you want to use the Gmail XOAUTH2 authentication class, you will also need to add a dependency on the `league/oauth2-client` package.
|
||||
PHPMailer declares the namespace `PHPMailer\PHPMailer`.
|
||||
|
||||
Alternatively, copy the contents of the PHPMailer folder into one of the `include_path` directories specified in your PHP configuration.. If you don't speak git or just want a tarball, click the 'zip' button at the top of the page in GitHub.
|
||||
If you want to use the Gmail XOAUTH2 authentication class, you will also need to add a dependency on the `league/oauth2-client` package in your `composer.json`.
|
||||
|
||||
If you're not using composer's autoloader, PHPMailer provides an SPL-compatible autoloader, and that is the preferred way of loading the library - just `require '/path/to/PHPMailerAutoload.php';` and everything should work. The autoloader does not throw errors if it can't find classes so it prepends itself to the SPL list, allowing your own (or your framework's) autoloader to catch errors. SPL autoloading was introduced in PHP 5.1.0, so if you are using a version older than that you will need to require/include each class manually.
|
||||
Alternatively, if you're not using composer, copy the contents of the PHPMailer folder into one of the `include_path` directories specified in your PHP configuration and load each one manually.
|
||||
|
||||
PHPMailer does *not* declare a namespace because namespaces were only introduced in PHP 5.3.
|
||||
|
||||
If you want to use Google's XOAUTH2 authentication mechanism, you need to be running at least PHP 5.4, and load the dependencies listed in `composer.json`.
|
||||
If you don't speak git or just want a tarball, click the 'zip' button on the right of the project page in GitHub.
|
||||
|
||||
### Minimal installation
|
||||
|
||||
While installing the entire package manually or with composer is simple, convenient and reliable, you may want to include only vital files in your project. At the very least you will need [class.phpmailer.php](class.phpmailer.php). If you're using SMTP, you'll need [class.smtp.php](class.smtp.php), and if you're using POP-before SMTP, you'll need [class.pop3.php](class.pop3.php). For all of these, we recommend you use [the autoloader](PHPMailerAutoload.php) too as otherwise you will either have to `require` all classes manually or use some other autoloader. You can skip the [language](language/) folder if you're not showing errors to users and can make do with English-only errors. You may need the additional classes in the [extras](extras/) folder if you are using those features, including NTLM authentication and ics generation. If you're using Google XOAUTH2 you will need `class.phpmaileroauth.php` and `class.oauth.php` classes too, as well as the composer dependencies.
|
||||
While installing the entire package manually or with composer is simple, convenient and reliable, you may want to include only vital files in your project. At the very least you will need [src/PHPMailer.php](src/PHPMailer.php). If you're using SMTP, you'll need [src/SMTP.php](src/SMTP.php), and if you're using POP-before SMTP, you'll need [src/POP3.php](src/POP3.php). You can skip the [language](language/) folder if you're not showing errors to users and can make do with English-only errors. If you're using Google XOAUTH2 you will need `src/PHPMailerOAuth.php` and `src/OAuthProvider/Google.php` classes, as well as the composer dependencies. Really, it's much easier to use composer!
|
||||
|
||||
## A Simple Example
|
||||
|
||||
```php
|
||||
<?php
|
||||
require 'PHPMailerAutoload.php';
|
||||
namespace PHPMailer\PHPMailer;
|
||||
require 'vendor/autoload.php';
|
||||
|
||||
$mail = new PHPMailer;
|
||||
|
||||
|
|
@ -105,7 +104,7 @@ if(!$mail->send()) {
|
|||
}
|
||||
```
|
||||
|
||||
You'll find plenty more to play with in the [examples](examples/) folder.
|
||||
You'll find plenty of examples to play with in the [examples](examples/) folder. They are saved with a `.phps` extension which will make them display as highlighted source in a browser, avoiding the possibility of them running in default installations. You can run them directly from a command line client, or rename them with a `.php` extension and run them via your web server.
|
||||
|
||||
That's it. You should now be ready to use PHPMailer!
|
||||
|
||||
|
|
@ -121,9 +120,9 @@ We welcome corrections and new languages - if you're looking for corrections to
|
|||
|
||||
## Documentation
|
||||
|
||||
Examples of how to use PHPMailer for common scenarios can be found in the [examples](examples/) folder. If you're looking for a good starting point, we recommend you start with [the gmail example](examples/gmail.phps).
|
||||
Start reading at the [GitHub wiki](https://github.com/PHPMailer/PHPMailer/wiki). If you're having trouble, this should be the first place you look as it's the most frequently updated.
|
||||
|
||||
There are tips and a troubleshooting guide in the [GitHub wiki](https://github.com/PHPMailer/PHPMailer/wiki). If you're having trouble, this should be the first place you look as it's the most frequently updated.
|
||||
Examples of how to use PHPMailer for common scenarios can be found in the [examples](examples/) folder. If you're looking for a good starting point, we recommend you start with [the gmail example](examples/gmail.phps).
|
||||
|
||||
Complete generated API documentation is [available online](http://phpmailer.github.io/PHPMailer/).
|
||||
|
||||
|
|
@ -133,7 +132,7 @@ If the documentation doesn't cover what you need, search the [many questions on
|
|||
|
||||
## Tests
|
||||
|
||||
There is a PHPUnit test script in the [test](test/) folder.
|
||||
There is a PHPUnit test script in the [test](test/) folder. PHPMailer uses PHPUnit 4.8 - we would use 5.0 but we need to run on PHP 5.4.
|
||||
|
||||
Build status: [](https://travis-ci.org/PHPMailer/PHPMailer)
|
||||
|
||||
|
|
@ -145,13 +144,13 @@ Please submit bug reports, suggestions and pull requests to the [GitHub issue tr
|
|||
|
||||
We're particularly interested in fixing edge-cases, expanding test coverage and updating translations.
|
||||
|
||||
With the move to the PHPMailer GitHub organisation, you'll need to update any remote URLs referencing the old GitHub location with a command like this from within your clone:
|
||||
If you have git clones from prior to the move to the PHPMailer GitHub organisation, you'll need to update any remote URLs referencing the old GitHub location with a command like this from within your clone:
|
||||
|
||||
```sh
|
||||
git remote set-url upstream https://github.com/PHPMailer/PHPMailer.git
|
||||
```
|
||||
|
||||
Please *don't* use the SourceForge or Google Code projects any more.
|
||||
Please *don't* use the SourceForge or Google Code projects any more; they are obsolete and no longer maintained.
|
||||
|
||||
## Sponsorship
|
||||
|
||||
|
|
|
|||
12
changelog.md
12
changelog.md
|
|
@ -1,5 +1,17 @@
|
|||
# ChangeLog
|
||||
|
||||
## Version 5.4
|
||||
This is a major update that breaks backwards compatibility.
|
||||
* Requires PHP 5.4 or later
|
||||
* Uses the `PHPMailer\PHPMailer` namespace
|
||||
* File structure simplified, classes live in the `src/` folder
|
||||
* Custom autoloader has been removed, now PSR-4 compatible
|
||||
* Classes renamed to make use of the namespace
|
||||
* `Extras` classes have been removed - use packages from packagist.org instead
|
||||
* All elements previously marked as deprecated have been removed (e.g. `ReturnPath`)
|
||||
|
||||
To avoid version confusion, this release is called **5.4**, **not 5.3**!
|
||||
|
||||
## Version 5.2.14 (Nov 1st 2015)
|
||||
* Allow addresses with IDN (Internationalized Domain Name) in PHP 5.3+, thanks to @fbonzon
|
||||
* Allow access to POP3 errors
|
||||
|
|
|
|||
|
|
@ -20,26 +20,20 @@
|
|||
}
|
||||
],
|
||||
"require": {
|
||||
"php": ">=5.0.0"
|
||||
"php": ">=5.4.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpdocumentor/phpdocumentor": "*",
|
||||
"phpunit/phpunit": "4.7.*"
|
||||
"phpdocumentor/phpdocumentor": "2.*",
|
||||
"phpunit/phpunit": "4.*"
|
||||
},
|
||||
"suggest": {
|
||||
"league/oauth2-client": "Needed for XOAUTH2 authentication",
|
||||
"league/oauth2-google": "Needed for Gmail XOAUTH2"
|
||||
},
|
||||
"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/"
|
||||
}
|
||||
},
|
||||
"license": "LGPL-2.1"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"hash": "0eb36ae77d61050323a94e312176ea66",
|
||||
"hash": "a8d788b755f616f054fd139407f11632",
|
||||
"content-hash": "7a29f5f89d8a23ec75270d6dfcb13d2b",
|
||||
"packages": [],
|
||||
"packages-dev": [
|
||||
{
|
||||
|
|
@ -330,16 +331,16 @@
|
|||
},
|
||||
{
|
||||
"name": "erusev/parsedown",
|
||||
"version": "1.5.4",
|
||||
"version": "1.6.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/erusev/parsedown.git",
|
||||
"reference": "0e89e3714bda18973184d30646306bb0a482bd96"
|
||||
"reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/erusev/parsedown/zipball/0e89e3714bda18973184d30646306bb0a482bd96",
|
||||
"reference": "0e89e3714bda18973184d30646306bb0a482bd96",
|
||||
"url": "https://api.github.com/repos/erusev/parsedown/zipball/3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7",
|
||||
"reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7",
|
||||
"shasum": ""
|
||||
},
|
||||
"type": "library",
|
||||
|
|
@ -365,7 +366,7 @@
|
|||
"markdown",
|
||||
"parser"
|
||||
],
|
||||
"time": "2015-08-03 09:24:05"
|
||||
"time": "2015-10-04 16:44:32"
|
||||
},
|
||||
{
|
||||
"name": "herrera-io/json",
|
||||
|
|
@ -626,9 +627,9 @@
|
|||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Johannes Schmitt",
|
||||
"name": "Johannes M. Schmitt",
|
||||
"email": "schmittjoh@gmail.com",
|
||||
"homepage": "https://github.com/schmittjoh",
|
||||
"homepage": "http://jmsyst.com",
|
||||
"role": "Developer of wrapped JMSSerializerBundle"
|
||||
}
|
||||
],
|
||||
|
|
@ -645,16 +646,16 @@
|
|||
},
|
||||
{
|
||||
"name": "justinrainbow/json-schema",
|
||||
"version": "1.4.4",
|
||||
"version": "1.5.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/justinrainbow/json-schema.git",
|
||||
"reference": "8dc9b9d85ab639ca60ab4608b34c1279d6ae7bce"
|
||||
"reference": "a4bee9f4b344b66e0a0d96c7afae1e92edf385fe"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/8dc9b9d85ab639ca60ab4608b34c1279d6ae7bce",
|
||||
"reference": "8dc9b9d85ab639ca60ab4608b34c1279d6ae7bce",
|
||||
"url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/a4bee9f4b344b66e0a0d96c7afae1e92edf385fe",
|
||||
"reference": "a4bee9f4b344b66e0a0d96c7afae1e92edf385fe",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -675,8 +676,8 @@
|
|||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"JsonSchema": "src/"
|
||||
"psr-4": {
|
||||
"JsonSchema\\": "src/JsonSchema/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
|
|
@ -707,7 +708,7 @@
|
|||
"json",
|
||||
"schema"
|
||||
],
|
||||
"time": "2015-07-14 16:29:50"
|
||||
"time": "2015-09-08 22:28:04"
|
||||
},
|
||||
{
|
||||
"name": "kherge/version",
|
||||
|
|
@ -754,16 +755,16 @@
|
|||
},
|
||||
{
|
||||
"name": "monolog/monolog",
|
||||
"version": "1.17.1",
|
||||
"version": "1.17.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Seldaek/monolog.git",
|
||||
"reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422"
|
||||
"reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/0524c87587ab85bc4c2d6f5b41253ccb930a5422",
|
||||
"reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422",
|
||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/bee7f0dc9c3e0b69a6039697533dca1e845c8c24",
|
||||
"reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -777,10 +778,11 @@
|
|||
"aws/aws-sdk-php": "^2.4.9",
|
||||
"doctrine/couchdb": "~1.0@dev",
|
||||
"graylog2/gelf-php": "~1.0",
|
||||
"jakub-onderka/php-parallel-lint": "0.9",
|
||||
"php-console/php-console": "^3.1.3",
|
||||
"phpunit/phpunit": "~4.5",
|
||||
"phpunit/phpunit-mock-objects": "2.3.0",
|
||||
"raven/raven": "~0.11",
|
||||
"raven/raven": "^0.13",
|
||||
"ruflin/elastica": ">=0.90 <3.0",
|
||||
"swiftmailer/swiftmailer": "~5.3",
|
||||
"videlalvaro/php-amqplib": "~2.4"
|
||||
|
|
@ -826,7 +828,7 @@
|
|||
"logging",
|
||||
"psr-3"
|
||||
],
|
||||
"time": "2015-08-31 09:17:37"
|
||||
"time": "2015-10-14 12:51:02"
|
||||
},
|
||||
{
|
||||
"name": "nikic/php-parser",
|
||||
|
|
@ -907,9 +909,9 @@
|
|||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Johannes Schmitt",
|
||||
"name": "Johannes M. Schmitt",
|
||||
"email": "schmittjoh@gmail.com",
|
||||
"homepage": "https://github.com/schmittjoh",
|
||||
"homepage": "http://jmsyst.com",
|
||||
"role": "Developer of wrapped JMSSerializerBundle"
|
||||
}
|
||||
],
|
||||
|
|
@ -1311,16 +1313,16 @@
|
|||
},
|
||||
{
|
||||
"name": "phpunit/php-code-coverage",
|
||||
"version": "2.2.2",
|
||||
"version": "2.2.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
||||
"reference": "2d7c03c0e4e080901b8f33b2897b0577be18a13c"
|
||||
"reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2d7c03c0e4e080901b8f33b2897b0577be18a13c",
|
||||
"reference": "2d7c03c0e4e080901b8f33b2897b0577be18a13c",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
|
||||
"reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1369,7 +1371,7 @@
|
|||
"testing",
|
||||
"xunit"
|
||||
],
|
||||
"time": "2015-08-04 03:42:39"
|
||||
"time": "2015-10-06 15:47:00"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-file-iterator",
|
||||
|
|
@ -1502,16 +1504,16 @@
|
|||
},
|
||||
{
|
||||
"name": "phpunit/php-token-stream",
|
||||
"version": "1.4.6",
|
||||
"version": "1.4.8",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
|
||||
"reference": "3ab72c62e550370a6cd5dc873e1a04ab57562f5b"
|
||||
"reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3ab72c62e550370a6cd5dc873e1a04ab57562f5b",
|
||||
"reference": "3ab72c62e550370a6cd5dc873e1a04ab57562f5b",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
|
||||
"reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1547,20 +1549,20 @@
|
|||
"keywords": [
|
||||
"tokenizer"
|
||||
],
|
||||
"time": "2015-08-16 08:51:00"
|
||||
"time": "2015-09-15 10:49:45"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit",
|
||||
"version": "4.7.7",
|
||||
"version": "4.8.16",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||
"reference": "9b97f9d807b862c2de2a36e86690000801c85724"
|
||||
"reference": "625f8c345606ed0f3a141dfb88f4116f0e22978e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9b97f9d807b862c2de2a36e86690000801c85724",
|
||||
"reference": "9b97f9d807b862c2de2a36e86690000801c85724",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/625f8c345606ed0f3a141dfb88f4116f0e22978e",
|
||||
"reference": "625f8c345606ed0f3a141dfb88f4116f0e22978e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1570,7 +1572,7 @@
|
|||
"ext-reflection": "*",
|
||||
"ext-spl": "*",
|
||||
"php": ">=5.3.3",
|
||||
"phpspec/prophecy": "~1.3,>=1.3.1",
|
||||
"phpspec/prophecy": "^1.3.1",
|
||||
"phpunit/php-code-coverage": "~2.1",
|
||||
"phpunit/php-file-iterator": "~1.4",
|
||||
"phpunit/php-text-template": "~1.2",
|
||||
|
|
@ -1578,7 +1580,7 @@
|
|||
"phpunit/phpunit-mock-objects": "~2.3",
|
||||
"sebastian/comparator": "~1.1",
|
||||
"sebastian/diff": "~1.2",
|
||||
"sebastian/environment": "~1.2",
|
||||
"sebastian/environment": "~1.3",
|
||||
"sebastian/exporter": "~1.2",
|
||||
"sebastian/global-state": "~1.0",
|
||||
"sebastian/version": "~1.0",
|
||||
|
|
@ -1593,7 +1595,7 @@
|
|||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "4.7.x-dev"
|
||||
"dev-master": "4.8.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
|
|
@ -1619,20 +1621,20 @@
|
|||
"testing",
|
||||
"xunit"
|
||||
],
|
||||
"time": "2015-07-13 11:28:34"
|
||||
"time": "2015-10-23 06:48:33"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit-mock-objects",
|
||||
"version": "2.3.7",
|
||||
"version": "2.3.8",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
|
||||
"reference": "5e2645ad49d196e020b85598d7c97e482725786a"
|
||||
"reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5e2645ad49d196e020b85598d7c97e482725786a",
|
||||
"reference": "5e2645ad49d196e020b85598d7c97e482725786a",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
|
||||
"reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1675,7 +1677,7 @@
|
|||
"mock",
|
||||
"xunit"
|
||||
],
|
||||
"time": "2015-08-19 09:14:08"
|
||||
"time": "2015-10-02 06:51:40"
|
||||
},
|
||||
{
|
||||
"name": "pimple/pimple",
|
||||
|
|
@ -1712,7 +1714,9 @@
|
|||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
"email": "fabien@symfony.com",
|
||||
"homepage": "http://fabien.potencier.org",
|
||||
"role": "Lead Developer"
|
||||
}
|
||||
],
|
||||
"description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
|
||||
|
|
@ -1995,16 +1999,16 @@
|
|||
},
|
||||
{
|
||||
"name": "sebastian/global-state",
|
||||
"version": "1.0.0",
|
||||
"version": "1.1.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/global-state.git",
|
||||
"reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
|
||||
"reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
|
||||
"reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
|
||||
"reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2042,7 +2046,7 @@
|
|||
"keywords": [
|
||||
"global state"
|
||||
],
|
||||
"time": "2014-10-06 09:23:50"
|
||||
"time": "2015-10-12 03:26:01"
|
||||
},
|
||||
{
|
||||
"name": "sebastian/recursion-context",
|
||||
|
|
@ -2180,25 +2184,22 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/config",
|
||||
"version": "v2.7.3",
|
||||
"version": "v2.7.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Config.git",
|
||||
"reference": "6c905bbed1e728226de656e4c07d620dfe9e80d9"
|
||||
"url": "https://github.com/symfony/config.git",
|
||||
"reference": "831f88908b51b9ce945f5e6f402931d1ac544423"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Config/zipball/6c905bbed1e728226de656e4c07d620dfe9e80d9",
|
||||
"reference": "6c905bbed1e728226de656e4c07d620dfe9e80d9",
|
||||
"url": "https://api.github.com/repos/symfony/config/zipball/831f88908b51b9ce945f5e6f402931d1ac544423",
|
||||
"reference": "831f88908b51b9ce945f5e6f402931d1ac544423",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.9",
|
||||
"symfony/filesystem": "~2.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/phpunit-bridge": "~2.7"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -2226,20 +2227,20 @@
|
|||
],
|
||||
"description": "Symfony Config Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2015-07-09 16:07:40"
|
||||
"time": "2015-10-11 09:39:48"
|
||||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
"version": "v2.7.3",
|
||||
"version": "v2.7.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Console.git",
|
||||
"reference": "d6cf02fe73634c96677e428f840704bfbcaec29e"
|
||||
"url": "https://github.com/symfony/console.git",
|
||||
"reference": "5efd632294c8320ea52492db22292ff853a43766"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Console/zipball/d6cf02fe73634c96677e428f840704bfbcaec29e",
|
||||
"reference": "d6cf02fe73634c96677e428f840704bfbcaec29e",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/5efd632294c8320ea52492db22292ff853a43766",
|
||||
"reference": "5efd632294c8320ea52492db22292ff853a43766",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2248,7 +2249,6 @@
|
|||
"require-dev": {
|
||||
"psr/log": "~1.0",
|
||||
"symfony/event-dispatcher": "~2.1",
|
||||
"symfony/phpunit-bridge": "~2.7",
|
||||
"symfony/process": "~2.1"
|
||||
},
|
||||
"suggest": {
|
||||
|
|
@ -2283,20 +2283,20 @@
|
|||
],
|
||||
"description": "Symfony Console Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2015-07-28 15:18:12"
|
||||
"time": "2015-10-20 14:38:46"
|
||||
},
|
||||
{
|
||||
"name": "symfony/event-dispatcher",
|
||||
"version": "v2.7.3",
|
||||
"version": "v2.7.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/EventDispatcher.git",
|
||||
"reference": "9310b5f9a87ec2ea75d20fec0b0017c77c66dac3"
|
||||
"url": "https://github.com/symfony/event-dispatcher.git",
|
||||
"reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/9310b5f9a87ec2ea75d20fec0b0017c77c66dac3",
|
||||
"reference": "9310b5f9a87ec2ea75d20fec0b0017c77c66dac3",
|
||||
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87a5db5ea887763fa3a31a5471b512ff1596d9b8",
|
||||
"reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2307,7 +2307,6 @@
|
|||
"symfony/config": "~2.0,>=2.0.5",
|
||||
"symfony/dependency-injection": "~2.6",
|
||||
"symfony/expression-language": "~2.6",
|
||||
"symfony/phpunit-bridge": "~2.7",
|
||||
"symfony/stopwatch": "~2.3"
|
||||
},
|
||||
"suggest": {
|
||||
|
|
@ -2341,28 +2340,25 @@
|
|||
],
|
||||
"description": "Symfony EventDispatcher Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2015-06-18 19:21:56"
|
||||
"time": "2015-10-11 09:39:48"
|
||||
},
|
||||
{
|
||||
"name": "symfony/filesystem",
|
||||
"version": "v2.7.3",
|
||||
"version": "v2.7.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Filesystem.git",
|
||||
"reference": "2d7b2ddaf3f548f4292df49a99d19c853d43f0b8"
|
||||
"url": "https://github.com/symfony/filesystem.git",
|
||||
"reference": "56fd6df73be859323ff97418d97edc1d756df6df"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Filesystem/zipball/2d7b2ddaf3f548f4292df49a99d19c853d43f0b8",
|
||||
"reference": "2d7b2ddaf3f548f4292df49a99d19c853d43f0b8",
|
||||
"url": "https://api.github.com/repos/symfony/filesystem/zipball/56fd6df73be859323ff97418d97edc1d756df6df",
|
||||
"reference": "56fd6df73be859323ff97418d97edc1d756df6df",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.9"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/phpunit-bridge": "~2.7"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -2390,28 +2386,25 @@
|
|||
],
|
||||
"description": "Symfony Filesystem Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2015-07-09 16:07:40"
|
||||
"time": "2015-10-18 20:23:18"
|
||||
},
|
||||
{
|
||||
"name": "symfony/finder",
|
||||
"version": "v2.7.3",
|
||||
"version": "v2.7.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Finder.git",
|
||||
"reference": "ae0f363277485094edc04c9f3cbe595b183b78e4"
|
||||
"url": "https://github.com/symfony/finder.git",
|
||||
"reference": "2ffb4e9598db3c48eb6d0ae73b04bbf09280c59d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Finder/zipball/ae0f363277485094edc04c9f3cbe595b183b78e4",
|
||||
"reference": "ae0f363277485094edc04c9f3cbe595b183b78e4",
|
||||
"url": "https://api.github.com/repos/symfony/finder/zipball/2ffb4e9598db3c48eb6d0ae73b04bbf09280c59d",
|
||||
"reference": "2ffb4e9598db3c48eb6d0ae73b04bbf09280c59d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.9"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/phpunit-bridge": "~2.7"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -2439,28 +2432,25 @@
|
|||
],
|
||||
"description": "Symfony Finder Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2015-07-09 16:07:40"
|
||||
"time": "2015-10-11 09:39:48"
|
||||
},
|
||||
{
|
||||
"name": "symfony/process",
|
||||
"version": "v2.7.3",
|
||||
"version": "v2.7.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Process.git",
|
||||
"reference": "48aeb0e48600321c272955132d7606ab0a49adb3"
|
||||
"url": "https://github.com/symfony/process.git",
|
||||
"reference": "4a959dd4e19c2c5d7512689413921e0a74386ec7"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Process/zipball/48aeb0e48600321c272955132d7606ab0a49adb3",
|
||||
"reference": "48aeb0e48600321c272955132d7606ab0a49adb3",
|
||||
"url": "https://api.github.com/repos/symfony/process/zipball/4a959dd4e19c2c5d7512689413921e0a74386ec7",
|
||||
"reference": "4a959dd4e19c2c5d7512689413921e0a74386ec7",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.9"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/phpunit-bridge": "~2.7"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -2488,28 +2478,25 @@
|
|||
],
|
||||
"description": "Symfony Process Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2015-07-01 11:25:50"
|
||||
"time": "2015-10-23 14:47:27"
|
||||
},
|
||||
{
|
||||
"name": "symfony/stopwatch",
|
||||
"version": "v2.7.3",
|
||||
"version": "v2.7.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Stopwatch.git",
|
||||
"reference": "b07a866719bbac5294c67773340f97b871733310"
|
||||
"url": "https://github.com/symfony/stopwatch.git",
|
||||
"reference": "f8ab957c17e4b85a73c4df03bdf94ee597f2bd55"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Stopwatch/zipball/b07a866719bbac5294c67773340f97b871733310",
|
||||
"reference": "b07a866719bbac5294c67773340f97b871733310",
|
||||
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/f8ab957c17e4b85a73c4df03bdf94ee597f2bd55",
|
||||
"reference": "f8ab957c17e4b85a73c4df03bdf94ee597f2bd55",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.9"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/phpunit-bridge": "~2.7"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -2537,20 +2524,20 @@
|
|||
],
|
||||
"description": "Symfony Stopwatch Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2015-07-01 18:23:16"
|
||||
"time": "2015-10-12 12:42:24"
|
||||
},
|
||||
{
|
||||
"name": "symfony/translation",
|
||||
"version": "v2.7.3",
|
||||
"version": "v2.7.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Translation.git",
|
||||
"reference": "c8dc34cc936152c609cdd722af317e4239d10dd6"
|
||||
"url": "https://github.com/symfony/translation.git",
|
||||
"reference": "6ccd9289ec1c71d01a49d83480de3b5293ce30c8"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Translation/zipball/c8dc34cc936152c609cdd722af317e4239d10dd6",
|
||||
"reference": "c8dc34cc936152c609cdd722af317e4239d10dd6",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/6ccd9289ec1c71d01a49d83480de3b5293ce30c8",
|
||||
"reference": "6ccd9289ec1c71d01a49d83480de3b5293ce30c8",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2562,8 +2549,7 @@
|
|||
"require-dev": {
|
||||
"psr/log": "~1.0",
|
||||
"symfony/config": "~2.7",
|
||||
"symfony/intl": "~2.3",
|
||||
"symfony/phpunit-bridge": "~2.7",
|
||||
"symfony/intl": "~2.4",
|
||||
"symfony/yaml": "~2.2"
|
||||
},
|
||||
"suggest": {
|
||||
|
|
@ -2598,20 +2584,20 @@
|
|||
],
|
||||
"description": "Symfony Translation Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2015-07-09 16:07:40"
|
||||
"time": "2015-10-27 15:38:06"
|
||||
},
|
||||
{
|
||||
"name": "symfony/validator",
|
||||
"version": "v2.7.3",
|
||||
"version": "v2.7.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Validator.git",
|
||||
"reference": "646df03e635a8a232804274401449ccdf5f03cad"
|
||||
"url": "https://github.com/symfony/validator.git",
|
||||
"reference": "df9021e689aa3d08367881e7f8917219fabe5e64"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Validator/zipball/646df03e635a8a232804274401449ccdf5f03cad",
|
||||
"reference": "646df03e635a8a232804274401449ccdf5f03cad",
|
||||
"url": "https://api.github.com/repos/symfony/validator/zipball/df9021e689aa3d08367881e7f8917219fabe5e64",
|
||||
"reference": "df9021e689aa3d08367881e7f8917219fabe5e64",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2621,12 +2607,12 @@
|
|||
"require-dev": {
|
||||
"doctrine/annotations": "~1.0",
|
||||
"doctrine/cache": "~1.0",
|
||||
"doctrine/common": "~2.3",
|
||||
"egulias/email-validator": "~1.2,>=1.2.1",
|
||||
"symfony/config": "~2.2",
|
||||
"symfony/expression-language": "~2.4",
|
||||
"symfony/http-foundation": "~2.1",
|
||||
"symfony/intl": "~2.3",
|
||||
"symfony/phpunit-bridge": "~2.7",
|
||||
"symfony/intl": "~2.4",
|
||||
"symfony/property-access": "~2.3",
|
||||
"symfony/yaml": "~2.0,>=2.0.5"
|
||||
},
|
||||
|
|
@ -2668,28 +2654,25 @@
|
|||
],
|
||||
"description": "Symfony Validator Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2015-07-31 06:49:15"
|
||||
"time": "2015-10-18 20:23:18"
|
||||
},
|
||||
{
|
||||
"name": "symfony/yaml",
|
||||
"version": "v2.7.3",
|
||||
"version": "v2.7.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Yaml.git",
|
||||
"reference": "71340e996171474a53f3d29111d046be4ad8a0ff"
|
||||
"url": "https://github.com/symfony/yaml.git",
|
||||
"reference": "eca9019c88fbe250164affd107bc8057771f3f4d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Yaml/zipball/71340e996171474a53f3d29111d046be4ad8a0ff",
|
||||
"reference": "71340e996171474a53f3d29111d046be4ad8a0ff",
|
||||
"url": "https://api.github.com/repos/symfony/yaml/zipball/eca9019c88fbe250164affd107bc8057771f3f4d",
|
||||
"reference": "eca9019c88fbe250164affd107bc8057771f3f4d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.9"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/phpunit-bridge": "~2.7"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -2717,20 +2700,20 @@
|
|||
],
|
||||
"description": "Symfony Yaml Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2015-07-28 14:07:07"
|
||||
"time": "2015-10-11 09:39:48"
|
||||
},
|
||||
{
|
||||
"name": "twig/twig",
|
||||
"version": "v1.21.1",
|
||||
"version": "v1.23.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/twigphp/Twig.git",
|
||||
"reference": "ca8d3aa90b6a01c82e07909fe815d6b443e75a23"
|
||||
"reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/ca8d3aa90b6a01c82e07909fe815d6b443e75a23",
|
||||
"reference": "ca8d3aa90b6a01c82e07909fe815d6b443e75a23",
|
||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6",
|
||||
"reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2743,7 +2726,7 @@
|
|||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.21-dev"
|
||||
"dev-master": "1.23-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
|
|
@ -2778,32 +2761,32 @@
|
|||
"keywords": [
|
||||
"templating"
|
||||
],
|
||||
"time": "2015-08-26 08:58:31"
|
||||
"time": "2015-11-05 12:49:06"
|
||||
},
|
||||
{
|
||||
"name": "zendframework/zend-cache",
|
||||
"version": "2.5.2",
|
||||
"version": "2.5.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zendframework/zend-cache.git",
|
||||
"reference": "325afc68d4381cf8b95288ebb9b1d38dc32ed579"
|
||||
"reference": "7ff9d6b922ae29dbdc53f6a62b471fb6e58565df"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zendframework/zend-cache/zipball/325afc68d4381cf8b95288ebb9b1d38dc32ed579",
|
||||
"reference": "325afc68d4381cf8b95288ebb9b1d38dc32ed579",
|
||||
"url": "https://api.github.com/repos/zendframework/zend-cache/zipball/7ff9d6b922ae29dbdc53f6a62b471fb6e58565df",
|
||||
"reference": "7ff9d6b922ae29dbdc53f6a62b471fb6e58565df",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.5",
|
||||
"zendframework/zend-eventmanager": "~2.5",
|
||||
"zendframework/zend-serializer": "~2.5",
|
||||
"zendframework/zend-servicemanager": "~2.5",
|
||||
"zendframework/zend-stdlib": "~2.5"
|
||||
},
|
||||
"require-dev": {
|
||||
"fabpot/php-cs-fixer": "1.7.*",
|
||||
"phpunit/phpunit": "~4.0",
|
||||
"zendframework/zend-serializer": "~2.5",
|
||||
"zendframework/zend-session": "~2.5"
|
||||
},
|
||||
"suggest": {
|
||||
|
|
@ -2841,7 +2824,7 @@
|
|||
"cache",
|
||||
"zf2"
|
||||
],
|
||||
"time": "2015-07-16 18:44:41"
|
||||
"time": "2015-09-15 16:09:09"
|
||||
},
|
||||
{
|
||||
"name": "zendframework/zend-config",
|
||||
|
|
@ -3003,6 +2986,62 @@
|
|||
],
|
||||
"time": "2015-06-03 15:32:01"
|
||||
},
|
||||
{
|
||||
"name": "zendframework/zend-hydrator",
|
||||
"version": "1.0.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zendframework/zend-hydrator.git",
|
||||
"reference": "f3ed8b833355140350bbed98d8a7b8b66875903f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/f3ed8b833355140350bbed98d8a7b8b66875903f",
|
||||
"reference": "f3ed8b833355140350bbed98d8a7b8b66875903f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.5",
|
||||
"zendframework/zend-stdlib": "^2.5.1"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "~4.0",
|
||||
"squizlabs/php_codesniffer": "^2.0@dev",
|
||||
"zendframework/zend-eventmanager": "^2.5.1",
|
||||
"zendframework/zend-filter": "^2.5.1",
|
||||
"zendframework/zend-inputfilter": "^2.5.1",
|
||||
"zendframework/zend-serializer": "^2.5.1",
|
||||
"zendframework/zend-servicemanager": "^2.5.1"
|
||||
},
|
||||
"suggest": {
|
||||
"zendframework/zend-eventmanager": "^2.5.1, to support aggregate hydrator usage",
|
||||
"zendframework/zend-filter": "^2.5.1, to support naming strategy hydrator usage",
|
||||
"zendframework/zend-serializer": "^2.5.1, to use the SerializableStrategy",
|
||||
"zendframework/zend-servicemanager": "^2.5.1, to support hydrator plugin manager usage"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.0-dev",
|
||||
"dev-develop": "1.1-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Zend\\Hydrator\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"BSD-3-Clause"
|
||||
],
|
||||
"homepage": "https://github.com/zendframework/zend-hydrator",
|
||||
"keywords": [
|
||||
"hydrator",
|
||||
"zf2"
|
||||
],
|
||||
"time": "2015-09-17 14:06:43"
|
||||
},
|
||||
{
|
||||
"name": "zendframework/zend-i18n",
|
||||
"version": "2.5.1",
|
||||
|
|
@ -3277,22 +3316,24 @@
|
|||
},
|
||||
{
|
||||
"name": "zendframework/zend-stdlib",
|
||||
"version": "2.6.0",
|
||||
"version": "2.7.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zendframework/zend-stdlib.git",
|
||||
"reference": "a35758803fc9051ec1aff43989e679b6b451b1b4"
|
||||
"reference": "cae029346a33663b998507f94962eb27de060683"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/a35758803fc9051ec1aff43989e679b6b451b1b4",
|
||||
"reference": "a35758803fc9051ec1aff43989e679b6b451b1b4",
|
||||
"url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cae029346a33663b998507f94962eb27de060683",
|
||||
"reference": "cae029346a33663b998507f94962eb27de060683",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.5"
|
||||
"php": ">=5.5",
|
||||
"zendframework/zend-hydrator": "~1.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"athletic/athletic": "~0.1",
|
||||
"fabpot/php-cs-fixer": "1.7.*",
|
||||
"phpunit/phpunit": "~4.0",
|
||||
"zendframework/zend-config": "~2.5",
|
||||
|
|
@ -3311,8 +3352,8 @@
|
|||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.6-dev",
|
||||
"dev-develop": "2.7-dev"
|
||||
"dev-master": "2.7-dev",
|
||||
"dev-develop": "2.8-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
|
|
@ -3329,7 +3370,7 @@
|
|||
"stdlib",
|
||||
"zf2"
|
||||
],
|
||||
"time": "2015-07-21 17:08:05"
|
||||
"time": "2015-10-15 15:57:32"
|
||||
},
|
||||
{
|
||||
"name": "zetacomponents/base",
|
||||
|
|
@ -3452,7 +3493,7 @@
|
|||
"prefer-stable": false,
|
||||
"prefer-lowest": false,
|
||||
"platform": {
|
||||
"php": ">=5.0.0"
|
||||
"php": ">=5.4.0"
|
||||
},
|
||||
"platform-dev": []
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* revised, updated and corrected 27/02/2013
|
||||
* by matt.sturdy@gmail.com
|
||||
*/
|
||||
require '../PHPMailerAutoload.php';
|
||||
require '../vendor/autoload.php';
|
||||
|
||||
$CFG['smtp_debug'] = 2; //0 == off, 1 for client output, 2 for client and server
|
||||
$CFG['smtp_debugoutput'] = 'html';
|
||||
|
|
@ -356,9 +356,9 @@ $example_code .= "\n}";
|
|||
</head>
|
||||
<body>
|
||||
<?php
|
||||
if (version_compare(PHP_VERSION, '5.0.0', '<')) {
|
||||
if (version_compare(PHP_VERSION, '5.4.0', '<')) {
|
||||
echo 'Current PHP version: ' . phpversion() . "<br>";
|
||||
echo exit("ERROR: Wrong PHP version. Must be PHP 5 or above.");
|
||||
echo exit("ERROR: Wrong PHP version. Must be PHP 5.4 or later.");
|
||||
}
|
||||
|
||||
if (count($results_messages) > 0) {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,9 @@
|
|||
/**
|
||||
* This example shows how to make use of PHPMailer's exceptions for error handling.
|
||||
*/
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
require '../PHPMailerAutoload.php';
|
||||
require '../vendor/autoload.php';
|
||||
|
||||
//Create a new PHPMailer instance
|
||||
//Passing true to the constructor enables the use of exceptions for error handling
|
||||
|
|
|
|||
|
|
@ -2,12 +2,13 @@
|
|||
/**
|
||||
* This example shows settings to use when sending via Google's Gmail servers.
|
||||
*/
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
//SMTP needs accurate times, and the PHP time zone MUST be set
|
||||
//This should be done in your php.ini, but this is how to do it if you don't have access to that
|
||||
date_default_timezone_set('Etc/UTC');
|
||||
|
||||
require '../PHPMailerAutoload.php';
|
||||
require '../vendor/autoload.php';
|
||||
|
||||
//Create a new PHPMailer instance
|
||||
$mail = new PHPMailer;
|
||||
|
|
|
|||
|
|
@ -2,12 +2,13 @@
|
|||
/**
|
||||
* This example shows settings to use when sending via Google's Gmail servers.
|
||||
*/
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
//SMTP needs accurate times, and the PHP time zone MUST be set
|
||||
//This should be done in your php.ini, but this is how to do it if you don't have access to that
|
||||
date_default_timezone_set('Etc/UTC');
|
||||
|
||||
require '../PHPMailerAutoload.php';
|
||||
require '../vendor/autoload.php';
|
||||
|
||||
//Load dependencies from composer
|
||||
//If this causes an error, run 'composer install'
|
||||
|
|
|
|||
|
|
@ -2,8 +2,9 @@
|
|||
/**
|
||||
* This example shows sending a message using PHP's mail() function.
|
||||
*/
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
require '../PHPMailerAutoload.php';
|
||||
require '../vendor/autoload.php';
|
||||
|
||||
//Create a new PHPMailer instance
|
||||
$mail = new PHPMailer;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
<?php
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
error_reporting(E_STRICT | E_ALL);
|
||||
|
||||
date_default_timezone_set('Etc/UTC');
|
||||
|
||||
require '../PHPMailerAutoload.php';
|
||||
require '../vendor/autoload.php';
|
||||
|
||||
$mail = new PHPMailer;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,9 @@
|
|||
/**
|
||||
* This example shows how to use POP-before-SMTP for authentication.
|
||||
*/
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
require '../PHPMailerAutoload.php';
|
||||
require '../vendor/autoload.php';
|
||||
|
||||
//Authenticate via POP3.
|
||||
//After this you should be allowed to submit messages over SMTP for a while.
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
/**
|
||||
* PHPMailer simple file upload and send example
|
||||
*/
|
||||
namespace PHPMailer\PHPMailer;
|
||||
$msg = '';
|
||||
if (array_key_exists('userfile', $_FILES)) {
|
||||
// First handle the upload
|
||||
|
|
@ -12,7 +13,7 @@ if (array_key_exists('userfile', $_FILES)) {
|
|||
// Upload handled successfully
|
||||
// Now create a message
|
||||
// This should be somewhere in your include_path
|
||||
require 'PHPMailerAutoload.php';
|
||||
require '../vendor/autoload.php';
|
||||
$mail = new PHPMailer;
|
||||
$mail->setFrom('from@example.com', 'First Last');
|
||||
$mail->addAddress('whoto@example.com', 'John Doe');
|
||||
|
|
|
|||
|
|
@ -2,8 +2,9 @@
|
|||
/**
|
||||
* This example shows sending a message using a local sendmail binary.
|
||||
*/
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
require '../PHPMailerAutoload.php';
|
||||
require '../vendor/autoload.php';
|
||||
|
||||
//Create a new PHPMailer instance
|
||||
$mail = new PHPMailer;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<?php
|
||||
namespace PHPMailer\PHPMailer;
|
||||
/**
|
||||
* This example shows signing a message and then sending it via the mail() function of PHP.
|
||||
*
|
||||
|
|
@ -44,7 +45,7 @@
|
|||
* STEP 3 - Code
|
||||
*/
|
||||
|
||||
require '../PHPMailerAutoload.php';
|
||||
require '../vendor/autoload.php';
|
||||
|
||||
//Create a new PHPMailer instance
|
||||
$mail = new PHPMailer();
|
||||
|
|
|
|||
|
|
@ -2,12 +2,13 @@
|
|||
/**
|
||||
* This example shows making an SMTP connection with authentication.
|
||||
*/
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
//SMTP needs accurate times, and the PHP time zone MUST be set
|
||||
//This should be done in your php.ini, but this is how to do it if you don't have access to that
|
||||
date_default_timezone_set('Etc/UTC');
|
||||
|
||||
require '../PHPMailerAutoload.php';
|
||||
require '../vendor/autoload.php';
|
||||
|
||||
//Create a new PHPMailer instance
|
||||
$mail = new PHPMailer;
|
||||
|
|
|
|||
|
|
@ -3,12 +3,13 @@
|
|||
* This uses the SMTP class alone to check that a connection can be made to an SMTP server,
|
||||
* authenticate, then disconnect
|
||||
*/
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
//SMTP needs accurate times, and the PHP time zone MUST be set
|
||||
//This should be done in your php.ini, but this is how to do it if you don't have access to that
|
||||
date_default_timezone_set('Etc/UTC');
|
||||
|
||||
require '../PHPMailerAutoload.php';
|
||||
require '../vendor/autoload.php';
|
||||
|
||||
//Create a new SMTP instance
|
||||
$smtp = new SMTP;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
/**
|
||||
* This example shows making an SMTP connection without using authentication.
|
||||
*/
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
//SMTP needs accurate times, and the PHP time zone MUST be set
|
||||
//This should be done in your php.ini, but this is how to do it if you don't have access to that
|
||||
|
|
|
|||
|
|
@ -2,12 +2,13 @@
|
|||
/**
|
||||
* This example shows settings to use when sending over SMTP with TLS and custom connection options.
|
||||
*/
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
//SMTP needs accurate times, and the PHP time zone MUST be set
|
||||
//This should be done in your php.ini, but this is how to do it if you don't have access to that
|
||||
date_default_timezone_set('Etc/UTC');
|
||||
|
||||
require '../PHPMailerAutoload.php';
|
||||
require '../vendor/autoload.php';
|
||||
|
||||
//Create a new PHPMailer instance
|
||||
$mail = new PHPMailer;
|
||||
|
|
|
|||
|
|
@ -1,148 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* EasyPeasyICS Simple ICS/vCal data generator.
|
||||
* @author Marcus Bointon <phpmailer@synchromedia.co.uk>
|
||||
* @author Manuel Reinhard <manu@sprain.ch>
|
||||
*
|
||||
* Built with inspiration from
|
||||
* http://stackoverflow.com/questions/1463480/how-can-i-use-php-to-dynamically-publish-an-ical-file-to-be-read-by-google-calend/1464355#1464355
|
||||
* History:
|
||||
* 2010/12/17 - Manuel Reinhard - when it all started
|
||||
* 2014 PHPMailer project becomes maintainer
|
||||
*/
|
||||
|
||||
/**
|
||||
* Class EasyPeasyICS.
|
||||
* Simple ICS data generator
|
||||
* @package phpmailer
|
||||
* @subpackage easypeasyics
|
||||
*/
|
||||
class EasyPeasyICS
|
||||
{
|
||||
/**
|
||||
* The name of the calendar
|
||||
* @var string
|
||||
*/
|
||||
protected $calendarName;
|
||||
/**
|
||||
* The array of events to add to this calendar
|
||||
* @var array
|
||||
*/
|
||||
protected $events = array();
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
* @param string $calendarName
|
||||
*/
|
||||
public function __construct($calendarName = "")
|
||||
{
|
||||
$this->calendarName = $calendarName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add an event to this calendar.
|
||||
* @param string $start The start date and time as a unix timestamp
|
||||
* @param string $end The end date and time as a unix timestamp
|
||||
* @param string $summary A summary or title for the event
|
||||
* @param string $description A description of the event
|
||||
* @param string $url A URL for the event
|
||||
* @param string $uid A unique identifier for the event - generated automatically if not provided
|
||||
* @return array An array of event details, including any generated UID
|
||||
*/
|
||||
public function addEvent($start, $end, $summary = '', $description = '', $url = '', $uid = '')
|
||||
{
|
||||
if (empty($uid)) {
|
||||
$uid = md5(uniqid(mt_rand(), true)) . '@EasyPeasyICS';
|
||||
}
|
||||
$event = array(
|
||||
'start' => gmdate('Ymd', $start) . 'T' . gmdate('His', $start) . 'Z',
|
||||
'end' => gmdate('Ymd', $end) . 'T' . gmdate('His', $end) . 'Z',
|
||||
'summary' => $summary,
|
||||
'description' => $description,
|
||||
'url' => $url,
|
||||
'uid' => $uid
|
||||
);
|
||||
$this->events[] = $event;
|
||||
return $event;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array Get the array of events.
|
||||
*/
|
||||
public function getEvents()
|
||||
{
|
||||
return $this->events;
|
||||
}
|
||||
|
||||
/**
|
||||
* Clear all events.
|
||||
*/
|
||||
public function clearEvents()
|
||||
{
|
||||
$this->events = array();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the name of the calendar.
|
||||
* @return string
|
||||
*/
|
||||
public function getName()
|
||||
{
|
||||
return $this->calendarName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the name of the calendar.
|
||||
* @param $name
|
||||
*/
|
||||
public function setName($name)
|
||||
{
|
||||
$this->calendarName = $name;
|
||||
}
|
||||
|
||||
/**
|
||||
* Render and optionally output a vcal string.
|
||||
* @param bool $output Whether to output the calendar data directly (the default).
|
||||
* @return string The complete rendered vlal
|
||||
*/
|
||||
public function render($output = true)
|
||||
{
|
||||
//Add header
|
||||
$ics = 'BEGIN:VCALENDAR
|
||||
METHOD:PUBLISH
|
||||
VERSION:2.0
|
||||
X-WR-CALNAME:' . $this->calendarName . '
|
||||
PRODID:-//hacksw/handcal//NONSGML v1.0//EN';
|
||||
|
||||
//Add events
|
||||
foreach ($this->events as $event) {
|
||||
$ics .= '
|
||||
BEGIN:VEVENT
|
||||
UID:' . $event['uid'] . '
|
||||
DTSTAMP:' . gmdate('Ymd') . 'T' . gmdate('His') . 'Z
|
||||
DTSTART:' . $event['start'] . '
|
||||
DTEND:' . $event['end'] . '
|
||||
SUMMARY:' . str_replace("\n", "\\n", $event['summary']) . '
|
||||
DESCRIPTION:' . str_replace("\n", "\\n", $event['description']) . '
|
||||
URL;VALUE=URI:' . $event['url'] . '
|
||||
END:VEVENT';
|
||||
}
|
||||
|
||||
//Add footer
|
||||
$ics .= '
|
||||
END:VCALENDAR';
|
||||
|
||||
if ($output) {
|
||||
//Output
|
||||
$filename = $this->calendarName;
|
||||
//Filename needs quoting if it contains spaces
|
||||
if (strpos($filename, ' ') !== false) {
|
||||
$filename = '"'.$filename.'"';
|
||||
}
|
||||
header('Content-type: text/calendar; charset=utf-8');
|
||||
header('Content-Disposition: inline; filename=' . $filename . '.ics');
|
||||
echo $ics;
|
||||
}
|
||||
return $ics;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
#PHPMailer Extras
|
||||
|
||||
These classes provide optional additional functions to PHPMailer.
|
||||
|
||||
These are not loaded by the PHPMailer autoloader, so in some cases you may need to `require` them yourself before using them.
|
||||
|
||||
##EasyPeasyICS
|
||||
|
||||
This class was originally written by Manuel Reinhard and provides a simple means of generating ICS/vCal files that are used in sending calendar events. PHPMailer does not use it directly, but you can use it to generate content appropriate for placing in the `Ical` property of PHPMailer. The PHPMailer project is now its official home as Manuel has given permission for that and is no longer maintaining it himself.
|
||||
|
||||
##htmlfilter
|
||||
|
||||
This class by Konstantin Riabitsev and Jim Jagielski implements HTML filtering to remove potentially malicious tags, such as `<script>` or `onclick=` attributes that can result in XSS attacks. This is a simple filter and is not as comprehensive as [HTMLawed](http://www.bioinformatics.org/phplabware/internal_utilities/htmLawed/) or [HTMLPurifier](http://htmlpurifier.org), but it's easier to use and considerably better than nothing! PHPMailer does not use it directly, but you may want to apply it to user-supplied HTML before using it as a message body.
|
||||
|
||||
##NTLM_SASL_client
|
||||
|
||||
This class by Manuel Lemos (bundled with permission) adds the ability to authenticate with Microsoft Windows mail servers that use NTLM-based authentication. It is used by PHPMailer if you send via SMTP and set the `AuthType` property to `NTLM`; you will also need to use the `Realm` and `Workstation` properties. The original source is [here](http://www.phpclasses.org/browse/file/7495.html).
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,185 +0,0 @@
|
|||
<?php
|
||||
/*
|
||||
* ntlm_sasl_client.php
|
||||
*
|
||||
* @(#) $Id: ntlm_sasl_client.php,v 1.3 2004/11/17 08:00:37 mlemos Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
define("SASL_NTLM_STATE_START", 0);
|
||||
define("SASL_NTLM_STATE_IDENTIFY_DOMAIN", 1);
|
||||
define("SASL_NTLM_STATE_RESPOND_CHALLENGE", 2);
|
||||
define("SASL_NTLM_STATE_DONE", 3);
|
||||
define("SASL_FAIL", -1);
|
||||
define("SASL_CONTINUE", 1);
|
||||
|
||||
class ntlm_sasl_client_class
|
||||
{
|
||||
public $credentials = array();
|
||||
public $state = SASL_NTLM_STATE_START;
|
||||
|
||||
public function initialize(&$client)
|
||||
{
|
||||
if (!function_exists($function = "mcrypt_encrypt")
|
||||
|| !function_exists($function = "mhash")
|
||||
) {
|
||||
$extensions = array(
|
||||
"mcrypt_encrypt" => "mcrypt",
|
||||
"mhash" => "mhash"
|
||||
);
|
||||
$client->error = "the extension " . $extensions[$function] .
|
||||
" required by the NTLM SASL client class is not available in this PHP configuration";
|
||||
return (0);
|
||||
}
|
||||
return (1);
|
||||
}
|
||||
|
||||
public function ASCIIToUnicode($ascii)
|
||||
{
|
||||
for ($unicode = "", $a = 0; $a < strlen($ascii); $a++) {
|
||||
$unicode .= substr($ascii, $a, 1) . chr(0);
|
||||
}
|
||||
return ($unicode);
|
||||
}
|
||||
|
||||
public function typeMsg1($domain, $workstation)
|
||||
{
|
||||
$domain_length = strlen($domain);
|
||||
$workstation_length = strlen($workstation);
|
||||
$workstation_offset = 32;
|
||||
$domain_offset = $workstation_offset + $workstation_length;
|
||||
return (
|
||||
"NTLMSSP\0" .
|
||||
"\x01\x00\x00\x00" .
|
||||
"\x07\x32\x00\x00" .
|
||||
pack("v", $domain_length) .
|
||||
pack("v", $domain_length) .
|
||||
pack("V", $domain_offset) .
|
||||
pack("v", $workstation_length) .
|
||||
pack("v", $workstation_length) .
|
||||
pack("V", $workstation_offset) .
|
||||
$workstation .
|
||||
$domain
|
||||
);
|
||||
}
|
||||
|
||||
public function NTLMResponse($challenge, $password)
|
||||
{
|
||||
$unicode = $this->ASCIIToUnicode($password);
|
||||
$md4 = mhash(MHASH_MD4, $unicode);
|
||||
$padded = $md4 . str_repeat(chr(0), 21 - strlen($md4));
|
||||
$iv_size = mcrypt_get_iv_size(MCRYPT_DES, MCRYPT_MODE_ECB);
|
||||
$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
|
||||
for ($response = "", $third = 0; $third < 21; $third += 7) {
|
||||
for ($packed = "", $p = $third; $p < $third + 7; $p++) {
|
||||
$packed .= str_pad(decbin(ord(substr($padded, $p, 1))), 8, "0", STR_PAD_LEFT);
|
||||
}
|
||||
for ($key = "", $p = 0; $p < strlen($packed); $p += 7) {
|
||||
$s = substr($packed, $p, 7);
|
||||
$b = $s . ((substr_count($s, "1") % 2) ? "0" : "1");
|
||||
$key .= chr(bindec($b));
|
||||
}
|
||||
$ciphertext = mcrypt_encrypt(MCRYPT_DES, $key, $challenge, MCRYPT_MODE_ECB, $iv);
|
||||
$response .= $ciphertext;
|
||||
}
|
||||
return $response;
|
||||
}
|
||||
|
||||
public function typeMsg3($ntlm_response, $user, $domain, $workstation)
|
||||
{
|
||||
$domain_unicode = $this->ASCIIToUnicode($domain);
|
||||
$domain_length = strlen($domain_unicode);
|
||||
$domain_offset = 64;
|
||||
$user_unicode = $this->ASCIIToUnicode($user);
|
||||
$user_length = strlen($user_unicode);
|
||||
$user_offset = $domain_offset + $domain_length;
|
||||
$workstation_unicode = $this->ASCIIToUnicode($workstation);
|
||||
$workstation_length = strlen($workstation_unicode);
|
||||
$workstation_offset = $user_offset + $user_length;
|
||||
$lm = "";
|
||||
$lm_length = strlen($lm);
|
||||
$lm_offset = $workstation_offset + $workstation_length;
|
||||
$ntlm = $ntlm_response;
|
||||
$ntlm_length = strlen($ntlm);
|
||||
$ntlm_offset = $lm_offset + $lm_length;
|
||||
$session = "";
|
||||
$session_length = strlen($session);
|
||||
$session_offset = $ntlm_offset + $ntlm_length;
|
||||
return (
|
||||
"NTLMSSP\0" .
|
||||
"\x03\x00\x00\x00" .
|
||||
pack("v", $lm_length) .
|
||||
pack("v", $lm_length) .
|
||||
pack("V", $lm_offset) .
|
||||
pack("v", $ntlm_length) .
|
||||
pack("v", $ntlm_length) .
|
||||
pack("V", $ntlm_offset) .
|
||||
pack("v", $domain_length) .
|
||||
pack("v", $domain_length) .
|
||||
pack("V", $domain_offset) .
|
||||
pack("v", $user_length) .
|
||||
pack("v", $user_length) .
|
||||
pack("V", $user_offset) .
|
||||
pack("v", $workstation_length) .
|
||||
pack("v", $workstation_length) .
|
||||
pack("V", $workstation_offset) .
|
||||
pack("v", $session_length) .
|
||||
pack("v", $session_length) .
|
||||
pack("V", $session_offset) .
|
||||
"\x01\x02\x00\x00" .
|
||||
$domain_unicode .
|
||||
$user_unicode .
|
||||
$workstation_unicode .
|
||||
$lm .
|
||||
$ntlm
|
||||
);
|
||||
}
|
||||
|
||||
public function start(&$client, &$message, &$interactions)
|
||||
{
|
||||
if ($this->state != SASL_NTLM_STATE_START) {
|
||||
$client->error = "NTLM authentication state is not at the start";
|
||||
return (SASL_FAIL);
|
||||
}
|
||||
$this->credentials = array(
|
||||
"user" => "",
|
||||
"password" => "",
|
||||
"realm" => "",
|
||||
"workstation" => ""
|
||||
);
|
||||
$defaults = array();
|
||||
$status = $client->GetCredentials($this->credentials, $defaults, $interactions);
|
||||
if ($status == SASL_CONTINUE) {
|
||||
$this->state = SASL_NTLM_STATE_IDENTIFY_DOMAIN;
|
||||
}
|
||||
unset($message);
|
||||
return ($status);
|
||||
}
|
||||
|
||||
public function step(&$client, $response, &$message, &$interactions)
|
||||
{
|
||||
switch ($this->state) {
|
||||
case SASL_NTLM_STATE_IDENTIFY_DOMAIN:
|
||||
$message = $this->TypeMsg1($this->credentials["realm"], $this->credentials["workstation"]);
|
||||
$this->state = SASL_NTLM_STATE_RESPOND_CHALLENGE;
|
||||
break;
|
||||
case SASL_NTLM_STATE_RESPOND_CHALLENGE:
|
||||
$ntlm_response = $this->NTLMResponse(substr($response, 24, 8), $this->credentials["password"]);
|
||||
$message = $this->TypeMsg3(
|
||||
$ntlm_response,
|
||||
$this->credentials["user"],
|
||||
$this->credentials["realm"],
|
||||
$this->credentials["workstation"]
|
||||
);
|
||||
$this->state = SASL_NTLM_STATE_DONE;
|
||||
break;
|
||||
case SASL_NTLM_STATE_DONE:
|
||||
$client->error = "NTLM authentication was finished without success";
|
||||
return (SASL_FAIL);
|
||||
default:
|
||||
$client->error = "invalid NTLM authentication step state";
|
||||
return (SASL_FAIL);
|
||||
}
|
||||
return (SASL_CONTINUE);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/**
|
||||
* Dutch PHPMailer language file: refer to class.phpmailer.php for definitive list.
|
||||
* Dutch PHPMailer language file: refer to PHPMailer.php for definitive list.
|
||||
* @package PHPMailer
|
||||
* @author Tuxion <team@tuxion.nl>
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
<?php
|
||||
/**
|
||||
* Created by PhpStorm.
|
||||
* User: marcus
|
||||
* Date: 09/11/2015
|
||||
* Time: 17:10
|
||||
*/
|
||||
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
/**
|
||||
* PHPMailer exception handler
|
||||
* @package PHPMailer
|
||||
*/
|
||||
class Exception extends \Exception
|
||||
{
|
||||
/**
|
||||
* Prettify error message output
|
||||
* @return string
|
||||
*/
|
||||
public function errorMessage()
|
||||
{
|
||||
$errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
|
||||
return $errorMsg;
|
||||
}
|
||||
}
|
||||
|
|
@ -17,14 +17,16 @@
|
|||
* FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*/
|
||||
|
||||
namespace PHPMailer\PHPMailer\OAuthProvider;
|
||||
|
||||
/**
|
||||
* PHPMailerOAuthGoogle - Wrapper for League OAuth2 Google provider.
|
||||
* PHPMailer Google OAuth class- Wrapper for League OAuth2 Google provider.
|
||||
* @package PHPMailer
|
||||
* @author @sherryl4george
|
||||
* @author Marcus Bointon (@Synchro) <phpmailer@synchromedia.co.uk>
|
||||
* @link https://github.com/thephpleague/oauth2-client
|
||||
*/
|
||||
class PHPMailerOAuthGoogle
|
||||
class Google
|
||||
{
|
||||
private $oauthUserEmail = '';
|
||||
private $oauthRefreshToken = '';
|
||||
|
|
@ -49,7 +51,8 @@ class PHPMailerOAuthGoogle
|
|||
$this->oauthUserEmail = $UserEmail;
|
||||
}
|
||||
|
||||
private function getProvider() {
|
||||
private function getProvider()
|
||||
{
|
||||
return new League\OAuth2\Client\Provider\Google([
|
||||
'clientId' => $this->oauthClientId,
|
||||
'clientSecret' => $this->oauthClientSecret
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/**
|
||||
* PHPMailer - PHP email creation and transport class.
|
||||
* PHP Version 5
|
||||
* PHP Version 5.4
|
||||
* @package PHPMailer
|
||||
* @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
|
||||
* @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
|
||||
|
|
@ -17,6 +17,8 @@
|
|||
* FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*/
|
||||
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
/**
|
||||
* PHPMailer - PHP email creation and transport class.
|
||||
* @package PHPMailer
|
||||
|
|
@ -30,8 +32,9 @@ class PHPMailer
|
|||
/**
|
||||
* The PHPMailer Version number.
|
||||
* @var string
|
||||
* @deprecated Use the VERSION class constant instead
|
||||
*/
|
||||
public $Version = '5.2.14';
|
||||
public $Version = '5.4.0';
|
||||
|
||||
/**
|
||||
* Email priority.
|
||||
|
|
@ -85,16 +88,6 @@ class PHPMailer
|
|||
*/
|
||||
public $Sender = '';
|
||||
|
||||
/**
|
||||
* The Return-Path of the message.
|
||||
* If empty, it will be set to either From or Sender.
|
||||
* @var string
|
||||
* @deprecated Email senders should never set a return-path header;
|
||||
* it's the receiver's job (RFC5321 section 4.4), so this no longer does anything.
|
||||
* @link https://tools.ietf.org/html/rfc5321#section-4.4 RFC5321 reference
|
||||
*/
|
||||
public $ReturnPath = '';
|
||||
|
||||
/**
|
||||
* The Subject of the message.
|
||||
* @var string
|
||||
|
|
@ -175,14 +168,6 @@ class PHPMailer
|
|||
*/
|
||||
public $UseSendmailOptions = true;
|
||||
|
||||
/**
|
||||
* Path to PHPMailer plugins.
|
||||
* Useful if the SMTP class is not in the PHP include path.
|
||||
* @var string
|
||||
* @deprecated Should not be needed now there is an autoloader.
|
||||
*/
|
||||
public $PluginDir = '';
|
||||
|
||||
/**
|
||||
* The email address that a reading confirmation should be sent to, also known as read receipt.
|
||||
* @var string
|
||||
|
|
@ -604,6 +589,11 @@ class PHPMailer
|
|||
*/
|
||||
protected $uniqueid = '';
|
||||
|
||||
/**
|
||||
* The PHPMailer Version number.
|
||||
*/
|
||||
const VERSION = '5.4.0';
|
||||
|
||||
/**
|
||||
* Error severity: message only, continue processing.
|
||||
*/
|
||||
|
|
@ -840,7 +830,7 @@ class PHPMailer
|
|||
* @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo'
|
||||
* @param string $address The email address to send, resp. to reply to
|
||||
* @param string $name
|
||||
* @throws phpmailerException
|
||||
* @throws Exception
|
||||
* @return boolean true on success, false if address already used or invalid in some way
|
||||
* @access protected
|
||||
*/
|
||||
|
|
@ -854,7 +844,7 @@ class PHPMailer
|
|||
$this->setError($error_message);
|
||||
$this->edebug($error_message);
|
||||
if ($this->exceptions) {
|
||||
throw new phpmailerException($error_message);
|
||||
throw new Exception($error_message);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
@ -884,7 +874,7 @@ class PHPMailer
|
|||
* @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo'
|
||||
* @param string $address The email address to send, resp. to reply to
|
||||
* @param string $name
|
||||
* @throws phpmailerException
|
||||
* @throws Exception
|
||||
* @return boolean true on success, false if address already used or invalid in some way
|
||||
* @access protected
|
||||
*/
|
||||
|
|
@ -895,7 +885,7 @@ class PHPMailer
|
|||
$this->setError($error_message);
|
||||
$this->edebug($error_message);
|
||||
if ($this->exceptions) {
|
||||
throw new phpmailerException($error_message);
|
||||
throw new Exception($error_message);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
@ -904,7 +894,7 @@ class PHPMailer
|
|||
$this->setError($error_message);
|
||||
$this->edebug($error_message);
|
||||
if ($this->exceptions) {
|
||||
throw new phpmailerException($error_message);
|
||||
throw new Exception($error_message);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
@ -983,7 +973,7 @@ class PHPMailer
|
|||
* @param string $address
|
||||
* @param string $name
|
||||
* @param boolean $auto Whether to also set the Sender address, defaults to true
|
||||
* @throws phpmailerException
|
||||
* @throws Exception
|
||||
* @return boolean
|
||||
*/
|
||||
public function setFrom($address, $name = '', $auto = true)
|
||||
|
|
@ -998,7 +988,7 @@ class PHPMailer
|
|||
$this->setError($error_message);
|
||||
$this->edebug($error_message);
|
||||
if ($this->exceptions) {
|
||||
throw new phpmailerException($error_message);
|
||||
throw new Exception($error_message);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
@ -1029,7 +1019,7 @@ class PHPMailer
|
|||
* @param string $address The email address to check
|
||||
* @param string $patternselect A selector for the validation pattern to use :
|
||||
* * `auto` Pick best pattern automatically;
|
||||
* * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14;
|
||||
* * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0;
|
||||
* * `pcre` Use old PCRE implementation;
|
||||
* * `php` Use PHP built-in FILTER_VALIDATE_EMAIL;
|
||||
* * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements.
|
||||
|
|
@ -1046,7 +1036,6 @@ class PHPMailer
|
|||
}
|
||||
if (!$patternselect or $patternselect == 'auto') {
|
||||
//Check this constant first so it works when extension_loaded() is disabled by safe mode
|
||||
//Constant was added in PHP 5.2.4
|
||||
if (defined('PCRE_VERSION')) {
|
||||
//This pattern can get stuck in a recursive loop in PCRE <= 8.0.2
|
||||
if (version_compare(PCRE_VERSION, '8.0.3') >= 0) {
|
||||
|
|
@ -1058,12 +1047,7 @@ class PHPMailer
|
|||
//Fall back to older PCRE
|
||||
$patternselect = 'pcre';
|
||||
} else {
|
||||
//Filter_var appeared in PHP 5.2.0 and does not require the PCRE extension
|
||||
if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
|
||||
$patternselect = 'php';
|
||||
} else {
|
||||
$patternselect = 'noregex';
|
||||
}
|
||||
$patternselect = 'php';
|
||||
}
|
||||
}
|
||||
switch ($patternselect) {
|
||||
|
|
@ -1130,7 +1114,6 @@ class PHPMailer
|
|||
*/
|
||||
public function idnSupported()
|
||||
{
|
||||
// @TODO: Write our own "idn_to_ascii" function for PHP <= 5.2.
|
||||
return function_exists('idn_to_ascii') and function_exists('mb_convert_encoding');
|
||||
}
|
||||
|
||||
|
|
@ -1168,7 +1151,7 @@ class PHPMailer
|
|||
/**
|
||||
* Create a message and send it.
|
||||
* Uses the sending method specified by $Mailer.
|
||||
* @throws phpmailerException
|
||||
* @throws Exception
|
||||
* @return boolean false on error - See the ErrorInfo property for details of the error.
|
||||
*/
|
||||
public function send()
|
||||
|
|
@ -1178,7 +1161,7 @@ class PHPMailer
|
|||
return false;
|
||||
}
|
||||
return $this->postSend();
|
||||
} catch (phpmailerException $exc) {
|
||||
} catch (Exception $exc) {
|
||||
$this->mailHeader = '';
|
||||
$this->setError($exc->getMessage());
|
||||
if ($this->exceptions) {
|
||||
|
|
@ -1190,7 +1173,7 @@ class PHPMailer
|
|||
|
||||
/**
|
||||
* Prepare a message for sending.
|
||||
* @throws phpmailerException
|
||||
* @throws Exception
|
||||
* @return boolean
|
||||
*/
|
||||
public function preSend()
|
||||
|
|
@ -1205,7 +1188,7 @@ class PHPMailer
|
|||
call_user_func_array(array($this, 'addAnAddress'), $params);
|
||||
}
|
||||
if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
|
||||
throw new phpmailerException($this->lang('provide_address'), self::STOP_CRITICAL);
|
||||
throw new Exception($this->lang('provide_address'), self::STOP_CRITICAL);
|
||||
}
|
||||
|
||||
// Validate From, Sender, and ConfirmReadingTo addresses
|
||||
|
|
@ -1220,7 +1203,7 @@ class PHPMailer
|
|||
$this->setError($error_message);
|
||||
$this->edebug($error_message);
|
||||
if ($this->exceptions) {
|
||||
throw new phpmailerException($error_message);
|
||||
throw new Exception($error_message);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
@ -1234,7 +1217,7 @@ class PHPMailer
|
|||
$this->setMessageType();
|
||||
// Refuse to send an empty message unless we are specifically allowing it
|
||||
if (!$this->AllowEmpty and empty($this->Body)) {
|
||||
throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL);
|
||||
throw new Exception($this->lang('empty_message'), self::STOP_CRITICAL);
|
||||
}
|
||||
|
||||
// Create body before headers in case body makes changes to headers (e.g. altering transfer encoding)
|
||||
|
|
@ -1273,7 +1256,7 @@ class PHPMailer
|
|||
str_replace("\r\n", "\n", $header_dkim) . self::CRLF;
|
||||
}
|
||||
return true;
|
||||
} catch (phpmailerException $exc) {
|
||||
} catch (Exception $exc) {
|
||||
$this->setError($exc->getMessage());
|
||||
if ($this->exceptions) {
|
||||
throw $exc;
|
||||
|
|
@ -1285,7 +1268,7 @@ class PHPMailer
|
|||
/**
|
||||
* Actually send a message.
|
||||
* Send the email via the selected mechanism
|
||||
* @throws phpmailerException
|
||||
* @throws Exception
|
||||
* @return boolean
|
||||
*/
|
||||
public function postSend()
|
||||
|
|
@ -1308,7 +1291,7 @@ class PHPMailer
|
|||
|
||||
return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
|
||||
}
|
||||
} catch (phpmailerException $exc) {
|
||||
} catch (Exception $exc) {
|
||||
$this->setError($exc->getMessage());
|
||||
$this->edebug($exc->getMessage());
|
||||
if ($this->exceptions) {
|
||||
|
|
@ -1323,7 +1306,7 @@ class PHPMailer
|
|||
* @param string $header The message headers
|
||||
* @param string $body The message body
|
||||
* @see PHPMailer::$Sendmail
|
||||
* @throws phpmailerException
|
||||
* @throws Exception
|
||||
* @access protected
|
||||
* @return boolean
|
||||
*/
|
||||
|
|
@ -1345,7 +1328,7 @@ class PHPMailer
|
|||
if ($this->SingleTo) {
|
||||
foreach ($this->SingleToArray as $toAddr) {
|
||||
if (!@$mail = popen($sendmail, 'w')) {
|
||||
throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
|
||||
throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
|
||||
}
|
||||
fputs($mail, 'To: ' . $toAddr . "\n");
|
||||
fputs($mail, $header);
|
||||
|
|
@ -1361,12 +1344,12 @@ class PHPMailer
|
|||
$this->From
|
||||
);
|
||||
if ($result != 0) {
|
||||
throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
|
||||
throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (!@$mail = popen($sendmail, 'w')) {
|
||||
throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
|
||||
throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
|
||||
}
|
||||
fputs($mail, $header);
|
||||
fputs($mail, $body);
|
||||
|
|
@ -1381,7 +1364,7 @@ class PHPMailer
|
|||
$this->From
|
||||
);
|
||||
if ($result != 0) {
|
||||
throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
|
||||
throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
|
|
@ -1392,7 +1375,7 @@ class PHPMailer
|
|||
* @param string $header The message headers
|
||||
* @param string $body The message body
|
||||
* @link http://www.php.net/manual/en/book.mail.php
|
||||
* @throws phpmailerException
|
||||
* @throws Exception
|
||||
* @access protected
|
||||
* @return boolean
|
||||
*/
|
||||
|
|
@ -1427,7 +1410,7 @@ class PHPMailer
|
|||
ini_set('sendmail_from', $old_from);
|
||||
}
|
||||
if (!$result) {
|
||||
throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL);
|
||||
throw new Exception($this->lang('instantiate'), self::STOP_CRITICAL);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
@ -1452,7 +1435,7 @@ class PHPMailer
|
|||
* @see PHPMailer::getSMTPInstance() to use a different class.
|
||||
* @param string $header The message headers
|
||||
* @param string $body The message body
|
||||
* @throws phpmailerException
|
||||
* @throws Exception
|
||||
* @uses SMTP
|
||||
* @access protected
|
||||
* @return boolean
|
||||
|
|
@ -1461,7 +1444,7 @@ class PHPMailer
|
|||
{
|
||||
$bad_rcpt = array();
|
||||
if (!$this->smtpConnect($this->SMTPOptions)) {
|
||||
throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
|
||||
throw new Exception($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
|
||||
}
|
||||
if ('' == $this->Sender) {
|
||||
$smtp_from = $this->From;
|
||||
|
|
@ -1470,7 +1453,7 @@ class PHPMailer
|
|||
}
|
||||
if (!$this->smtp->mail($smtp_from)) {
|
||||
$this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
|
||||
throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL);
|
||||
throw new Exception($this->ErrorInfo, self::STOP_CRITICAL);
|
||||
}
|
||||
|
||||
// Attempt to send to all recipients
|
||||
|
|
@ -1489,7 +1472,7 @@ class PHPMailer
|
|||
|
||||
// Only send the DATA command if we have viable recipients
|
||||
if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) {
|
||||
throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL);
|
||||
throw new Exception($this->lang('data_not_accepted'), self::STOP_CRITICAL);
|
||||
}
|
||||
if ($this->SMTPKeepAlive) {
|
||||
$this->smtp->reset();
|
||||
|
|
@ -1503,7 +1486,7 @@ class PHPMailer
|
|||
foreach ($bad_rcpt as $bad) {
|
||||
$errstr .= $bad['to'] . ': ' . $bad['error'];
|
||||
}
|
||||
throw new phpmailerException(
|
||||
throw new Exception(
|
||||
$this->lang('recipients_failed') . $errstr,
|
||||
self::STOP_CONTINUE
|
||||
);
|
||||
|
|
@ -1515,10 +1498,11 @@ class PHPMailer
|
|||
* Initiate a connection to an SMTP server.
|
||||
* Returns false if the operation failed.
|
||||
* @param array $options An array of options compatible with stream_context_create()
|
||||
* @return bool
|
||||
* @throws Exception
|
||||
* @throws null
|
||||
* @uses SMTP
|
||||
* @access public
|
||||
* @throws phpmailerException
|
||||
* @return boolean
|
||||
*/
|
||||
public function smtpConnect($options = array())
|
||||
{
|
||||
|
|
@ -1566,7 +1550,7 @@ class PHPMailer
|
|||
if ('tls' === $secure or 'ssl' === $secure) {
|
||||
//Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
|
||||
if (!$sslext) {
|
||||
throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
|
||||
throw new Exception($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
|
||||
}
|
||||
}
|
||||
$host = $hostinfo[3];
|
||||
|
|
@ -1593,7 +1577,7 @@ class PHPMailer
|
|||
}
|
||||
if ($tls) {
|
||||
if (!$this->smtp->startTLS()) {
|
||||
throw new phpmailerException($this->lang('connect_host'));
|
||||
throw new Exception($this->lang('connect_host'));
|
||||
}
|
||||
// We must resend HELO after tls negotiation
|
||||
$this->smtp->hello($hello);
|
||||
|
|
@ -1607,11 +1591,11 @@ class PHPMailer
|
|||
$this->Workstation
|
||||
)
|
||||
) {
|
||||
throw new phpmailerException($this->lang('authenticate'));
|
||||
throw new Exception($this->lang('authenticate'));
|
||||
}
|
||||
}
|
||||
return true;
|
||||
} catch (phpmailerException $exc) {
|
||||
} catch (Exception $exc) {
|
||||
$lastexception = $exc;
|
||||
$this->edebug($exc->getMessage());
|
||||
// We must have connected, but then failed TLS or Auth, so close connection nicely
|
||||
|
|
@ -1984,7 +1968,7 @@ class PHPMailer
|
|||
if ($this->XMailer == '') {
|
||||
$result .= $this->headerLine(
|
||||
'X-Mailer',
|
||||
'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer)'
|
||||
'PHPMailer ' . self::VERSION . ' (https://github.com/PHPMailer/PHPMailer)'
|
||||
);
|
||||
} else {
|
||||
$myXmailer = trim($this->XMailer);
|
||||
|
|
@ -2081,7 +2065,7 @@ class PHPMailer
|
|||
* Assemble the message body.
|
||||
* Returns an empty string on failure.
|
||||
* @access public
|
||||
* @throws phpmailerException
|
||||
* @throws Exception
|
||||
* @return string The assembled message body
|
||||
*/
|
||||
public function createBody()
|
||||
|
|
@ -2234,12 +2218,12 @@ class PHPMailer
|
|||
} elseif ($this->sign_key_file) {
|
||||
try {
|
||||
if (!defined('PKCS7_TEXT')) {
|
||||
throw new phpmailerException($this->lang('extension_missing') . 'openssl');
|
||||
throw new Exception($this->lang('extension_missing') . 'openssl');
|
||||
}
|
||||
// @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
|
||||
$file = tempnam(sys_get_temp_dir(), 'mail');
|
||||
if (false === file_put_contents($file, $body)) {
|
||||
throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
|
||||
throw new Exception($this->lang('signing') . ' Could not write temp file');
|
||||
}
|
||||
$signed = tempnam(sys_get_temp_dir(), 'signed');
|
||||
//Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
|
||||
|
|
@ -2273,9 +2257,9 @@ class PHPMailer
|
|||
} else {
|
||||
@unlink($file);
|
||||
@unlink($signed);
|
||||
throw new phpmailerException($this->lang('signing') . openssl_error_string());
|
||||
throw new Exception($this->lang('signing') . openssl_error_string());
|
||||
}
|
||||
} catch (phpmailerException $exc) {
|
||||
} catch (Exception $exc) {
|
||||
$body = '';
|
||||
if ($this->exceptions) {
|
||||
throw $exc;
|
||||
|
|
@ -2385,14 +2369,14 @@ class PHPMailer
|
|||
* @param string $encoding File encoding (see $Encoding).
|
||||
* @param string $type File extension (MIME) type.
|
||||
* @param string $disposition Disposition to use
|
||||
* @throws phpmailerException
|
||||
* @throws Exception
|
||||
* @return boolean
|
||||
*/
|
||||
public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment')
|
||||
{
|
||||
try {
|
||||
if (!@is_file($path)) {
|
||||
throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE);
|
||||
throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE);
|
||||
}
|
||||
|
||||
// If a MIME type is not specified, try to work it out from the file name
|
||||
|
|
@ -2416,7 +2400,7 @@ class PHPMailer
|
|||
7 => 0
|
||||
);
|
||||
|
||||
} catch (phpmailerException $exc) {
|
||||
} catch (Exception $exc) {
|
||||
$this->setError($exc->getMessage());
|
||||
$this->edebug($exc->getMessage());
|
||||
if ($this->exceptions) {
|
||||
|
|
@ -2565,7 +2549,7 @@ class PHPMailer
|
|||
* Returns an empty string on failure.
|
||||
* @param string $path The full path to the file
|
||||
* @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
|
||||
* @throws phpmailerException
|
||||
* @throws Exception
|
||||
* @access protected
|
||||
* @return string
|
||||
*/
|
||||
|
|
@ -2573,28 +2557,10 @@ class PHPMailer
|
|||
{
|
||||
try {
|
||||
if (!is_readable($path)) {
|
||||
throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
|
||||
}
|
||||
$magic_quotes = get_magic_quotes_runtime();
|
||||
if ($magic_quotes) {
|
||||
if (version_compare(PHP_VERSION, '5.3.0', '<')) {
|
||||
set_magic_quotes_runtime(false);
|
||||
} else {
|
||||
//Doesn't exist in PHP 5.4, but we don't need to check because
|
||||
//get_magic_quotes_runtime always returns false in 5.4+
|
||||
//so it will never get here
|
||||
ini_set('magic_quotes_runtime', false);
|
||||
}
|
||||
throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
|
||||
}
|
||||
$file_buffer = file_get_contents($path);
|
||||
$file_buffer = $this->encodeString($file_buffer, $encoding);
|
||||
if ($magic_quotes) {
|
||||
if (version_compare(PHP_VERSION, '5.3.0', '<')) {
|
||||
set_magic_quotes_runtime($magic_quotes);
|
||||
} else {
|
||||
ini_set('magic_quotes_runtime', $magic_quotes);
|
||||
}
|
||||
}
|
||||
return $file_buffer;
|
||||
} catch (Exception $exc) {
|
||||
$this->setError($exc->getMessage());
|
||||
|
|
@ -2796,24 +2762,6 @@ class PHPMailer
|
|||
return preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string);
|
||||
}
|
||||
|
||||
/**
|
||||
* Backward compatibility wrapper for an old QP encoding function that was removed.
|
||||
* @see PHPMailer::encodeQP()
|
||||
* @access public
|
||||
* @param string $string
|
||||
* @param integer $line_max
|
||||
* @param boolean $space_conv
|
||||
* @return string
|
||||
* @deprecated Use encodeQP instead.
|
||||
*/
|
||||
public function encodeQPphp(
|
||||
$string,
|
||||
$line_max = 76,
|
||||
/** @noinspection PhpUnusedParameterInspection */ $space_conv = false
|
||||
) {
|
||||
return $this->encodeQP($string, $line_max);
|
||||
}
|
||||
|
||||
/**
|
||||
* Encode a string using Q encoding.
|
||||
* @link http://tools.ietf.org/html/rfc2047
|
||||
|
|
@ -3642,14 +3590,14 @@ class PHPMailer
|
|||
* Generate a DKIM signature.
|
||||
* @access public
|
||||
* @param string $signHeader
|
||||
* @throws phpmailerException
|
||||
* @throws Exception
|
||||
* @return string
|
||||
*/
|
||||
public function DKIM_Sign($signHeader)
|
||||
{
|
||||
if (!defined('PKCS7_TEXT')) {
|
||||
if ($this->exceptions) {
|
||||
throw new phpmailerException($this->lang('extension_missing') . 'openssl');
|
||||
throw new Exception($this->lang('extension_missing') . 'openssl');
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
|
@ -3864,20 +3812,3 @@ class PHPMailer
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* PHPMailer exception handler
|
||||
* @package PHPMailer
|
||||
*/
|
||||
class phpmailerException extends Exception
|
||||
{
|
||||
/**
|
||||
* Prettify error message output
|
||||
* @return string
|
||||
*/
|
||||
public function errorMessage()
|
||||
{
|
||||
$errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
|
||||
return $errorMsg;
|
||||
}
|
||||
}
|
||||
|
|
@ -17,6 +17,8 @@
|
|||
* FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*/
|
||||
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
/**
|
||||
* PHPMailerOAuth - PHPMailer subclass adding OAuth support.
|
||||
* @package PHPMailer
|
||||
|
|
@ -50,20 +52,20 @@ class PHPMailerOAuth extends PHPMailer
|
|||
public $oauthClientSecret = '';
|
||||
|
||||
/**
|
||||
* An instance of the PHPMailerOAuthGoogle class.
|
||||
* @var PHPMailerOAuthGoogle
|
||||
* An instance of the OAuthProvider\Google class.
|
||||
* @var OAuthProvider\Google
|
||||
* @access protected
|
||||
*/
|
||||
protected $oauth = null;
|
||||
|
||||
/**
|
||||
* Get a PHPMailerOAuthGoogle instance to use.
|
||||
* @return PHPMailerOAuthGoogle
|
||||
* Get an OAuthProvider\Google instance to use.
|
||||
* @return OAuthProvider\Google
|
||||
*/
|
||||
public function getOAUTHInstance()
|
||||
{
|
||||
if (!is_object($this->oauth)) {
|
||||
$this->oauth = new PHPMailerOAuthGoogle(
|
||||
$this->oauth = new OAuthProvider\Google(
|
||||
$this->oauthUserEmail,
|
||||
$this->oauthClientSecret,
|
||||
$this->oauthClientId,
|
||||
|
|
@ -77,9 +79,11 @@ class PHPMailerOAuth extends PHPMailer
|
|||
* Initiate a connection to an SMTP server.
|
||||
* Overrides the original smtpConnect method to add support for OAuth.
|
||||
* @param array $options An array of options compatible with stream_context_create()
|
||||
* @return bool
|
||||
* @throws null
|
||||
* @throws Exception
|
||||
* @uses SMTP
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
public function smtpConnect($options = array())
|
||||
{
|
||||
|
|
@ -131,7 +135,7 @@ class PHPMailerOAuth extends PHPMailer
|
|||
if ('tls' === $secure or 'ssl' === $secure) {
|
||||
//Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
|
||||
if (!$sslext) {
|
||||
throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
|
||||
throw new Exception($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
|
||||
}
|
||||
}
|
||||
$host = $hostinfo[3];
|
||||
|
|
@ -158,7 +162,7 @@ class PHPMailerOAuth extends PHPMailer
|
|||
}
|
||||
if ($tls) {
|
||||
if (!$this->smtp->startTLS()) {
|
||||
throw new phpmailerException($this->lang('connect_host'));
|
||||
throw new Exception($this->lang('connect_host'));
|
||||
}
|
||||
// We must resend HELO after tls negotiation
|
||||
$this->smtp->hello($hello);
|
||||
|
|
@ -173,11 +177,11 @@ class PHPMailerOAuth extends PHPMailer
|
|||
$this->oauth
|
||||
)
|
||||
) {
|
||||
throw new phpmailerException($this->lang('authenticate'));
|
||||
throw new Exception($this->lang('authenticate'));
|
||||
}
|
||||
}
|
||||
return true;
|
||||
} catch (phpmailerException $exc) {
|
||||
} catch (Exception $exc) {
|
||||
$lastexception = $exc;
|
||||
$this->edebug($exc->getMessage());
|
||||
// We must have connected, but then failed TLS or Auth, so close connection nicely
|
||||
|
|
@ -17,6 +17,8 @@
|
|||
* FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*/
|
||||
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
/**
|
||||
* PHPMailer POP-Before-SMTP Authentication Class.
|
||||
* Specifically for PHPMailer to use for RFC1939 POP-before-SMTP authentication.
|
||||
|
|
@ -34,7 +36,7 @@ class POP3
|
|||
* @var string
|
||||
* @access public
|
||||
*/
|
||||
public $Version = '5.2.14';
|
||||
public $Version = '5.4.0';
|
||||
|
||||
/**
|
||||
* Default POP3 port number.
|
||||
|
|
@ -17,6 +17,8 @@
|
|||
* FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*/
|
||||
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
/**
|
||||
* PHPMailer RFC821 SMTP email transport class.
|
||||
* Implements RFC 821 SMTP commands and provides some utility methods for sending mail to an SMTP server.
|
||||
|
|
@ -30,7 +32,7 @@ class SMTP
|
|||
* The PHPMailer SMTP version number.
|
||||
* @var string
|
||||
*/
|
||||
const VERSION = '5.2.14';
|
||||
const VERSION = '5.4.0';
|
||||
|
||||
/**
|
||||
* SMTP line break constant.
|
||||
|
|
@ -75,14 +77,6 @@ class SMTP
|
|||
*/
|
||||
const DEBUG_LOWLEVEL = 4;
|
||||
|
||||
/**
|
||||
* The PHPMailer SMTP Version number.
|
||||
* @var string
|
||||
* @deprecated Use the `VERSION` constant instead
|
||||
* @see SMTP::VERSION
|
||||
*/
|
||||
public $Version = '5.2.14';
|
||||
|
||||
/**
|
||||
* SMTP server port number.
|
||||
* @var integer
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<?php
|
||||
require_once 'vendor/autoload.php';
|
||||
require_once '../vendor/autoload.php';
|
||||
spl_autoload_register(function ($class) {
|
||||
require_once strtr($class, '\\_', '//').'.php';
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
<?php
|
||||
/**
|
||||
* PHPMailer - language file tests
|
||||
* Requires PHPUnit 3.3 or later.
|
||||
*
|
||||
* PHP version 5.0.0
|
||||
* PHP version 5.4.0
|
||||
*
|
||||
* @package PHPMailer
|
||||
* @author Andy Prevost
|
||||
|
|
@ -13,16 +12,18 @@
|
|||
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
|
||||
*/
|
||||
|
||||
require_once '../PHPMailerAutoload.php';
|
||||
namespace PHPMailer\PHPMailer;
|
||||
|
||||
require_once '../vendor/autoload.php';
|
||||
|
||||
/**
|
||||
* PHPMailer - PHP email transport unit test class
|
||||
* Performs authentication tests
|
||||
*/
|
||||
class PHPMailerLangTest extends PHPUnit_Framework_TestCase
|
||||
class PHPMailerLangTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
/**
|
||||
* Holds a phpmailer instance.
|
||||
* Holds a PHPMailer instance.
|
||||
* @private
|
||||
* @var PHPMailer
|
||||
*/
|
||||
|
|
@ -51,7 +52,7 @@ class PHPMailerLangTest extends PHPUnit_Framework_TestCase
|
|||
$this->Mail->setLanguage('en');
|
||||
$definedStrings = $this->Mail->getTranslations();
|
||||
$err = '';
|
||||
foreach (new DirectoryIterator('../language') as $fileInfo) {
|
||||
foreach (new \DirectoryIterator('../language') as $fileInfo) {
|
||||
if ($fileInfo->isDot()) {
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
<?php
|
||||
/**
|
||||
* PHPMailer - PHP email transport unit tests
|
||||
* Requires PHPUnit 3.3 or later.
|
||||
*
|
||||
* PHP version 5.0.0
|
||||
*
|
||||
* PHP version 5.4.0
|
||||
* @package PHPMailer
|
||||
* @author Andy Prevost
|
||||
* @author Marcus Bointon <phpmailer@synchromedia.co.uk>
|
||||
|
|
@ -13,16 +11,17 @@
|
|||
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
|
||||
*/
|
||||
|
||||
require_once '../PHPMailerAutoload.php';
|
||||
namespace PHPMailer\PHPMailer;
|
||||
require '../vendor/autoload.php';
|
||||
|
||||
/**
|
||||
* PHPMailer - PHP email transport unit test class
|
||||
* Performs authentication tests
|
||||
*/
|
||||
class PHPMailerTest extends PHPUnit_Framework_TestCase
|
||||
class PHPMailerTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
/**
|
||||
* Holds the default phpmailer instance.
|
||||
* Holds the phpmailer instance.
|
||||
* @private
|
||||
* @var PHPMailer
|
||||
*/
|
||||
|
|
@ -100,7 +99,6 @@ class PHPMailerTest extends PHPUnit_Framework_TestCase
|
|||
$this->Mail->SMTPAuth = false;
|
||||
$this->Mail->Username = '';
|
||||
$this->Mail->Password = '';
|
||||
$this->Mail->PluginDir = $this->INCLUDE_DIR;
|
||||
$this->Mail->addReplyTo('no_reply@phpmailer.example.com', 'Reply Guy');
|
||||
$this->Mail->Sender = 'unit_test@phpmailer.example.com';
|
||||
if (strlen($this->Mail->Host) > 0) {
|
||||
|
|
@ -607,7 +605,9 @@ class PHPMailerTest extends PHPUnit_Framework_TestCase
|
|||
'first.last@[IPv6:a1:a2:a3:a4:b1:b2:b3:]',
|
||||
'first.last@[IPv6::a2:a3:a4:b1:b2:b3:b4]',
|
||||
'first.last@[IPv6:a1:a2:a3:a4::b1:b2:b3:b4]',
|
||||
"(\r\n RCPT TO:websec02@d.mbsd.jp\r\n DATA \\\nSubject: spam10\\\n\r\n Hello,\r\n this is a spam mail.\\\n.\r\n QUIT\r\n ) a@gmail.com" //This is valid RCC5322, but we don't want to allow it
|
||||
//This is valid RCC5322, but we don't want to allow it
|
||||
"(\r\n RCPT TO:websec02@d.mbsd.jp\r\n DATA \\\nSubject: spam10\\\n\r\n".
|
||||
" Hello,\r\n this is a spam mail.\\\n.\r\n QUIT\r\n ) a@gmail.com"
|
||||
);
|
||||
// IDNs in Unicode and ASCII forms.
|
||||
$unicodeaddresses = array(
|
||||
|
|
@ -778,11 +778,6 @@ class PHPMailerTest extends PHPUnit_Framework_TestCase
|
|||
quoted_printable_decode($this->Mail->encodeQP($t)),
|
||||
'Quoted-Printable encoding round-trip failed'
|
||||
);
|
||||
$this->assertEquals(
|
||||
$this->Mail->encodeQP($t),
|
||||
$this->Mail->encodeQPphp($t),
|
||||
'Quoted-Printable BC wrapper failed'
|
||||
);
|
||||
//Force line breaks to Windows-style
|
||||
$t = str_replace("\n", "\r\n", $t);
|
||||
$this->assertEquals(
|
||||
|
|
@ -1134,52 +1129,6 @@ EOT;
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* iCal event test.
|
||||
*/
|
||||
public function testIcal()
|
||||
{
|
||||
//Standalone ICS tests
|
||||
require_once '../extras/EasyPeasyICS.php';
|
||||
$ICS = new EasyPeasyICS("PHPMailer test calendar");
|
||||
$this->assertNotEmpty(
|
||||
$ICS->addEvent(
|
||||
strtotime('tomorrow 10:00 Europe/Paris'),
|
||||
strtotime('tomorrow 11:00 Europe/Paris'),
|
||||
'PHPMailer iCal test',
|
||||
'A test of PHPMailer iCal support',
|
||||
'https://github.com/PHPMailer/PHPMailer'
|
||||
),
|
||||
'Generated event string is empty'
|
||||
);
|
||||
$ICS->addEvent(
|
||||
strtotime('tomorrow 10:00 Europe/Paris'),
|
||||
strtotime('tomorrow 11:00 Europe/Paris'),
|
||||
'PHPMailer iCal test',
|
||||
'A test of PHPMailer iCal support',
|
||||
'https://github.com/PHPMailer/PHPMailer'
|
||||
);
|
||||
$events = $ICS->getEvents();
|
||||
$this->assertEquals(2, count($events), 'Event count mismatch');
|
||||
$ICS->clearEvents();
|
||||
$events = $ICS->getEvents();
|
||||
$this->assertEquals(0, count($events), 'Event clearing failed');
|
||||
$ICS->setName('test');
|
||||
$this->assertEquals('test', $ICS->getName(), 'Setting ICS name failed');
|
||||
$this->assertNotEmpty($ICS->render(false), 'Empty calendar');
|
||||
//Need to test generated output but PHPUnit isn't playing nice
|
||||
//$rendered = $ICS->render();
|
||||
|
||||
//Test sending an ICS
|
||||
$this->Mail->Body = 'This is the <strong>HTML</strong> part of the email.';
|
||||
$this->Mail->AltBody = 'This is the text part of the email.';
|
||||
$this->Mail->Subject .= ': iCal';
|
||||
$this->Mail->isHTML(true);
|
||||
$this->buildBody();
|
||||
$this->Mail->Ical = $ICS->render(false);
|
||||
$this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test sending multiple messages with separate connections.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>PHPMailer Lite - DKIM and Callback Function test</title>
|
||||
<title>PHPMailer - DKIM and Callback Function test</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
|
@ -33,8 +33,8 @@ function callbackAction($result, $to, $cc, $bcc, $subject, $body)
|
|||
return true;
|
||||
}
|
||||
|
||||
require_once '../PHPMailerAutoload.php';
|
||||
$mail = new PHPMailer();
|
||||
require_once '../vendor/autoload.php';
|
||||
$mail = new PHPMailer\PHPMailer\PHPMailer();
|
||||
|
||||
try {
|
||||
$mail->isMail();
|
||||
|
|
@ -49,9 +49,9 @@ try {
|
|||
$mail->action_function = 'callbackAction';
|
||||
$mail->send();
|
||||
echo "Message Sent OK</p>\n";
|
||||
} catch (phpmailerException $e) {
|
||||
} catch (PHPMailer\PHPMailer\Exception $e) {
|
||||
echo $e->errorMessage(); //Pretty error messages from PHPMailer
|
||||
} catch (Exception $e) {
|
||||
} catch (\Exception $e) {
|
||||
echo $e->getMessage(); //Boring error messages from anything else!
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue