ownede · ownede · May 6, 2016 · Feb 26, 2016 · Feb 26, 2016 · Apr 16, 2016
diff --git a/Composer/Composer.php b/Composer/Composer.php
@@ -2,12 +2,12 @@
 
 namespace FOS\MessageBundle\Composer;
 
-use FOS\MessageBundle\ModelManager\MessageManagerInterface;
-use FOS\MessageBundle\Sender\SenderInterface;
-use FOS\MessageBundle\Model\ThreadInterface;
-use FOS\MessageBundle\ModelManager\ThreadManagerInterface;
 use FOS\MessageBundle\MessageBuilder\NewThreadMessageBuilder;
 use FOS\MessageBundle\MessageBuilder\ReplyMessageBuilder;
+use FOS\MessageBundle\Model\ThreadInterface;
+use FOS\MessageBundle\ModelManager\MessageManagerInterface;
+use FOS\MessageBundle\ModelManager\ThreadManagerInterface;
+use FOS\MessageBundle\Sender\SenderInterface;
 
 /**
  * Factory for message builders

diff --git a/Controller/MessageController.php b/Controller/MessageController.php
@@ -2,10 +2,10 @@
 
 namespace FOS\MessageBundle\Controller;
 
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use FOS\MessageBundle\Provider\ProviderInterface;
 use Symfony\Component\DependencyInjection\ContainerAware;
 use Symfony\Component\HttpFoundation\RedirectResponse;
-use FOS\MessageBundle\Provider\ProviderInterface;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class MessageController extends ContainerAware
 {

diff --git a/DataTransformer/RecipientsDataTransformer.php b/DataTransformer/RecipientsDataTransformer.php
@@ -1,13 +1,13 @@
 <?php
 namespace FOS\MessageBundle\DataTransformer;
 
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Persistence\ObjectManager;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Doctrine\Common\Persistence\ObjectManager;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Collections\ArrayCollection;
 /**
  * Transforms collection of UserInterface into strings separated with coma
  *

diff --git a/Deleter/Deleter.php b/Deleter/Deleter.php
@@ -2,13 +2,13 @@
 
 namespace FOS\MessageBundle\Deleter;
 
-use FOS\MessageBundle\Security\AuthorizerInterface;
-use FOS\MessageBundle\Model\ThreadInterface;
-use FOS\MessageBundle\Security\ParticipantProviderInterface;
 use FOS\MessageBundle\Event\FOSMessageEvents;
 use FOS\MessageBundle\Event\ThreadEvent;
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use FOS\MessageBundle\Model\ThreadInterface;
+use FOS\MessageBundle\Security\AuthorizerInterface;
+use FOS\MessageBundle\Security\ParticipantProviderInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
 /**
  * Marks threads as deleted

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -2,8 +2,8 @@
 
 namespace FOS\MessageBundle\DependencyInjection;
 
-use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**

diff --git a/DependencyInjection/FOSMessageExtension.php b/DependencyInjection/FOSMessageExtension.php
@@ -3,11 +3,11 @@
 namespace FOS\MessageBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Processor;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
 
 class FOSMessageExtension extends Extension
 {

diff --git a/Document/Thread.php b/Document/Thread.php
@@ -2,11 +2,11 @@
 
 namespace FOS\MessageBundle\Document;
 
-use FOS\MessageBundle\Model\Thread as AbstractThread;
-use FOS\MessageBundle\Model\MessageInterface;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use FOS\MessageBundle\Model\MessageInterface;
 use FOS\MessageBundle\Model\ParticipantInterface;
+use FOS\MessageBundle\Model\Thread as AbstractThread;
 
 abstract class Thread extends AbstractThread
 {

diff --git a/DocumentManager/MessageManager.php b/DocumentManager/MessageManager.php
@@ -3,13 +3,13 @@
 namespace FOS\MessageBundle\DocumentManager;
 
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\ODM\MongoDB\Query\Builder;
 use FOS\MessageBundle\Document\Message;
 use FOS\MessageBundle\Model\MessageInterface;
-use FOS\MessageBundle\ModelManager\MessageManager as BaseMessageManager;
-use FOS\MessageBundle\Model\ReadableInterface;
 use FOS\MessageBundle\Model\ParticipantInterface;
+use FOS\MessageBundle\Model\ReadableInterface;
 use FOS\MessageBundle\Model\ThreadInterface;
-use Doctrine\ODM\MongoDB\Query\Builder;
+use FOS\MessageBundle\ModelManager\MessageManager as BaseMessageManager;
 
 /**
  * Default MongoDB MessageManager.

diff --git a/DocumentManager/ThreadManager.php b/DocumentManager/ThreadManager.php
@@ -3,12 +3,12 @@
 namespace FOS\MessageBundle\DocumentManager;
 
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\ODM\MongoDB\Query\Builder;
 use FOS\MessageBundle\Document\Thread;
-use FOS\MessageBundle\Model\ThreadInterface;
+use FOS\MessageBundle\Model\ParticipantInterface;
 use FOS\MessageBundle\Model\ReadableInterface;
+use FOS\MessageBundle\Model\ThreadInterface;
 use FOS\MessageBundle\ModelManager\ThreadManager as BaseThreadManager;
-use FOS\MessageBundle\Model\ParticipantInterface;
-use Doctrine\ODM\MongoDB\Query\Builder;
 
 /**
  * Default MongoDB ThreadManager.

diff --git a/Entity/MessageMetadata.php b/Entity/MessageMetadata.php
@@ -2,8 +2,8 @@
 
 namespace FOS\MessageBundle\Entity;
 
-use FOS\MessageBundle\Model\MessageMetadata as BaseMessageMetadata;
 use FOS\MessageBundle\Model\MessageInterface;
+use FOS\MessageBundle\Model\MessageMetadata as BaseMessageMetadata;
 
 abstract class MessageMetadata extends BaseMessageMetadata
 {

diff --git a/Entity/Thread.php b/Entity/Thread.php
@@ -5,8 +5,8 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use FOS\MessageBundle\Model\MessageInterface;
-use FOS\MessageBundle\Model\Thread as BaseThread;
 use FOS\MessageBundle\Model\ParticipantInterface;
+use FOS\MessageBundle\Model\Thread as BaseThread;
 
 use FOS\MessageBundle\Model\ThreadMetadata as ModelThreadMetadata;
 

diff --git a/EntityManager/MessageManager.php b/EntityManager/MessageManager.php
@@ -2,13 +2,13 @@
 
 namespace FOS\MessageBundle\EntityManager;
 
-use FOS\MessageBundle\ModelManager\MessageManager as BaseMessageManager;
 use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\Query\Builder;
 use FOS\MessageBundle\Model\MessageInterface;
-use FOS\MessageBundle\Model\ReadableInterface;
 use FOS\MessageBundle\Model\ParticipantInterface;
+use FOS\MessageBundle\Model\ReadableInterface;
 use FOS\MessageBundle\Model\ThreadInterface;
-use Doctrine\ORM\Query\Builder;
+use FOS\MessageBundle\ModelManager\MessageManager as BaseMessageManager;
 
 /**
  * Default ORM MessageManager.

diff --git a/EntityManager/ThreadManager.php b/EntityManager/ThreadManager.php
@@ -2,12 +2,12 @@
 
 namespace FOS\MessageBundle\EntityManager;
 
-use FOS\MessageBundle\ModelManager\ThreadManager as BaseThreadManager;
 use Doctrine\ORM\EntityManager;
-use FOS\MessageBundle\Model\ThreadInterface;
-use FOS\MessageBundle\Model\ReadableInterface;
-use FOS\MessageBundle\Model\ParticipantInterface;
 use Doctrine\ORM\Query\Builder;
+use FOS\MessageBundle\Model\ParticipantInterface;
+use FOS\MessageBundle\Model\ReadableInterface;
+use FOS\MessageBundle\Model\ThreadInterface;
+use FOS\MessageBundle\ModelManager\ThreadManager as BaseThreadManager;
 
 /**
  * Default ORM ThreadManager.

diff --git a/Event/MessageEvent.php b/Event/MessageEvent.php
@@ -2,10 +2,10 @@
 
 namespace FOS\MessageBundle\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\EventDispatcher\Event;
 use FOS\MessageBundle\Model\MessageInterface;
 use FOS\MessageBundle\Model\ThreadInterface;
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 class MessageEvent extends ThreadEvent
 {

diff --git a/Event/ReadableEvent.php b/Event/ReadableEvent.php
@@ -2,9 +2,9 @@
 
 namespace FOS\MessageBundle\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\EventDispatcher\Event;
 use FOS\MessageBundle\Model\ReadableInterface;
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 class ReadableEvent extends Event
 {

diff --git a/Event/ThreadEvent.php b/Event/ThreadEvent.php
@@ -2,9 +2,9 @@
 
 namespace FOS\MessageBundle\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\EventDispatcher\Event;
 use FOS\MessageBundle\Model\ThreadInterface;
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 class ThreadEvent extends Event
 {

diff --git a/FormFactory/AbstractMessageFormFactory.php b/FormFactory/AbstractMessageFormFactory.php
@@ -2,9 +2,9 @@
 
 namespace FOS\MessageBundle\FormFactory;
 
+use FOS\MessageBundle\FormModel\AbstractMessage;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormFactoryInterface;
-use FOS\MessageBundle\FormModel\AbstractMessage;
 
 /**
  * Instanciates message forms

diff --git a/FormHandler/AbstractMessageFormHandler.php b/FormHandler/AbstractMessageFormHandler.php
@@ -2,13 +2,14 @@
 
 namespace FOS\MessageBundle\FormHandler;
 
-use Symfony\Component\Form\Form;
-use Symfony\Component\HttpFoundation\Request;
 use FOS\MessageBundle\Composer\ComposerInterface;
 use FOS\MessageBundle\FormModel\AbstractMessage;
-use FOS\MessageBundle\Security\ParticipantProviderInterface;
 use FOS\MessageBundle\Model\ParticipantInterface;
+use FOS\MessageBundle\Security\ParticipantProviderInterface;
 use FOS\MessageBundle\Sender\SenderInterface;
+use Symfony\Component\Form\Form;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Handles messages forms, from binding request to sending the message
@@ -22,11 +23,11 @@ abstract class AbstractMessageFormHandler
     protected $sender;
     protected $participantProvider;
 
-    public function __construct(Request $request, ComposerInterface $composer, SenderInterface $sender, ParticipantProviderInterface $participantProvider)
+    public function __construct(RequestStack $requestStack, ComposerInterface $composer, SenderInterface $sender, ParticipantProviderInterface $participantProvider)
     {
-        $this->request = $request;
-        $this->composer = $composer;
-        $this->sender = $sender;
+        $this->request             = $requestStack->getCurrentRequest();
+        $this->composer            = $composer;
+        $this->sender              = $sender;
         $this->participantProvider = $participantProvider;
     }
 

diff --git a/FormType/NewThreadMessageFormType.php b/FormType/NewThreadMessageFormType.php
@@ -3,8 +3,10 @@
 namespace FOS\MessageBundle\FormType;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * Message form type for starting a new conversation
@@ -17,18 +19,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('recipient', 'fos_user_username', array('label' => 'recipient', 'translation_domain' => 'FOSMessageBundle'))
-            ->add('subject', 'text', array('label' => 'subject', 'translation_domain' => 'FOSMessageBundle'))
-            ->add('body', 'textarea', array('label' => 'body', 'translation_domain' => 'FOSMessageBundle'));
+            ->add('subject', TextType::class, array('label' => 'subject', 'translation_domain' => 'FOSMessageBundle'))
+            ->add('body', TextareaType::class, array('label' => 'body', 'translation_domain' => 'FOSMessageBundle'));
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
             'intention'  => 'message',
         ));
     }
 
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'fos_message_new_thread';
     }

diff --git a/FormType/NewThreadMultipleMessageFormType.php b/FormType/NewThreadMultipleMessageFormType.php
@@ -1,8 +1,10 @@
 <?php
 namespace FOS\MessageBundle\FormType;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * Message form type for starting a new conversation with multiple recipients
@@ -14,12 +16,12 @@ class NewThreadMultipleMessageFormType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('recipients', 'recipients_selector', array('label' => 'recipients', 'translation_domain' => 'FOSMessageBundle'))
-            ->add('subject', 'text', array('label' => 'subject', 'translation_domain' => 'FOSMessageBundle'))
-            ->add('body', 'textarea', array('label' => 'body', 'translation_domain' => 'FOSMessageBundle'));
+            ->add('recipients', RecipientsType::class, array('label' => 'recipients', 'translation_domain' => 'FOSMessageBundle'))
+            ->add('subject', TextType::class, array('label' => 'subject', 'translation_domain' => 'FOSMessageBundle'))
+            ->add('body', TextareaType::class, array('label' => 'body', 'translation_domain' => 'FOSMessageBundle'));
     }
 
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'fos_message_new_multiperson_thread';
     }

diff --git a/FormType/RecipientsType.php b/FormType/RecipientsType.php
@@ -1,11 +1,12 @@
 <?php
 namespace FOS\MessageBundle\FormType;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
 use Doctrine\Common\Persistence\ObjectManager;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use FOS\MessageBundle\DataTransformer\RecipientsDataTransformer;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * Description of RecipientsType
@@ -38,7 +39,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     /**
      * {@inheritDoc}
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
             'invalid_message' => 'The selected recipient does not exist',
@@ -50,13 +51,13 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getParent()
     {
-        return 'text';
+        return TextType::class;
     }
 
     /**
      * {@inheritDoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'recipients_selector';
     }