DIAM-1832 add check for non-existent header

eltrino · Feb 8, 2017 · 67bebcc · 67bebcc
1 parent 4269908
commit 67bebcc
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/src/Diamante/EmailProcessingBundle/Infrastructure/Message/Zend/ImapMessageProvider.php b/src/Diamante/EmailProcessingBundle/Infrastructure/Message/Zend/ImapMessageProvider.php
@@ -112,22 +112,24 @@ protected function isAutoresponder(Headers $headers)
  foreach ($autoresponderHeaders as $header => $value) {
  $headerEntity = $headers->get($header);
 
- if ($headerEntity instanceof \ArrayIterator) {
- foreach ($headerEntity->getArrayCopy() as $k => $nestedHeader) {
- if (!$nestedHeader instanceof HeaderInterface) {
- throw new MessageProcessingException('Expected type header ArrayIterator or HeaderInterface');
+ if ($headerEntity) {
+ if ($headerEntity instanceof \ArrayIterator) {
+ foreach ($headerEntity->getArrayCopy() as $k => $nestedHeader) {
+ if (!$nestedHeader instanceof HeaderInterface) {
+ throw new MessageProcessingException('Expected type header HeaderInterface');
+ }
+
+ if ($this->checkAutoresponder($nestedHeader, $value)) {
+ return true;
+ }
  }
-
- if ($this->checkAutoresponder($nestedHeader, $value)) {
+ } elseif ($headerEntity instanceof HeaderInterface) {
+ if ($this->checkAutoresponder($headerEntity, $value)) {
  return true;
  }
+ } else {
+ throw new MessageProcessingException('Expected type header ArrayIterator or HeaderInterface');
  }
- } elseif ($headerEntity instanceof HeaderInterface) {
- if ($this->checkAutoresponder($headerEntity, $value)) {
- return true;
- }
- } else {
- throw new MessageProcessingException('Expected type header ArrayIterator or HeaderInterface');
  }
  }