From 81467779ba582ea2a7f23780497effb95cb16bd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Wed, 12 Jun 2013 22:55:23 +0200
Subject: [PATCH 1/2] Resolved merge conflicts from commit 83ba3cf

---
 src/AddressList.php          | 4 +---
 src/Header/GenericHeader.php | 4 +---
 src/Header/Received.php      | 4 +---
 src/Headers.php              | 4 +---
 src/Storage/Imap.php         | 4 +---
 src/Storage/Part.php         | 4 +---
 6 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/AddressList.php b/src/AddressList.php
index 24f0f61d..8aab186a 100644
--- a/src/AddressList.php
+++ b/src/AddressList.php
@@ -12,9 +12,7 @@
 use Countable;
 use Iterator;
 
-class AddressList implements
-    Countable,
-    Iterator
+class AddressList implements Countable, Iterator
 {
     /**
      * List of Address objects we're managing
diff --git a/src/Header/GenericHeader.php b/src/Header/GenericHeader.php
index 4737ff61..cc48385a 100644
--- a/src/Header/GenericHeader.php
+++ b/src/Header/GenericHeader.php
@@ -9,9 +9,7 @@
 
 namespace Zend\Mail\Header;
 
-class GenericHeader implements
-    HeaderInterface,
-    UnstructuredInterface
+class GenericHeader implements HeaderInterface, UnstructuredInterface
 {
     /**
      * @var string
diff --git a/src/Header/Received.php b/src/Header/Received.php
index 356b0093..36b38045 100644
--- a/src/Header/Received.php
+++ b/src/Header/Received.php
@@ -14,9 +14,7 @@
 /**
  * @todo       Allow setting date from DateTime, Zend\Date, or string
  */
-class Received implements
-    HeaderInterface,
-    MultipleHeadersInterface
+class Received implements HeaderInterface, MultipleHeadersInterface
 {
     /**
      * @var string
diff --git a/src/Headers.php b/src/Headers.php
index e63662f0..8e644edd 100644
--- a/src/Headers.php
+++ b/src/Headers.php
@@ -20,9 +20,7 @@
  *
  * Handles aggregation of headers
  */
-class Headers implements
-    Countable,
-    Iterator
+class Headers implements Countable, Iterator
 {
     /** @var string End of Line for fields */
     const EOL = "\r\n";
diff --git a/src/Storage/Imap.php b/src/Storage/Imap.php
index aa783498..9ef870dc 100644
--- a/src/Storage/Imap.php
+++ b/src/Storage/Imap.php
@@ -12,9 +12,7 @@
 use Zend\Mail;
 use Zend\Mail\Protocol;
 
-class Imap extends AbstractStorage implements
-    Folder\FolderInterface,
-    Writable\WritableInterface
+class Imap extends AbstractStorage implements Folder\FolderInterface, Writable\WritableInterface
 {
     // TODO: with an internal cache we could optimize this class, or create an extra class with
     // such optimizations. Especially the various fetch calls could be combined to one cache call
diff --git a/src/Storage/Part.php b/src/Storage/Part.php
index 4a9cdcc8..c75f4f48 100644
--- a/src/Storage/Part.php
+++ b/src/Storage/Part.php
@@ -14,9 +14,7 @@
 use Zend\Mail\Header\HeaderInterface;
 use Zend\Mime;
 
-class Part implements
-    RecursiveIterator,
-    Part\PartInterface
+class Part implements RecursiveIterator, Part\PartInterface
 {
     /**
      * Headers of the part

From be95b293da065f27ab0dbe5e66bbb155e5a1d59b Mon Sep 17 00:00:00 2001
From: Mike Willbanks <mike@digitalstruct.com>
Date: Thu, 20 Jun 2013 10:19:56 -0700
Subject: [PATCH 2/2] Ran php-cs-fixer to resolve coding standard violations

---
 test/TestAsset/SmtpProtocolSpy.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/TestAsset/SmtpProtocolSpy.php b/test/TestAsset/SmtpProtocolSpy.php
index becc03c0..e37bccaa 100644
--- a/test/TestAsset/SmtpProtocolSpy.php
+++ b/test/TestAsset/SmtpProtocolSpy.php
@@ -29,6 +29,7 @@ class SmtpProtocolSpy extends Smtp
     public function connect()
     {
         $this->connect = true;
+
         return true;
     }
 
@@ -121,12 +122,13 @@ public function getAuth()
     /**
      * Set Auth Status
      *
-     * @param bool $status
+     * @param  bool $status
      * @return self
      */
     public function setAuth($status)
     {
         $this->auth = (bool) $status;
+
         return $this;
     }
 
@@ -143,12 +145,13 @@ public function getSessionStatus()
     /**
      * Set Session Status
      *
-     * @param bool $status
+     * @param  bool $status
      * @return self
      */
     public function setSessionStatus($status)
     {
         $this->sess = (bool) $status;
+
         return $this;
     }
 }