Commit Graph

82 Commits

Author SHA1 Message Date
Marcus Bointon 5e7ea2a6d1
Add PSR-3 compatible debug logging 2016-09-30 17:46:39 +02:00
Marcus 3abcab1936 Clean up TODOs
Switch SingleToArray to protected
Update Readme
Update composer deps
2016-04-19 18:26:33 +02:00
Marcus a8b44e9a8e Merge remote-tracking branch 'remotes/upstream/master' into xoauth
# Conflicts:
#	src/PHPMailer.php
2016-04-19 17:30:13 +02:00
Marcus 05e43f3666 Don't use dynamic classnames in aliased namespaces, see #675
Increase PHP version req to 5.5 in composer.json
2016-04-06 20:18:34 +02:00
Synchro 7bb65f288b Merge branch 'master' into xoauth 2016-01-07 20:38:58 +01:00
Synchro df2a2dfc79 Point at Google-specific OAuth2 lib since that's the only provider supported in 5.2.x 2016-01-07 18:35:00 +01:00
Synchro de1015e6ed Fix composer files 2015-12-07 23:29:15 +01:00
Synchro dffac3a0f5 Merge remote-tracking branch 'remotes/upstream/5.4' into xoauth
# Conflicts:
#	composer.json
#	composer.lock
#	get_oauth_token.php
2015-12-07 22:37:30 +01:00
Synchro 40bdd9c488 Merge branch 'master' into 5.4
# Conflicts:
#	changelog.md
#	composer.json
#	get_oauth_token.php
2015-12-07 22:19:48 +01:00
sherryl4george 2116208ab0 Resolve Scope issues which results in auth failure 2015-12-08 02:08:46 +05:30
Synchro 2101e1654b PHPUnit tweaks 2015-11-11 18:04:02 +01:00
Synchro 0dae3451c6 Downgrade to PHPUnit 4.7 to avoid 4.8 bug 2015-11-11 17:08:35 +01:00
Synchro 016e6330d4 xoauth stuff 2015-11-10 13:09:29 +01:00
Synchro 466264810a Merge remote-tracking branch 'remotes/upstream/5.4' into xoauth
# Conflicts:
#	composer.json
#	composer.lock
#	examples/gmail_xoauth.phps
#	get_oauth_token.php
#	src/OAuthProvider/Google.php
#	src/PHPMailerOAuth.php
2015-11-10 10:25:37 +01:00
Synchro 9b3e13dc14 First draft of 5.4 2015-11-09 19:09:13 +01:00
Marcus Bointon c24f242d9b Fix xoauth package suggestions 2015-10-23 14:59:55 +02:00
Synchro 19fcea0556 Cleanup 2015-10-20 13:52:29 +02:00
Ravishanker Kusuma c71721636e XOAuth Providers support Google,Yahoo,Microsoft
Added token expiry check
2015-09-24 15:22:48 +08:00
Marcus Bointon de8e32f842 Rename oauth class 2015-09-14 10:58:04 +02:00
Marcus Bointon 14ace3da7b Merge branch 'master' of ssh://github.com/PHPMailer/PHPMailer 2015-09-04 10:45:19 +02:00
Frederik Bosch df582f0a56 Remove guzzle, suggest oauth2 2015-09-02 12:21:21 +02:00
Frederik Bosch 126ffa991f Do no require a dependency that is not required
First of all, do not require dependencies that are not required for PHPMailer to work. It works perfectly without. Secondly, the majority of the users will not use Gmail's XOAUTH2 authentication system and do not need these additional dependencies. Thirdly, guzzle and league packages are used a lot. Therefore you make it hard for people that were already using these packages to newer versions of PHPMailer.
2015-09-02 12:01:43 +02:00
Marcus Bointon 3bcec0700e Update deps 2015-07-07 15:59:22 +01:00
Synchro e874b2a14b Code cleanups 2015-05-19 17:36:29 +02:00
sherryl4george b4cf92e843 XOAUTH Changes 2015-05-19 16:13:33 +02:00
Marcus Bointon 095193b5ed Add extras classes to composer classmap 2015-04-23 10:53:31 +02:00
Synchro 7b668256fe Up PHPUnit dep to 4.3 2015-01-09 15:18:26 +01:00
Synchro ca71445fb2 Make tests check for config
Generate debug output during POP tests
Ignore errors during POP3 disconnect
Update PHPUnit dependency to 4.1 in composer
2014-06-05 16:58:17 +02:00
Synchro 86aaac0f75 Depend on PHPUnit 4.0.x
Reorder authors
2014-04-08 13:33:32 +02:00
Synchro 6b5cbca34c Set packagist package type 2013-06-06 08:47:17 +02:00
Synchro 2638daad6f Add composer license entry 2012-12-03 16:21:49 +01:00
Synchro 7224d9e402 Add a composer.json, fixes #8
Composer file adapted from https://github.com/minmb/phpmailer, thanks.
Update email
2012-12-03 16:04:56 +01:00