Merge branch '5.4' into xoauth

# Conflicts:
#	changelog.md
#	composer.json
#	composer.lock
#	get_oauth_token.php

changelog.md

@@ -2,18 +2,28 @@
 
 ## Version 5.4
 This is a major update that breaks backwards compatibility. To emphasise that this release requires PHP 5.4, this release is called **5.4**, **not 5.3**!
+
 * 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:
+  * `PHPMailer->Version`
+  * `PHPMailer->ReturnPath`
+  * `PHPMailer->PluginDir`
+  * `PHPMailer->encodeQPphp()`
+  * `SMTP->CRLF`
+  * `SMTP->Version`
+  * `SMTP->SMTP_PORT`
+  * `POP3->CRLF`
+  * `POP3->Version`
 * All elements previously marked as deprecated have been removed (e.g. `ReturnPath`)
 * NTLM authentication removed - never worked anyway!
-* SMTP::authenticate method signature changed
+* `SMTP::authenticate method signature changed
 * `parseAddresses()` is now static
 * `validateAddress()` is now called statically from `parseAddresses()`
-
 * Fix gmail XOAUTH2 scope, thanks to @sherryl4george
 * Fix extra line break in getSentMIMEMessage()
 

src/PHPMailer.php

@@ -29,13 +29,6 @@ namespace PHPMailer\PHPMailer;
  */
 class PHPMailer
 {
-    /**
-     * The PHPMailer Version number.
-     * @var string
-     * @deprecated Use the VERSION class constant instead
-     */
-    public $Version = '5.4.0';
-
     /**
      * Email priority.
      * Options: null (default), 1 = High, 3 = Normal, 5 = low.
@@ -661,7 +654,7 @@ class PHPMailer
         } else {
             $subject = $this->encodeHeader($this->secureHeader($subject));
         }
-        if (ini_get('safe_mode') || !($this->UseSendmailOptions)) {
+        if (!($this->UseSendmailOptions)) {
             $result = @mail($to, $subject, $body, $header);
         } else {
             $result = @mail($to, $subject, $body, $header, $params);
@@ -1390,7 +1383,7 @@ class PHPMailer
         } else {
             $params = sprintf('-f%s', $this->Sender);
         }
-        if ($this->Sender != '' and !ini_get('safe_mode')) {
+        if ($this->Sender != '') {
             $old_from = ini_get('sendmail_from');
             ini_set('sendmail_from', $this->Sender);
         }

src/POP3.php

@@ -52,14 +52,6 @@ class POP3
      */
     public $POP3_TIMEOUT = 30;
 
-    /**
-     * POP3 Carriage Return + Line Feed.
-     * @var string
-     * @access public
-     * @deprecated Use the constant instead
-     */
-    public $CRLF = "\r\n";
-
     /**
      * Debug display level.
      * Options: 0 = no, 1+ = yes

src/SMTP.php

@@ -77,22 +77,6 @@ class SMTP
      */
     const DEBUG_LOWLEVEL = 4;
 
-    /**
-     * SMTP server port number.
-     * @var integer
-     * @deprecated This is only ever used as a default value, so use the `DEFAULT_SMTP_PORT` constant instead
-     * @see SMTP::DEFAULT_SMTP_PORT
-     */
-    public $SMTP_PORT = 25;
-
-    /**
-     * SMTP reply line ending.
-     * @var string
-     * @deprecated Use the `CRLF` constant instead
-     * @see SMTP::CRLF
-     */
-    public $CRLF = "\r\n";
-
     /**
      * Debug output level.
      * Options: