Fixes relative to recent refactors

jamhall · Jun 28, 2011 · 27d832c · 27d832c
1 parent b409625
commit 27d832c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 5 deletions.
diff --git a/Composer/Composer.php b/Composer/Composer.php
@@ -4,6 +4,10 @@
 
 use Ornicar\MessageBundle\ModelManager\MessageManagerInterface;
 use Ornicar\MessageBundle\Sender\SenderInterface;
+use Ornicar\MessageBundle\Model\ThreadInterface;
+use Ornicar\MessageBundle\ModelManager\ThreadManagerInterface;
+use Ornicar\MessageBundle\MessageBuilder\NewThreadMessageBuilder;
+use Ornicar\MessageBundle\MessageBuilder\ReplyMessageBuilder;
 
 /**
  * Factory for message builders

diff --git a/FormHandler/AbstractMessageFormHandler.php b/FormHandler/AbstractMessageFormHandler.php
@@ -8,6 +8,7 @@
 use Ornicar\MessageBundle\FormModel\AbstractMessage;
 use Ornicar\MessageBundle\Security\ParticipantProviderInterface;
 use Ornicar\MessageBundle\Model\ParticipantInterface;
+use Ornicar\MessageBundle\Sender\SenderInterface;
 
 /**
  * Handles messages forms, from binding request to sending the message

diff --git a/FormHandler/NewThreadMessageFormHandler.php b/FormHandler/NewThreadMessageFormHandler.php
@@ -16,8 +16,9 @@ public function composeMessage(AbstractMessage $message)
     {
         return $this->composer->newThread()
             ->setSubject($message->getSubject())
-            ->setRecipient($message->getRecipient())
+            ->addRecipient($message->getRecipient())
             ->setSender($this->getAuthenticatedParticipant())
-            ->setBody($message->getBody());
+            ->setBody($message->getBody())
+            ->getMessage();
     }
 }
diff --git a/FormHandler/ReplyMessageFormHandler.php b/FormHandler/ReplyMessageFormHandler.php
@@ -16,6 +16,7 @@ public function composeMessage(AbstractMessage $message)
     {
         return $this->composer->reply($message->getThread())
             ->setSender($this->getAuthenticatedParticipant())
-            ->setBody($message->getBody());
+            ->setBody($message->getBody())
+            ->getMessage();
     }
 }
diff --git a/MessageBuilder/AbstractMessageBuilder.php b/MessageBuilder/AbstractMessageBuilder.php
@@ -72,6 +72,7 @@ public function setBody($body)
     public function setSender(ParticipantInterface $sender)
     {
         $this->message->setSender($sender);
+        $this->thread->addParticipant($sender);
 
         return $this;
     }

diff --git a/MessageBuilder/NewThreadMessageBuilder.php b/MessageBuilder/NewThreadMessageBuilder.php
@@ -32,7 +32,7 @@ public function setSubject($subject)
      */
     public function addRecipient(ParticipantInterface $recipient)
     {
-        $this->thread->addRecipient($recipient);
+        $this->thread->addParticipant($recipient);
 
         return $this;
     }

diff --git a/Resources/doc/index.rst b/Resources/doc/index.rst
@@ -253,7 +253,7 @@ Create a new message thread::
 
     $message = $composer->newThread()
         ->setSender($jack)
-        ->setRecipient($clyde)
+        ->addRecipient($clyde)
         ->setSubject('Hi there')
         ->setBody('This is a test message')
         ->getMessage();