Fixed coding style and some other things.

Author: greeny

MailLibrary/Connection.php

@@ -35,6 +35,7 @@ public function isConnected()
 
 	/**
 	 * Connects to the server
+	 * @return Connection
 	 * @throws ConnectionException
 	 */
 	public function connect()
@@ -47,6 +48,7 @@ public function connect()
 				throw new ConnectionException("Cannot connect to server.", $e->getCode(), $e);
 			}
 		}
+		return $this;
 	}
 
 	/**
@@ -59,12 +61,14 @@ public function getDriver()
 
 	/**
 	 * Flushes changes to server
+	 * @return Connection
 	 * @throws DriverException
 	 */
 	public function flush()
 	{
 		$this->connected || $this->connect();
 		$this->driver->flush();
+		return $this;
 	}
 
 	/**

MailLibrary/Contact.php

@@ -1,23 +1,20 @@
 <?php
 /**
  * @author Martin Pecha
+ * @author Tomáš Blatný
  */
 
 namespace greeny\MailLibrary;
 
-/**
- * Class Contact
- * @package greeny\MailLibrary
- */
-class Contact {
-
-	/** @var  string */
+class Contact
+{
+	/** @var string */
 	private $mailbox;
-	/** @var  string */
+	/** @var string */
 	private $host;
-	/** @var  string */
+	/** @var string */
 	private $personal;
-	/** @var  string */
+	/** @var string */
 	private $adl;
 
 	/**
@@ -26,7 +23,8 @@ class Contact {
 	 * @param $personal
 	 * @param $adl
 	 */
-	public function __construct($mailbox=NULL, $host=NULL, $personal=NULL, $adl=NULL) {
+	public function __construct($mailbox = NULL, $host = NULL, $personal = NULL, $adl = NULL)
+	{
 		$this->mailbox = $mailbox;
 		$this->host = $host;
 		$this->personal = $personal;
@@ -36,7 +34,8 @@ public function __construct($mailbox=NULL, $host=NULL, $personal=NULL, $adl=NULL
 	/**
 	 * @return string
 	 */
-	public function __toString() {
+	public function __toString()
+	{
 		$address = $this->getName() ? "\"" . $this->getName(). "\" " : "";
 		$address .= $this->getAdl() ? $this->getAdl().":" : "";
 		$address .= "<".$this->getEmail().">";
@@ -46,21 +45,24 @@ public function __toString() {
 	/**
 	 * @return string
 	 */
-	public function getEmail() {
+	public function getEmail()
+	{
 		return $this->mailbox."@".$this->host;
 	}
 
 	/**
 	 * @return string
 	 */
-	public function getName() {
+	public function getName()
+	{
 		return $this->personal;
 	}
 
 	/**
 	 * @return string
 	 */
-	public function getAdl() {
+	public function getAdl()
+	{
 		return $this->adl;
 	}
 

MailLibrary/ContactList.php

@@ -8,7 +8,9 @@
 use Iterator;
 use Countable;
 
-class ContactList implements Iterator, Countable{
+class ContactList implements Iterator, Countable
+{
+	/** @var Contact[] */
 	protected $contacts;
 
 	protected $builtContacts;
@@ -21,7 +23,6 @@ public function addContact($mailbox = NULL, $host = NULL, $personal = NULL, $adl
 	public function build()
 	{
 		$return = array();
-		/** @var Contact $contact */
 		foreach($this->contacts as $contact) {
 			$return[] = $contact->__toString();
 		}
@@ -80,4 +81,3 @@ public function count()
 		return count($this->builtContacts);
 	}
 }
- 

MailLibrary/Mail.php

@@ -69,14 +69,20 @@ public function __construct(Connection $connection, Mailbox $mailbox, $id)
 		$this->id = $id;
 	}
 
+	/**
+	 * Header checker
+	 *
+	 * @param $name
+	 * @return bool
+	 */
 	public function __isset($name)
 	{
 		$this->headers !== NULL || $this->initializeHeaders();
 		return isset($this->headers[$this->formatHeaderName($name)]);
 	}
 
 	/**
-	 * Gets header
+	 * Header getter
 	 *
 	 * @param string $name
 	 * @return mixed
@@ -121,6 +127,19 @@ public function getHeader($name)
 		return $this->headers[$this->formatHeaderName($name)];
 	}
 
+	/**
+	 * @return Contact|null
+	 */
+	public function getSender() {
+		$from = $this->getHeader('from');
+		if($from) {
+			$contacts = $from->getContactsObjects();
+			return (count($contacts) ? $contacts[0] : NULL);
+		} else {
+			return NULL;
+		}
+	}
+
 	/**
 	 * @return string
 	 */
@@ -203,14 +222,6 @@ public function delete()
 		$this->connection->getDriver()->deleteMail($this->id);
 	}
 
-	/**
-	 * @return Contact|null
-	 */
-	public function getSender() {
-		$contacts = $this->from->getContactsObjects();
-		return (!empty($contacts[0]) ? $contacts[0] : null);
-	}
-
 	/**
 	 * Initializes headers
 	 */
@@ -248,4 +259,3 @@ protected function formatHeaderName($name)
 		}, $name));
 	}
 }
-