improved PHPMail for extending

Author: Raaghu

src/Notification/Implementation/PHPMail.php

@@ -24,10 +24,10 @@ public function setFromAddress($from) {
 
 	public function addAddress($address, $type = null) {
 		switch ($type){
-			case self::CC : 
+			case self::CC :
 				$this->cc[] = $address;
 				break;
-			case self::BCC : 
+			case self::BCC :
 				$this->bcc[] = $address;
 				break;
 			default:
@@ -46,20 +46,37 @@ public function setMessage($message) {
 	}
 
 	public function send() {
-		$to = implode(", ", $this->to);
+		return mail($this->getTo(),$this->getSubject(),$this->getMessage(),$this->getHeaders());
+	}
+	
+	protected function getTo(){
+		return implode(", ", $this->to);
+	}
+	
+	protected function getSubject(){
+		return $this->subject;
+	}
+	
+	protected function getMessage(){
+		return $this->message;
+	}
+	
+	protected function getHeaders(){
 		$cc = implode(", ", $this->cc);
 		$bcc = implode(", ", $this->cc);
 
-		$headers = array_map(function($name,$value){return $name.": ".$value;},$this->headers);
+		$headers = array();
+		foreach ($this->headers as $name=>$value){
+			$headers[] = "$name: $value";
+		}
+		
 		if(trim($cc) !== ""){
 			$headers[] = "Cc: $cc";
 		}
 		if(trim($bcc) !== ""){
 			$headers[] = "Bcc: $bcc";
 		}
 
-		$header = implode("\r\n", $headers);
-		
-		return mail($to,$this->subject,$this->message,$header);
+		return implode("\r\n", $headers);
 	}
 }