Refs #1370 - explicitly pull in pear/mail and pear/mail_mime for Mail…

…Task

classes/phing/listener/MailLogger.php

@@ -40,7 +40,7 @@ public function __construct()
         parent::__construct();
 
         if (!class_exists('Mail')) {
-            throw new BuildException('Need the PEAR Mail package to send logs');
+            throw new BuildException('Need the pear/mail_mime package installed to send logs');
         }
 
         $tolist = Phing::getDefinedProperty('phing.log.mail.recipients');

classes/phing/tasks/ext/MailTask.php

@@ -61,10 +61,10 @@ protected function sendFilesets()
         @include_once 'Mail/mime.php';
 
         if (!class_exists('Mail_mime')) {
-            throw new BuildException('Need the PEAR Mail_mime package to send attachments');
+            throw new BuildException('Need the pear/mail and pear/mail_mime packages installed');
         }
 
-        $mime = new Mail_mime(['text_charset' => 'UTF-8']);
+        $mime = new \Mail_mime(['text_charset' => 'UTF-8']);
         $hdrs = [
             'From' => $this->from,
             'Subject' => $this->subject
@@ -84,7 +84,7 @@ protected function sendFilesets()
         $body = $mime->get();
         $hdrs = $mime->headers($hdrs);
 
-        $mail = Mail::factory($this->backend, $this->backendParams);
+        $mail = \Mail::factory($this->backend, $this->backendParams);
         $mail->send($this->tolist, $hdrs, $body);
     }
 

composer.json

@@ -59,6 +59,8 @@
         "monolog/monolog": "^1.25 || ^2.0",
         "pdepend/pdepend": "^2.5.2",
         "pear/archive_tar": "~1.4.7",
+        "pear/mail": "^1.4",
+        "pear/mail_mime": "^1.10",
         "pear/net_growl": "dev-master",
         "pear/pear-core-minimal": "~1.10.9",
         "pear/versioncontrol_git": "dev-master",