cleaning code

Author: jjaffeux

lib/Postmark/Attachment.php

@@ -4,19 +4,22 @@
 
 Class Attachment extends \Postmark\Inbound {
 
-    public function __construct($attachment) {
+    public function __construct($attachment)
+    {
         $this->Attachment = $attachment;
         $this->Name = $this->Attachment->Name;
         $this->ContentType = $this->Attachment->ContentType;
         $this->ContentLength = $this->Attachment->ContentLength;
         $this->Content = $this->Attachment->Content;
     }
 
-    private function _read() {
+    private function _read()
+    {
         return base64_decode(chunk_split($this->Attachment->Content));
     }
 
-    public function Download($directory) {
+    public function Download($directory)
+    {
         file_put_contents($directory . $this->Name, $this->_read());
     }
 }

lib/Postmark/Attachments.php

@@ -2,40 +2,49 @@
 
 namespace Postmark;
 
-Class Attachments extends \Postmark\Inbound  implements \Iterator{
+Class Attachments extends \Postmark\Inbound  implements \Iterator {
 
-    public function __construct($attachments) {
+    public function __construct($attachments)
+    {
         $this->attachments = $attachments;
         $this->position = 0;
     }
 
     function get($key) {
         $this->position = $key;
 
-        if( ! empty($this->attachments[$key])) {
+        if( ! empty($this->attachments[$key]))
+        {
             return new Attachment($this->attachments[$key]);
-        } else {
+        }
+        else
+        {
             return FALSE;
         }
     }
 
-    function rewind() {
+    function rewind()
+    {
         $this->position = 0;
     }
 
-    function current() {
+    function current()
+    {
         return new Attachment($this->attachments[$this->position]);
     }
 
-    function key() {
+    function key()
+    {
         return $this->position;
     }
 
-    function next() {
+    function next()
+    {
         ++$this->position;
     }
 
-    function valid() {
+    function valid()
+    {
         return isset($this->attachments[$this->position]);
     }
 

lib/Postmark/Autoloader.php

@@ -12,11 +12,13 @@ static public function register()
 
     static public function autoload($class)
     {
-        if (0 !== strpos($class, 'Postmark\Inbound')) {
+        if (0 !== strpos($class, 'Postmark\Inbound'))
+        {
             return;
         }
 
-        if (file_exists($file = dirname(__FILE__) . '/' . str_replace('Postmark/', '', preg_replace("{\\\}", "/",($class))) . '.php')) {
+        if (file_exists($file = dirname(__FILE__) . '/' . str_replace('Postmark/', '', preg_replace("{\\\}", "/",($class))) . '.php'))
+        {
             require $file;
         }
     }

lib/Postmark/Inbound.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Postmark;
 
 include('Exception.php');
@@ -22,7 +23,8 @@ class Inbound {
 
     public function __construct($Json = FALSE)
     {
-        if(empty($Json)) {
+        if(empty($Json))
+        {
             throw new InboundException('Posmark Inbound Error: you must provide a Json Source');
         }
 
@@ -34,7 +36,8 @@ private function _jsonToArray()
     {
         $Source = Json_decode($this->Json, FALSE);
 
-        switch (json_last_error()) {
+        switch (json_last_error())
+        {
             case JSON_ERROR_NONE:
                 return $Source;
             break;
@@ -64,16 +67,21 @@ public function FromName()
         return $this->Source->FromFull->Name;
     }
 
-    public function Headers($name = 'X-Spam-Status') {
-        foreach($this->Source->Headers as $header) {
-            if(isset($header->Name) AND $header->Name == $name) {
-                if($header->Name == 'Received-SPF') {
+    public function Headers($name = 'X-Spam-Status')
+    {
+        foreach($this->Source->Headers as $header)
+        {
+            if(isset($header->Name) AND $header->Name == $name)
+            {
+                if($header->Name == 'Received-SPF')
+                {
                     return self::_parseReceivedSpf($header->Value);
                 }
 
                 return $header->Value;
             }
-            else {
+            else
+            {
                 unset($header);
             }
         }
@@ -89,40 +97,43 @@ private static function _parseReceivedSpf($header)
 
     public function Recipients()
     {
-        return self::_parseRecipientsAndUndisclosedRecipients($this->Source->ToFull);
+        return self::_parseRecipients($this->Source->ToFull);
     }
 
     public function UndisclosedRecipients()
     {
-        return self::_parseRecipientsAndUndisclosedRecipients($this->Source->CcFull);
+        return self::_parseRecipients($this->Source->CcFull);
     }
 
-    private static function _parseRecipientsAndUndisclosedRecipients($recipients)
+    private static function _parseRecipients($recipients)
     {
-        $objects = array_map(function ($object) {
+        $objects = array_map(function ($object)
+        {
             $object = get_object_vars($object);
 
-            if( ! empty($object['Name'])) {
+            if( ! empty($object['Name']))
+            {
                 $object['Name'] = $object['Name'];
             }
-            else {
+            else
+            {
                 $object['Name'] = FALSE;
             }
 
-            $object['Email'] = $object['Email'];
-
             return (object)$object;
 
         }, $recipients);
 
         return $objects;
     }
 
-    public function Attachments() {
+    public function Attachments()
+    {
         return new Attachments($this->Source->Attachments);
     }
 
-    public function HasAttachments() {
+    public function HasAttachments()
+    {
         return count($this->Source->Attachments) > 0 ? TRUE : FALSE;
     }