Ticket 480: Update composer for PHPMailer 6.x

- Needed adjustments to Mail class - Updated various other components with the switch to PHPMailer 6.x
IlchCMS · Feb 17, 2018 · 16eed3f · 16eed3f
1 parent 0e9d5a8
commit 16eed3f
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 106 deletions.
diff --git a/application/libraries/Ilch/Mail.php b/application/libraries/Ilch/Mail.php
@@ -6,6 +6,8 @@
 
 namespace Ilch;
 
+use PHPMailer\PHPMailer\PHPMailer;
+
 class Mail
 {
     /**
@@ -55,7 +57,7 @@ class Mail
 
     public function PHPMailer()
     {
-        return new \PHPMailer();
+        return new PHPMailer;
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "components/jquery": "^3.1",
         "ckeditor/ckeditor": "^4.6",
         "components/jqueryui": "^1.12",
-        "phpmailer/phpmailer": "~5.2",
+        "phpmailer/phpmailer": "~6.0",
         "sphido/events": "^0.3"
     },
     "require-dev": {