Merge remote-tracking branch 'remotes/upstream/master' into longlines

# Conflicts:
#	class.phpmailer.php
#	test/phpmailerTest.php

.gitignore

@@ -1,5 +1,6 @@
 docs/phpdoc/
 test/message.txt
 test/testbootstrap.php
+test/*.pem
 .idea
 build/

.scrutinizer.yml

@@ -1,8 +1,11 @@
+build:
+    environment:
+        php: '5.6.0'
+
 before_commands:
     - "composer install --prefer-source"
 
 tools:
-    # Code Coverage
     external_code_coverage:
         enabled: true
         timeout: 300
@@ -14,10 +17,8 @@ tools:
                 - 'test/*'
                 - 'vendor/*'
 
-
     php_code_coverage:
         enabled:              false
-        test_command:         phpunit
         filter:
             excluded_paths:
                 - 'docs/*'
@@ -26,11 +27,8 @@ tools:
                 - 'test/*'
                 - 'vendor/*'
 
-
-    # Code Sniffer
     php_code_sniffer:
         enabled:              true
-        command:              phpcs
         config:
             standard:         PSR2
             sniffs:
@@ -45,23 +43,19 @@ tools:
                 - 'test/*'
                 - 'vendor/*'
 
-
     # Copy/Paste Detector
     php_cpd:
         enabled:              true
-        command:              phpcpd
         excluded_dirs:
             - docs
             - examples
             - extras
             - test
             - vendor
 
-
     # PHP CS Fixer (http://http://cs.sensiolabs.org/).
     php_cs_fixer:
         enabled:              true
-        command:              php-cs-fixer
         config:
             level:            psr2
         filter:
@@ -72,23 +66,19 @@ tools:
                 - 'test/*'
                 - 'vendor/*'
 
-
     # Analyzes the size and structure of a PHP project.
     php_loc:
         enabled:              true
-        command:              phploc
         excluded_dirs:
             - docs
             - examples
             - extras
             - test
             - vendor
 
-
     # PHP Mess Detector (http://phpmd.org).
     php_mess_detector:
         enabled:              true
-        command:              phpmd
         config:
             rulesets:
                 - codesize
@@ -108,7 +98,6 @@ tools:
     # Analyzes the size and structure of a PHP project.
     php_pdepend:
         enabled:              true
-        command:              pdepend
         excluded_dirs:
             - docs
             - examples

.travis.yml

@@ -1,14 +1,16 @@
 language: php
 php:
+  - 7.0
   - 5.6
   - 5.5
   - 5.4
   - 5.3
   - hhvm
 
 matrix:
-    allow_failures:
-        - php: hhvm
+  allow_failures:
+    - php: 7.0
+    - php: hhvm
 
 before_install:
   - sudo apt-get update -qq

README.md

@@ -15,7 +15,7 @@ Build status: [![Build Status](https://travis-ci.org/PHPMailer/PHPMailer.svg)](h
 - Multipart/alternative emails for mail clients that do not read HTML email
 - Support for UTF-8 content and 8bit, base64, binary, and quoted-printable encodings
 - SMTP authentication with LOGIN, PLAIN, NTLM and CRAM-MD5 mechanisms over SSL and TLS transports
-- Native language support
+- Error messages in 46 languages!
 - DKIM and S/MIME signing support
 - Compatible with PHP 5.0 and later
 - Much more!
@@ -39,11 +39,12 @@ software availability and distribution.
 PHPMailer is available via [Composer/Packagist](https://packagist.org/packages/phpmailer/phpmailer). Alternatively, just copy the contents of the PHPMailer folder into somewhere that's in your PHP `include_path` setting. If you don't speak git or just want a tarball, click the 'zip' button at the top of the page in GitHub.
 
 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.
+
 PHPMailer does *not* declare a namespace because namespaces were only introduced in PHP 5.3.
 
 ### 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, advanced HTML-to-text conversion and ics generation.
+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.
 
 ## A Simple Example
 
@@ -92,7 +93,7 @@ You'll find plenty more to play with in the [examples](examples/) folder.
 That's it. You should now be ready to use PHPMailer!
 
 ## Localization
-PHPMailer defaults to English, but in the [language](language/) folder you'll find numerous (41 at the time of writing!) translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this:
+PHPMailer defaults to English, but in the [language](language/) folder you'll find numerous (45 at the time of writing!) translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this:
 
 ```php
 // To load the French version
@@ -103,11 +104,15 @@ We welcome corrections and new languages - if you're looking for corrections to
 
 ## Documentation
 
-Generated documentation is [available online](http://phpmailer.github.io/PHPMailer/).
+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).
+
+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.
+
+Complete generated API documentation is [available online](http://phpmailer.github.io/PHPMailer/).
 
 You'll find some basic user-level docs in the [docs](docs/) folder, and you can generate complete API-level documentation using the [generatedocs.sh](docs/generatedocs.sh) shell script in the docs folder, though you'll need to install [PHPDocumentor](http://www.phpdoc.org) first. You may find [the unit tests](test/phpmailerTest.php) a good source of how to do various operations such as encryption.
 
-Some useful information on troubleshooting and bulk sending with PHPMailer can be found in the [Github wiki](https://github.com/PHPMailer/PHPMailer/wiki).
+If the documentation doesn't cover what you need, search the [many questions on StackOverflow](http://stackoverflow.com/questions/tagged/phpmailer), and before you ask a question about "SMTP Error: Could not connect to SMTP host.", [read the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting).
 
 ## Tests
 

changelog.md

@@ -7,6 +7,23 @@
 * Add Indonesian translations (Thanks to @ceceprawiro)
 * Avoid `error_log` Debugoutput naming clash
 * Add ability to parse server capabilities in response to EHLO (useful for SendGrid etc)
+* Amended default values for WordWrap to match RFC
+* Remove html2text converter class (has incompatible license)
+* Provide new mechanism for injecting html to text converters
+* Improve pointers to docs and support in README
+* Add example file upload script
+* Refactor and major cleanup of EasyPeasyICS, now a lot more usable
+* Make set() method simpler and more reliable
+* Add Malay translation (Thanks to @nawawi)
+* Add Bulgarian translation (Thanks to @mialy)
+* Add Armenian translation (Thanks to Hrayr Grigoryan)
+* Add Slovenian translation (Thanks to Klemen Tušar)
+* More efficient word wrapping
+* Add support for S/MIME signing with additional CA certificate (thanks to @IgitBuh)
+* Fix incorrect MIME structure when using S/MIME signing and isMail() (#372)
+* Improved checks and error messages for missing extensions
+* Store and report SMTP errors more consistently
+* Add MIME multipart preamble for better Outlook compatibility
 
 ## Version 5.2.9 (Sept 25th 2014)
 * **Important: The autoloader is no longer autoloaded by the PHPMailer class**