- fix negative index problem

tonicforhealth · Apr 7, 2016 · 2ba3ff2 · 2ba3ff2
1 parent 5520e88
commit 2ba3ff2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/Email/Receive/EmailReceiveCheck.php b/src/Email/Receive/EmailReceiveCheck.php
@@ -186,7 +186,7 @@ private function performReceive(EmailSendReceive $emailSendCheckI)
     {
         try {
             $mails = $this->getMailbox()->searchMailbox(
-                'FROM '.$emailSendCheckI->getFrom().' SUBJECT '.$emailSendCheckI->getSubject()
+                'FROM '.$emailSendCheckI->getFrom().' SUBJECT "'.$emailSendCheckI->getSubject().'"'
             );
 
             $this->timeReceiveCheck($emailSendCheckI);

diff --git a/src/Email/Send/EmailSendCheck.php b/src/Email/Send/EmailSendCheck.php
@@ -22,7 +22,7 @@ class EmailSendCheck extends AbstractEmailCheck
     const CHECK = 'email-send-check';
     const MESSAGE_BODY = 'This is a test, you don\'t need to reply this massage.';
     const SEND_INTERVAL = 600;
-    const SUBJECT_TEMPLATE = '%s:time:%d';
+    const SUBJECT_TEMPLATE = '%s:time:%s';
 
     /**
      * @var int
@@ -88,9 +88,12 @@ public function check()
         $this->setEmailSendReceiveColl($this->getPersistCollection()->load());
 
 
-        $lastSandedEmail = $this->getEmailSendReceiveColl()->at(
-            $this->getEmailSendReceiveColl()->count()-1
-        );
+
+        $lastSandedEmail = $this->getEmailSendReceiveColl()->count()-1 >=0 ?
+            $this->getEmailSendReceiveColl()->at(
+                $this->getEmailSendReceiveColl()->count()-1
+            )
+            :null;
         if (null === $lastSandedEmail
             || empty($lastSandedEmail->getSentAt())
             || (time() - $lastSandedEmail->getSentAt()->getTimestamp()) > $this->getSendInterval()
@@ -195,7 +198,7 @@ protected function setToSubject($toSubject)
      */
     protected function genEmailSubject()
     {
-        return sprintf(static::SUBJECT_TEMPLATE, $this->getIndent(), date(DATE_RFC2822));
+        return sprintf(static::SUBJECT_TEMPLATE, $this->getIndent(), date(DATE_W3C));
     }
 
     /**

diff --git a/src/Email/SendReceiveCheck.php b/src/Email/SendReceiveCheck.php
@@ -65,9 +65,9 @@ public function check()
         $resultReceive = $this->emailCheck($this->getEmailReceiveCheck(), self::EMAIL_RECEIVE_CHECK_MSG);
 
         if (! $resultSend->isOk()) {
-            $result = new Failure($resultSend->getError());
+            $result = new Failure($resultSend->getError()->getMessage(), $resultSend->getError());
         } elseif (! $resultReceive->isOk()) {
-            $result = new Failure($resultReceive->getError());
+            $result = new Failure($resultReceive->getError()->getMessage(), $resultReceive->getError());
         } else {
             $result = new Success();
         }