Merge branch 'master' of git://github.com/zendframework/zf2

zendframework · Aug 13, 2012 · a4cca36 · a4cca36
commit a4cca36
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/src/Headers.php b/src/Headers.php
@@ -212,7 +212,7 @@ public function addHeaderLine($headerFieldNameOrLine, $fieldValue = null)
         if ($fieldValue === null) {
             $this->addHeader(Header\GenericHeader::fromString($headerFieldNameOrLine));
         } elseif (is_array($fieldValue)) {
-            foreach($fieldValue as $i) {
+            foreach ($fieldValue as $i) {
                 $this->addHeader(new Header\GenericMultiHeader($headerFieldNameOrLine, $i));
             }
         } else {
@@ -291,7 +291,7 @@ public function get($name)
             }
         }
 
-        switch(count($results)) {
+        switch (count($results)) {
             case 0:
                 return false;
             case 1:

diff --git a/src/Storage/AbstractStorage.php b/src/Storage/AbstractStorage.php
@@ -219,7 +219,7 @@ public function offsetExists($id)
             if ($this->getMessage($id)) {
                 return true;
             }
-        } catch(Exception\ExceptionInterface $e) {}
+        } catch (Exception\ExceptionInterface $e) {}
 
         return false;
      }

diff --git a/src/Storage/Folder/Maildir.php b/src/Storage/Folder/Maildir.php
@@ -193,7 +193,7 @@ public function selectFolder($globalName)
 
         try {
             $this->_openMaildir($this->rootdir . '.' . $folder->getGlobalName());
-        } catch(Exception\ExceptionInterface $e) {
+        } catch (Exception\ExceptionInterface $e) {
             // check what went wrong
             if (!$folder->isSelectable()) {
                 throw new Exception\RuntimeException("{$this->currentFolder} is not selectable", 0, $e);

diff --git a/src/Storage/Folder/Mbox.php b/src/Storage/Folder/Mbox.php
@@ -167,7 +167,7 @@ public function selectFolder($globalName)
 
         try {
             $this->openMboxFile($this->rootdir . $folder->getGlobalName());
-        } catch(Exception\ExceptionInterface $e) {
+        } catch (Exception\ExceptionInterface $e) {
             // check what went wrong
             if (!$folder->isSelectable()) {
                 throw new Exception\RuntimeException("{$this->currentFolder} is not selectable", 0, $e);

diff --git a/src/Storage/Imap.php b/src/Storage/Imap.php
@@ -190,7 +190,7 @@ public function __construct($params)
             $this->protocol = $params;
             try {
                 $this->selectFolder('INBOX');
-            } catch(Exception\ExceptionInterface $e) {
+            } catch (Exception\ExceptionInterface $e) {
                 throw new Exception\RuntimeException('cannot select INBOX, is this a valid transport?', 0, $e);
             }
             return;

diff --git a/src/Storage/Part.php b/src/Storage/Part.php
@@ -130,7 +130,7 @@ public function isMultipart()
     {
         try {
             return stripos($this->contentType, 'multipart/') === 0;
-        } catch(Exception\ExceptionInterface $e) {
+        } catch (Exception\ExceptionInterface $e) {
             return false;
         }
     }

diff --git a/src/Storage/Pop3.php b/src/Storage/Pop3.php
@@ -262,7 +262,7 @@ public function __get($var)
                 // need to make a real call, because not all server are honest in their capas
                 try {
                     $this->protocol->top(1, 0, false);
-                } catch(MailException\ExceptionInterface $e) {
+                } catch (MailException\ExceptionInterface $e) {
                     // ignoring error
                 }
             }
@@ -274,7 +274,7 @@ public function __get($var)
             $id = null;
             try {
                 $id = $this->protocol->uniqueid(1);
-            } catch(MailException\ExceptionInterface $e) {
+            } catch (MailException\ExceptionInterface $e) {
                 // ignoring error
             }
             $this->has['uniqueid'] = $id ? true : false;