From c15f204b37150943051acbe62572e324ccaecbc1 Mon Sep 17 00:00:00 2001 From: Denis Medved Date: Fri, 26 Feb 2016 16:50:04 +0200 Subject: [PATCH 01/16] fix of deprecated functions --- Composer/Composer.php | 8 ++--- Controller/MessageController.php | 4 +-- DataTransformer/RecipientsDataTransformer.php | 6 ++-- Deleter/Deleter.php | 8 ++--- DependencyInjection/Configuration.php | 2 +- DependencyInjection/FOSMessageExtension.php | 6 ++-- Document/Thread.php | 6 ++-- DocumentManager/MessageManager.php | 6 ++-- DocumentManager/ThreadManager.php | 6 ++-- Entity/MessageMetadata.php | 2 +- Entity/Thread.php | 2 +- EntityManager/MessageManager.php | 6 ++-- EntityManager/ThreadManager.php | 8 ++--- Event/MessageEvent.php | 4 +-- Event/ReadableEvent.php | 4 +-- Event/ThreadEvent.php | 4 +-- FormFactory/AbstractMessageFormFactory.php | 2 +- FormHandler/AbstractMessageFormHandler.php | 15 ++++---- FormType/NewThreadMessageFormType.php | 12 ++++--- FormType/NewThreadMultipleMessageFormType.php | 12 ++++--- FormType/RecipientsType.php | 13 +++---- FormType/ReplyMessageFormType.php | 9 ++--- MessageBuilder/NewThreadMessageBuilder.php | 2 +- MessageBuilder/ReplyMessageBuilder.php | 2 +- ModelManager/ReadableManagerInterface.php | 2 +- Provider/Provider.php | 8 ++--- Reader/Reader.php | 6 ++-- Resources/config/config.xml | 4 +-- Resources/config/form.xml | 34 ++++++++----------- Resources/config/spam_detection.xml | 2 +- Resources/config/validator.xml | 2 +- Search/QueryFactory.php | 9 ++--- Security/Authorizer.php | 4 +-- Security/AuthorizerInterface.php | 2 +- Security/ParticipantProvider.php | 4 +-- Sender/Sender.php | 6 ++-- SpamDetection/AkismetSpamDetector.php | 2 +- Tests/Document/ThreadDenormalizerTest.php | 2 +- Tests/bootstrap.php | 2 +- Twig/Extension/MessageExtension.php | 4 +-- Validator/AuthorizationValidator.php | 2 +- Validator/ReplyAuthorizationValidator.php | 4 +-- Validator/SelfRecipientValidator.php | 2 +- Validator/SpamValidator.php | 2 +- 44 files changed, 127 insertions(+), 125 deletions(-) diff --git a/Composer/Composer.php b/Composer/Composer.php index b76a9e02..78adc343 100644 --- 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 index 28c06a63..b451d4ae 100644 --- 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 index 39cd4d07..245146f2 100644 --- a/DataTransformer/RecipientsDataTransformer.php +++ b/DataTransformer/RecipientsDataTransformer.php @@ -1,13 +1,13 @@ 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 index 772e6921..3b596060 100644 --- 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 index a9836baf..47d63e89 100644 --- a/FormType/NewThreadMultipleMessageFormType.php +++ b/FormType/NewThreadMultipleMessageFormType.php @@ -1,8 +1,10 @@ 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 index d8cc7090..1f29c30a 100644 --- a/FormType/RecipientsType.php +++ b/FormType/RecipientsType.php @@ -1,11 +1,12 @@ 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'; } diff --git a/FormType/ReplyMessageFormType.php b/FormType/ReplyMessageFormType.php index c2780ba4..f7dda0b5 100644 --- a/FormType/ReplyMessageFormType.php +++ b/FormType/ReplyMessageFormType.php @@ -3,8 +3,9 @@ namespace FOS\MessageBundle\FormType; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * Form type for a reply @@ -16,17 +17,17 @@ class ReplyMessageFormType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('body', 'textarea', array('label' => 'body', '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' => 'reply', )); } - public function getName() + public function getBlockPrefix() { return 'fos_message_reply_message'; } diff --git a/MessageBuilder/NewThreadMessageBuilder.php b/MessageBuilder/NewThreadMessageBuilder.php index 6cd13d5e..dfadbf32 100644 --- a/MessageBuilder/NewThreadMessageBuilder.php +++ b/MessageBuilder/NewThreadMessageBuilder.php @@ -2,10 +2,10 @@ namespace FOS\MessageBundle\MessageBuilder; +use Doctrine\Common\Collections\Collection; use FOS\MessageBundle\Model\MessageInterface; use FOS\MessageBundle\Model\ParticipantInterface; use FOS\MessageBundle\Sender\SenderInterface; -use Doctrine\Common\Collections\Collection; /** * Fluent interface message builder for new thread messages diff --git a/MessageBuilder/ReplyMessageBuilder.php b/MessageBuilder/ReplyMessageBuilder.php index 964a0135..b1deb553 100644 --- a/MessageBuilder/ReplyMessageBuilder.php +++ b/MessageBuilder/ReplyMessageBuilder.php @@ -4,8 +4,8 @@ use FOS\MessageBundle\Model\MessageInterface; use FOS\MessageBundle\Model\ParticipantInterface; -use FOS\MessageBundle\Sender\SenderInterface; use FOS\MessageBundle\Model\ThreadInterface; +use FOS\MessageBundle\Sender\SenderInterface; /** * Fluent interface message builder for reply to a thread diff --git a/ModelManager/ReadableManagerInterface.php b/ModelManager/ReadableManagerInterface.php index 94b90868..8df5633a 100644 --- a/ModelManager/ReadableManagerInterface.php +++ b/ModelManager/ReadableManagerInterface.php @@ -2,8 +2,8 @@ namespace FOS\MessageBundle\ModelManager; -use FOS\MessageBundle\Model\ReadableInterface; use FOS\MessageBundle\Model\ParticipantInterface; +use FOS\MessageBundle\Model\ReadableInterface; /** * Capable of updating the read state of objects directly in the storage, diff --git a/Provider/Provider.php b/Provider/Provider.php index 55fe1ce6..232d308b 100644 --- a/Provider/Provider.php +++ b/Provider/Provider.php @@ -2,13 +2,13 @@ namespace FOS\MessageBundle\Provider; -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Symfony\Component\Security\Core\Exception\AccessDeniedException; +use FOS\MessageBundle\ModelManager\MessageManagerInterface; use FOS\MessageBundle\ModelManager\ThreadManagerInterface; -use FOS\MessageBundle\Security\AuthorizerInterface; use FOS\MessageBundle\Reader\ReaderInterface; +use FOS\MessageBundle\Security\AuthorizerInterface; use FOS\MessageBundle\Security\ParticipantProviderInterface; -use FOS\MessageBundle\ModelManager\MessageManagerInterface; +use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; +use Symfony\Component\Security\Core\Exception\AccessDeniedException; /** * Provides threads for the current authenticated user diff --git a/Reader/Reader.php b/Reader/Reader.php index 1ddcf463..1bd72e1e 100644 --- a/Reader/Reader.php +++ b/Reader/Reader.php @@ -2,11 +2,11 @@ namespace FOS\MessageBundle\Reader; -use FOS\MessageBundle\Security\ParticipantProviderInterface; -use FOS\MessageBundle\Model\ReadableInterface; -use FOS\MessageBundle\ModelManager\ReadableManagerInterface; use FOS\MessageBundle\Event\FOSMessageEvents; use FOS\MessageBundle\Event\ReadableEvent; +use FOS\MessageBundle\Model\ReadableInterface; +use FOS\MessageBundle\ModelManager\ReadableManagerInterface; +use FOS\MessageBundle\Security\ParticipantProviderInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; /** diff --git a/Resources/config/config.xml b/Resources/config/config.xml index 89291466..ec0405bb 100644 --- a/Resources/config/config.xml +++ b/Resources/config/config.xml @@ -58,8 +58,8 @@ - - + + diff --git a/Resources/config/form.xml b/Resources/config/form.xml index 45524a66..a3d4b75d 100644 --- a/Resources/config/form.xml +++ b/Resources/config/form.xml @@ -26,26 +26,20 @@ %fos_message.reply_form.model% - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/Resources/config/spam_detection.xml b/Resources/config/spam_detection.xml index 8e0e27d2..553ca1da 100644 --- a/Resources/config/spam_detection.xml +++ b/Resources/config/spam_detection.xml @@ -8,7 +8,7 @@ - + diff --git a/Resources/config/validator.xml b/Resources/config/validator.xml index a7f111fb..4126a42c 100644 --- a/Resources/config/validator.xml +++ b/Resources/config/validator.xml @@ -17,7 +17,7 @@ - + diff --git a/Search/QueryFactory.php b/Search/QueryFactory.php index a735205c..9c88910e 100644 --- a/Search/QueryFactory.php +++ b/Search/QueryFactory.php @@ -3,6 +3,7 @@ namespace FOS\MessageBundle\Search; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\RequestStack; /** * Gets the search term from the request and prepares it @@ -12,7 +13,7 @@ class QueryFactory implements QueryFactoryInterface /** * @var Request */ - protected $request = null; + protected $request; /** * the query parameter containing the search term @@ -24,12 +25,12 @@ class QueryFactory implements QueryFactoryInterface /** * Instanciates a new TermGetter * - * @param Request $request + * @param RequestStack $requestStack * @param string $queryParameter */ - public function __construct(Request $request, $queryParameter) + public function __construct(RequestStack $requestStack, $queryParameter) { - $this->request = $request; + $this->request = $requestStack->getCurrentRequest(); $this->queryParameter = $queryParameter; } diff --git a/Security/Authorizer.php b/Security/Authorizer.php index 432af194..e2c5e08f 100644 --- a/Security/Authorizer.php +++ b/Security/Authorizer.php @@ -2,10 +2,10 @@ namespace FOS\MessageBundle\Security; -use FOS\MessageBundle\Model\ThreadInterface; -use Symfony\Component\Security\Core\Exception\AccessDeniedException; use FOS\MessageBundle\Model\ParticipantInterface; +use FOS\MessageBundle\Model\ThreadInterface; use FOS\MessageBundle\Security\ParticipantProviderInterface; +use Symfony\Component\Security\Core\Exception\AccessDeniedException; /** * Manages permissions to manipulate threads and messages diff --git a/Security/AuthorizerInterface.php b/Security/AuthorizerInterface.php index f4ec91ec..0de44910 100644 --- a/Security/AuthorizerInterface.php +++ b/Security/AuthorizerInterface.php @@ -2,8 +2,8 @@ namespace FOS\MessageBundle\Security; -use FOS\MessageBundle\Model\ThreadInterface; use FOS\MessageBundle\Model\ParticipantInterface; +use FOS\MessageBundle\Model\ThreadInterface; /** * Manages permissions to manipulate threads and messages diff --git a/Security/ParticipantProvider.php b/Security/ParticipantProvider.php index f1fd7b70..f6442e2f 100644 --- a/Security/ParticipantProvider.php +++ b/Security/ParticipantProvider.php @@ -2,9 +2,9 @@ namespace FOS\MessageBundle\Security; -use Symfony\Component\Security\Core\SecurityContextInterface; -use Symfony\Component\Security\Core\Exception\AccessDeniedException; use FOS\MessageBundle\Model\ParticipantInterface; +use Symfony\Component\Security\Core\Exception\AccessDeniedException; +use Symfony\Component\Security\Core\SecurityContextInterface; /** * Provides the authenticated participant diff --git a/Sender/Sender.php b/Sender/Sender.php index 5fa3cc33..2af463f4 100644 --- a/Sender/Sender.php +++ b/Sender/Sender.php @@ -2,11 +2,11 @@ namespace FOS\MessageBundle\Sender; +use FOS\MessageBundle\Event\FOSMessageEvents; +use FOS\MessageBundle\Event\MessageEvent; +use FOS\MessageBundle\Model\MessageInterface; use FOS\MessageBundle\ModelManager\MessageManagerInterface; use FOS\MessageBundle\ModelManager\ThreadManagerInterface; -use FOS\MessageBundle\Model\MessageInterface; -use FOS\MessageBundle\Event\MessageEvent; -use FOS\MessageBundle\Event\FOSMessageEvents; use Symfony\Component\EventDispatcher\EventDispatcherInterface; /** diff --git a/SpamDetection/AkismetSpamDetector.php b/SpamDetection/AkismetSpamDetector.php index 6bba9bd8..c4e2e897 100644 --- a/SpamDetection/AkismetSpamDetector.php +++ b/SpamDetection/AkismetSpamDetector.php @@ -2,9 +2,9 @@ namespace FOS\MessageBundle\SpamDetection; -use Ornicar\AkismetBundle\Akismet\AkismetInterface; use FOS\MessageBundle\FormModel\NewThreadMessage; use FOS\MessageBundle\Security\ParticipantProviderInterface; +use Ornicar\AkismetBundle\Akismet\AkismetInterface; class AkismetSpamDetector implements SpamDetectorInterface { diff --git a/Tests/Document/ThreadDenormalizerTest.php b/Tests/Document/ThreadDenormalizerTest.php index 2051998a..cf791920 100644 --- a/Tests/Document/ThreadDenormalizerTest.php +++ b/Tests/Document/ThreadDenormalizerTest.php @@ -3,9 +3,9 @@ namespace FOS\MessageBundle\Document; use DateTime; -use FOS\MessageBundle\Model\ParticipantInterface; use Doctrine\Common\Collections\ArrayCollection; use FOS\MessageBundle\Model\MessageInterface; +use FOS\MessageBundle\Model\ParticipantInterface; class ThreadDenormalizerTest extends \PHPUnit_Framework_TestCase { diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php index 70526bb5..88a46abb 100644 --- a/Tests/bootstrap.php +++ b/Tests/bootstrap.php @@ -1,7 +1,7 @@ Date: Fri, 26 Feb 2016 17:58:05 +0200 Subject: [PATCH 02/16] fix deprecated security.context --- Resources/config/config.xml | 2 +- .../doc/90-sending-a-message-programatically.md | 2 +- Security/ParticipantProvider.php | 16 ++++++---------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Resources/config/config.xml b/Resources/config/config.xml index ec0405bb..8734dd5a 100644 --- a/Resources/config/config.xml +++ b/Resources/config/config.xml @@ -18,7 +18,7 @@ - + diff --git a/Resources/doc/90-sending-a-message-programatically.md b/Resources/doc/90-sending-a-message-programatically.md index fa0ca0c3..db010c50 100644 --- a/Resources/doc/90-sending-a-message-programatically.md +++ b/Resources/doc/90-sending-a-message-programatically.md @@ -18,7 +18,7 @@ This is probably all you will need in many cases. To compose a message we retrieve the composer service and compose our message: ```php - $sender = $this->get('security.context')->getToken()->getUser(); + $sender = $this->get('security.token_storage')->getToken()->getUser(); $threadBuilder = $this->get('fos_message.composer')->newThread(); $threadBuilder ->addRecipient($recipient) // Retrieved from your backend, your user manager or ... diff --git a/Security/ParticipantProvider.php b/Security/ParticipantProvider.php index f6442e2f..203bc3c0 100644 --- a/Security/ParticipantProvider.php +++ b/Security/ParticipantProvider.php @@ -3,8 +3,8 @@ namespace FOS\MessageBundle\Security; use FOS\MessageBundle\Model\ParticipantInterface; +use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Security\Core\Exception\AccessDeniedException; -use Symfony\Component\Security\Core\SecurityContextInterface; /** * Provides the authenticated participant @@ -13,16 +13,12 @@ */ class ParticipantProvider implements ParticipantProviderInterface { - /** - * The security context - * - * @var SecurityContextInterface - */ - protected $securityContext; + /** @var TokenStorageInterface */ + protected $tokenStorage; - public function __construct(SecurityContextInterface $securityContext) + public function __construct(TokenStorageInterface $tokenStorage) { - $this->securityContext = $securityContext; + $this->tokenStorage = $tokenStorage; } /** @@ -32,7 +28,7 @@ public function __construct(SecurityContextInterface $securityContext) */ public function getAuthenticatedParticipant() { - $participant = $this->securityContext->getToken()->getUser(); + $participant = $this->tokenStorage->getToken()->getUser(); if (!$participant instanceof ParticipantInterface) { throw new AccessDeniedException('Must be logged in with a ParticipantInterface instance'); From 5a5aaf0476c7198168a32eb93506d140b3ccfc83 Mon Sep 17 00:00:00 2001 From: Dennis Fridrich Date: Sat, 2 Apr 2016 11:08:58 +0200 Subject: [PATCH 03/16] Add Czech translation --- .../translations/FOSMessageBundle.cs.yml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Resources/translations/FOSMessageBundle.cs.yml diff --git a/Resources/translations/FOSMessageBundle.cs.yml b/Resources/translations/FOSMessageBundle.cs.yml new file mode 100644 index 00000000..0db8ed3a --- /dev/null +++ b/Resources/translations/FOSMessageBundle.cs.yml @@ -0,0 +1,27 @@ +messenger: Zprávy +inbox: Přijaté +sent: Odeslané +deleted: Smazané +send_new: Poslat novou zprávu +search: Hledat +threads_found: {1}Nalezena %num% konverzace s|[2,4]Nalezeny %num% konverzace s|[5,Inf]Nalezeno %count% konverzací s + +message_info: Od %sender% z %date% +reply: Odpovědět + +subject: Předmět +starter: Započal +startdate: Začátek +messages: Zprávy +last_message: Poslední zpráva +actions: Akce +new: Nová +goto_last: Jít na poslední zprávu +on: Z %date% +by: Od %sender% +no_thread: Žádná konverzace ke zobrazení +delete: Smazat +undelete: Obnovit +recipient: Příjemce +recipients: Příjemci +body: Obsah From f502d3584e81793c1ef25aea93fcfe7ba7c51f22 Mon Sep 17 00:00:00 2001 From: Dennis Fridrich Date: Sat, 2 Apr 2016 11:10:11 +0200 Subject: [PATCH 04/16] Fix a typo --- Resources/translations/FOSMessageBundle.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/translations/FOSMessageBundle.en.yml b/Resources/translations/FOSMessageBundle.en.yml index 816a4723..d8923642 100644 --- a/Resources/translations/FOSMessageBundle.en.yml +++ b/Resources/translations/FOSMessageBundle.en.yml @@ -11,7 +11,7 @@ reply: Reply subject: Subject starter: Starter -startdate: StartDate +startdate: Start date messages: Messages last_message: Last message actions: Actions From fd2752fd182031f2962ab5dd8aefdf8380aa3c5d Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Sat, 16 Apr 2016 16:34:13 -0700 Subject: [PATCH 05/16] Fixing deprecations --- Resources/config/routing.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/config/routing.xml b/Resources/config/routing.xml index d4329c05..0416272d 100644 --- a/Resources/config/routing.xml +++ b/Resources/config/routing.xml @@ -4,37 +4,37 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd"> - + FOSMessageBundle:Message:inbox - + FOSMessageBundle:Message:sent - + FOSMessageBundle:Message:deleted - + FOSMessageBundle:Message:search - + FOSMessageBundle:Message:newThread - + FOSMessageBundle:Message:delete - POST|DELETE + POST DELETE - + FOSMessageBundle:Message:undelete - POST + POST - + FOSMessageBundle:Message:thread From c78c9a763de45b9f564cff65807e0e42954a67c1 Mon Sep 17 00:00:00 2001 From: Dennis Fridrich Date: Mon, 18 Apr 2016 14:18:53 +0200 Subject: [PATCH 06/16] Fix a typo --- Resources/translations/FOSMessageBundle.cs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/translations/FOSMessageBundle.cs.yml b/Resources/translations/FOSMessageBundle.cs.yml index 0db8ed3a..d505ef2f 100644 --- a/Resources/translations/FOSMessageBundle.cs.yml +++ b/Resources/translations/FOSMessageBundle.cs.yml @@ -4,7 +4,7 @@ sent: Odeslané deleted: Smazané send_new: Poslat novou zprávu search: Hledat -threads_found: {1}Nalezena %num% konverzace s|[2,4]Nalezeny %num% konverzace s|[5,Inf]Nalezeno %count% konverzací s +threads_found: "{1}Nalezena %num% konverzace s|[2,4]Nalezeny %num% konverzace s|[5,Inf]Nalezeno %count% konverzací s" message_info: Od %sender% z %date% reply: Odpovědět From ce904d70217eddb607732053857489b32c144321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Sm=C3=B3=C5=82kowski?= Date: Fri, 6 May 2016 14:18:02 +0200 Subject: [PATCH 07/16] Removed use of ContainerAware (removed in Symfony 3.0) --- Controller/MessageController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Controller/MessageController.php b/Controller/MessageController.php index b451d4ae..75ad0082 100644 --- a/Controller/MessageController.php +++ b/Controller/MessageController.php @@ -3,11 +3,12 @@ namespace FOS\MessageBundle\Controller; use FOS\MessageBundle\Provider\ProviderInterface; -use Symfony\Component\DependencyInjection\ContainerAware; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\RedirectResponse; +use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -class MessageController extends ContainerAware +class MessageController extends Controller { /** * Displays the authenticated participant inbox From 1837ca135bc5acc67a53237117ca3bc415b44f5c Mon Sep 17 00:00:00 2001 From: Geoffrey Bachelet Date: Wed, 11 May 2016 11:01:51 +0200 Subject: [PATCH 08/16] Update scoped services to use request_stack --- FormHandler/AbstractMessageFormHandler.php | 6 +++--- Resources/config/config.xml | 4 ++-- Resources/config/form.xml | 12 ++++++------ Resources/config/spam_detection.xml | 2 +- Resources/config/validator.xml | 2 +- Search/QueryFactory.php | 10 +++++----- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/FormHandler/AbstractMessageFormHandler.php b/FormHandler/AbstractMessageFormHandler.php index 07a8ad73..cbe7d500 100644 --- a/FormHandler/AbstractMessageFormHandler.php +++ b/FormHandler/AbstractMessageFormHandler.php @@ -3,7 +3,7 @@ namespace FOS\MessageBundle\FormHandler; use Symfony\Component\Form\Form; -use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\RequestStack; use FOS\MessageBundle\Composer\ComposerInterface; use FOS\MessageBundle\FormModel\AbstractMessage; use FOS\MessageBundle\Security\ParticipantProviderInterface; @@ -22,9 +22,9 @@ 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->request = $requestStack->getCurrentRequest(); $this->composer = $composer; $this->sender = $sender; $this->participantProvider = $participantProvider; diff --git a/Resources/config/config.xml b/Resources/config/config.xml index 89291466..ec0405bb 100644 --- a/Resources/config/config.xml +++ b/Resources/config/config.xml @@ -58,8 +58,8 @@ - - + + diff --git a/Resources/config/form.xml b/Resources/config/form.xml index 45524a66..ed532f0c 100644 --- a/Resources/config/form.xml +++ b/Resources/config/form.xml @@ -26,22 +26,22 @@ %fos_message.reply_form.model% - - + + - - + + - - + + diff --git a/Resources/config/spam_detection.xml b/Resources/config/spam_detection.xml index 8e0e27d2..e1edd393 100644 --- a/Resources/config/spam_detection.xml +++ b/Resources/config/spam_detection.xml @@ -8,7 +8,7 @@ - + diff --git a/Resources/config/validator.xml b/Resources/config/validator.xml index a7f111fb..4126a42c 100644 --- a/Resources/config/validator.xml +++ b/Resources/config/validator.xml @@ -17,7 +17,7 @@ - + diff --git a/Search/QueryFactory.php b/Search/QueryFactory.php index a735205c..299b492c 100644 --- a/Search/QueryFactory.php +++ b/Search/QueryFactory.php @@ -2,7 +2,7 @@ namespace FOS\MessageBundle\Search; -use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\RequestStack; /** * Gets the search term from the request and prepares it @@ -10,7 +10,7 @@ class QueryFactory implements QueryFactoryInterface { /** - * @var Request + * @var \Symfony\Component\HttpFoundation\Request */ protected $request = null; @@ -24,12 +24,12 @@ class QueryFactory implements QueryFactoryInterface /** * Instanciates a new TermGetter * - * @param Request $request + * @param RequestStack $requestStack * @param string $queryParameter */ - public function __construct(Request $request, $queryParameter) + public function __construct(RequestStack $requestStack, $queryParameter) { - $this->request = $request; + $this->request = $requestStack->getCurrentRequest(); $this->queryParameter = $queryParameter; } From d0c34814da8f7e7de3b50f6ab21309489e920752 Mon Sep 17 00:00:00 2001 From: Geoffrey Bachelet Date: Wed, 11 May 2016 11:13:51 +0200 Subject: [PATCH 09/16] Update services to use token storage instead of security context --- Resources/config/config.xml | 2 +- Security/ParticipantProvider.php | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/config/config.xml b/Resources/config/config.xml index ec0405bb..8734dd5a 100644 --- a/Resources/config/config.xml +++ b/Resources/config/config.xml @@ -18,7 +18,7 @@ - + diff --git a/Security/ParticipantProvider.php b/Security/ParticipantProvider.php index f1fd7b70..b508bb93 100644 --- a/Security/ParticipantProvider.php +++ b/Security/ParticipantProvider.php @@ -2,7 +2,7 @@ namespace FOS\MessageBundle\Security; -use Symfony\Component\Security\Core\SecurityContextInterface; +use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use FOS\MessageBundle\Model\ParticipantInterface; @@ -14,15 +14,15 @@ class ParticipantProvider implements ParticipantProviderInterface { /** - * The security context + * The token storage * - * @var SecurityContextInterface + * @var TokenStorageInterface */ - protected $securityContext; + protected $tokenStorage; - public function __construct(SecurityContextInterface $securityContext) + public function __construct(TokenStorageInterface $tokenStorage) { - $this->securityContext = $securityContext; + $this->tokenStorage = $tokenStorage; } /** @@ -32,7 +32,7 @@ public function __construct(SecurityContextInterface $securityContext) */ public function getAuthenticatedParticipant() { - $participant = $this->securityContext->getToken()->getUser(); + $participant = $this->tokenStorage->getToken()->getUser(); if (!$participant instanceof ParticipantInterface) { throw new AccessDeniedException('Must be logged in with a ParticipantInterface instance'); From f5843ea9ba5067f99b3647f6f4d030be0a0a8bf1 Mon Sep 17 00:00:00 2001 From: Geoffrey Bachelet Date: Wed, 11 May 2016 11:20:33 +0200 Subject: [PATCH 10/16] Switch from ContainerAware to ContainerAwareInterface --- Controller/MessageController.php | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/Controller/MessageController.php b/Controller/MessageController.php index 28c06a63..a2b20d64 100644 --- a/Controller/MessageController.php +++ b/Controller/MessageController.php @@ -3,12 +3,26 @@ namespace FOS\MessageBundle\Controller; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Symfony\Component\DependencyInjection\ContainerAware; +use Symfony\Component\DependencyInjection\ContainerAwareInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\RedirectResponse; use FOS\MessageBundle\Provider\ProviderInterface; -class MessageController extends ContainerAware +class MessageController implements ContainerAwareInterface { + /** + * @var ContainerInterface + */ + private $container; + + /** + * {@inheritDoc} + */ + public function setContainer(ContainerInterface $container = null) + { + $this->container = $container; + } + /** * Displays the authenticated participant inbox * @@ -55,7 +69,7 @@ public function deletedAction() * Displays a thread, also allows to reply to it * * @param string $threadId the thread id - * + * * @return Response */ public function threadAction($threadId) @@ -100,9 +114,9 @@ public function newThreadAction() /** * Deletes a thread - * + * * @param string $threadId the thread id - * + * * @return RedirectResponse */ public function deleteAction($threadId) @@ -113,12 +127,12 @@ public function deleteAction($threadId) return new RedirectResponse($this->container->get('router')->generate('fos_message_inbox')); } - + /** * Undeletes a thread - * + * * @param string $threadId - * + * * @return RedirectResponse */ public function undeleteAction($threadId) From e367a88d15f1cadafb39897301d4284ef084b042 Mon Sep 17 00:00:00 2001 From: Geoffrey Bachelet Date: Wed, 11 May 2016 12:19:44 +0200 Subject: [PATCH 11/16] Make container property protected in message controller --- Controller/MessageController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/MessageController.php b/Controller/MessageController.php index a2b20d64..65b05960 100644 --- a/Controller/MessageController.php +++ b/Controller/MessageController.php @@ -13,7 +13,7 @@ class MessageController implements ContainerAwareInterface /** * @var ContainerInterface */ - private $container; + protected $container; /** * {@inheritDoc} From b865d10794906af19ff4b84c56cfa5297525373f Mon Sep 17 00:00:00 2001 From: Geoffrey Bachelet Date: Wed, 11 May 2016 12:51:13 +0200 Subject: [PATCH 12/16] Update form factory configuration --- DependencyInjection/Configuration.php | 4 ++-- DependencyInjection/FOSMessageExtension.php | 4 ++-- FormFactory/AbstractMessageFormFactory.php | 11 +++++------ FormFactory/NewThreadMessageFormFactory.php | 2 +- FormFactory/ReplyMessageFormFactory.php | 2 +- Resources/config/form.xml | 8 ++------ 6 files changed, 13 insertions(+), 18 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 777fed9a..8d26241c 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -51,7 +51,7 @@ public function getConfigTreeBuilder() ->addDefaultsIfNotSet() ->children() ->scalarNode('factory')->defaultValue('fos_message.new_thread_form.factory.default')->cannotBeEmpty()->end() - ->scalarNode('type')->defaultValue('fos_message.new_thread_form.type.default')->cannotBeEmpty()->end() + ->scalarNode('class')->defaultValue('FOS\MessageBundle\FormType\NewThreadMessageFormType')->cannotBeEmpty()->end() ->scalarNode('handler')->defaultValue('fos_message.new_thread_form.handler.default')->cannotBeEmpty()->end() ->scalarNode('name')->defaultValue('message')->cannotBeEmpty()->end() ->scalarNode('model')->defaultValue('FOS\MessageBundle\FormModel\NewThreadMessage')->end() @@ -61,7 +61,7 @@ public function getConfigTreeBuilder() ->addDefaultsIfNotSet() ->children() ->scalarNode('factory')->defaultValue('fos_message.reply_form.factory.default')->cannotBeEmpty()->end() - ->scalarNode('type')->defaultValue('fos_message.reply_form.type.default')->cannotBeEmpty()->end() + ->scalarNode('class')->defaultValue('FOS\MessageBundle\FormType\ReplyMessageFormType')->cannotBeEmpty()->end() ->scalarNode('handler')->defaultValue('fos_message.reply_form.handler.default')->cannotBeEmpty()->end() ->scalarNode('name')->defaultValue('message')->cannotBeEmpty()->end() ->scalarNode('model')->defaultValue('FOS\MessageBundle\FormModel\ReplyMessage')->end() diff --git a/DependencyInjection/FOSMessageExtension.php b/DependencyInjection/FOSMessageExtension.php index 15ec2786..ecae91fa 100644 --- a/DependencyInjection/FOSMessageExtension.php +++ b/DependencyInjection/FOSMessageExtension.php @@ -32,8 +32,10 @@ public function load(array $configs, ContainerBuilder $container) $container->setParameter('fos_message.message_class', $config['message_class']); $container->setParameter('fos_message.thread_class', $config['thread_class']); + $container->setParameter('fos_message.new_thread_form.class', $config['new_thread_form']['class']); $container->setParameter('fos_message.new_thread_form.model', $config['new_thread_form']['model']); $container->setParameter('fos_message.new_thread_form.name', $config['new_thread_form']['name']); + $container->setParameter('fos_message.reply_form.class', $config['reply_form']['class']); $container->setParameter('fos_message.reply_form.model', $config['reply_form']['model']); $container->setParameter('fos_message.reply_form.name', $config['reply_form']['name']); @@ -51,10 +53,8 @@ public function load(array $configs, ContainerBuilder $container) $container->setAlias('fos_message.spam_detector', $config['spam_detector']); $container->setAlias('fos_message.twig_extension', $config['twig_extension']); - $container->setAlias('fos_message.new_thread_form.type', $config['new_thread_form']['type']); $container->setAlias('fos_message.new_thread_form.factory', $config['new_thread_form']['factory']); $container->setAlias('fos_message.new_thread_form.handler', $config['new_thread_form']['handler']); - $container->setAlias('fos_message.reply_form.type', $config['reply_form']['type']); $container->setAlias('fos_message.reply_form.factory', $config['reply_form']['factory']); $container->setAlias('fos_message.reply_form.handler', $config['reply_form']['handler']); diff --git a/FormFactory/AbstractMessageFormFactory.php b/FormFactory/AbstractMessageFormFactory.php index 49806c0b..e742ab7a 100644 --- a/FormFactory/AbstractMessageFormFactory.php +++ b/FormFactory/AbstractMessageFormFactory.php @@ -2,7 +2,6 @@ namespace FOS\MessageBundle\FormFactory; -use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormFactoryInterface; use FOS\MessageBundle\FormModel\AbstractMessage; @@ -21,11 +20,11 @@ abstract class AbstractMessageFormFactory protected $formFactory; /** - * The message form type + * The message form class * - * @var AbstractType + * @var string */ - protected $formType; + protected $formClass; /** * The name of the form @@ -41,10 +40,10 @@ abstract class AbstractMessageFormFactory */ protected $messageClass; - public function __construct(FormFactoryInterface $formFactory, AbstractType $formType, $formName, $messageClass) + public function __construct(FormFactoryInterface $formFactory, $formClass, $formName, $messageClass) { $this->formFactory = $formFactory; - $this->formType = $formType; + $this->formClass = $formClass; $this->formName = $formName; $this->messageClass = $messageClass; } diff --git a/FormFactory/NewThreadMessageFormFactory.php b/FormFactory/NewThreadMessageFormFactory.php index 5e00668f..423b681a 100644 --- a/FormFactory/NewThreadMessageFormFactory.php +++ b/FormFactory/NewThreadMessageFormFactory.php @@ -18,6 +18,6 @@ public function create() { $message = $this->createModelInstance(); - return $this->formFactory->createNamed($this->formName, $this->formType, $message); + return $this->formFactory->createNamed($this->formName, $this->formClass, $message); } } diff --git a/FormFactory/ReplyMessageFormFactory.php b/FormFactory/ReplyMessageFormFactory.php index cc24ed9a..d70e9c3a 100644 --- a/FormFactory/ReplyMessageFormFactory.php +++ b/FormFactory/ReplyMessageFormFactory.php @@ -22,6 +22,6 @@ public function create(ThreadInterface $thread) $message = $this->createModelInstance(); $message->setThread($thread); - return $this->formFactory->createNamed($this->formName, $this->formType, $message); + return $this->formFactory->createNamed($this->formName, $this->formClass, $message); } } diff --git a/Resources/config/form.xml b/Resources/config/form.xml index ed532f0c..66efaf1f 100644 --- a/Resources/config/form.xml +++ b/Resources/config/form.xml @@ -6,22 +6,18 @@ - - - - - + %fos_message.new_thread_form.class% %fos_message.new_thread_form.name% %fos_message.new_thread_form.model% - + %fos_message.reply_form.class% %fos_message.reply_form.name% %fos_message.reply_form.model% From 946e99eca8fbd42ab1c91ad81999038614a8df24 Mon Sep 17 00:00:00 2001 From: Geoffrey Bachelet Date: Wed, 11 May 2016 15:27:18 +0200 Subject: [PATCH 13/16] Update form handler to use handleRequest instead of bind --- FormHandler/AbstractMessageFormHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FormHandler/AbstractMessageFormHandler.php b/FormHandler/AbstractMessageFormHandler.php index cbe7d500..769f7d08 100644 --- a/FormHandler/AbstractMessageFormHandler.php +++ b/FormHandler/AbstractMessageFormHandler.php @@ -42,7 +42,7 @@ public function process(Form $form) return false; } - $form->bind($this->request); + $form->handleRequest($this->request); if ($form->isValid()) { return $this->processValidForm($form); From 77bf522069c141650fb193a7dfeedf91498edcfe Mon Sep 17 00:00:00 2001 From: Geoffrey Bachelet Date: Wed, 11 May 2016 15:27:32 +0200 Subject: [PATCH 14/16] Update forms to use new type declaration --- FormType/NewThreadMessageFormType.php | 9 ++++++--- FormType/ReplyMessageFormType.php | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/FormType/NewThreadMessageFormType.php b/FormType/NewThreadMessageFormType.php index 772e6921..33f9a02b 100644 --- a/FormType/NewThreadMessageFormType.php +++ b/FormType/NewThreadMessageFormType.php @@ -2,7 +2,10 @@ namespace FOS\MessageBundle\FormType; +use FOS\UserBundle\Form\Type\UsernameFormType; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\TextType; +use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface; @@ -16,9 +19,9 @@ class NewThreadMessageFormType extends AbstractType 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('recipient', UsernameFormType::class, array('label' => 'recipient', '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) diff --git a/FormType/ReplyMessageFormType.php b/FormType/ReplyMessageFormType.php index c2780ba4..faf7dbc5 100644 --- a/FormType/ReplyMessageFormType.php +++ b/FormType/ReplyMessageFormType.php @@ -3,6 +3,7 @@ namespace FOS\MessageBundle\FormType; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface; @@ -16,7 +17,7 @@ class ReplyMessageFormType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('body', 'textarea', array('label' => 'body', 'translation_domain' => 'FOSMessageBundle')); + ->add('body', TextareaType::class, array('label' => 'body', 'translation_domain' => 'FOSMessageBundle')); } public function setDefaultOptions(OptionsResolverInterface $resolver) From 0608251aaf13bd061ce68d7bae410d2ce45a829b Mon Sep 17 00:00:00 2001 From: Geoffrey Bachelet Date: Wed, 11 May 2016 15:43:02 +0200 Subject: [PATCH 15/16] Update forms to use configureOptions --- FormType/NewThreadMessageFormType.php | 4 ++-- FormType/RecipientsType.php | 4 ++-- FormType/ReplyMessageFormType.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/FormType/NewThreadMessageFormType.php b/FormType/NewThreadMessageFormType.php index 33f9a02b..ef9ed763 100644 --- a/FormType/NewThreadMessageFormType.php +++ b/FormType/NewThreadMessageFormType.php @@ -7,7 +7,7 @@ use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * Message form type for starting a new conversation @@ -24,7 +24,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->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', diff --git a/FormType/RecipientsType.php b/FormType/RecipientsType.php index d8cc7090..3e66a0b1 100644 --- a/FormType/RecipientsType.php +++ b/FormType/RecipientsType.php @@ -4,7 +4,7 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Doctrine\Common\Persistence\ObjectManager; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; use FOS\MessageBundle\DataTransformer\RecipientsDataTransformer; /** @@ -38,7 +38,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', diff --git a/FormType/ReplyMessageFormType.php b/FormType/ReplyMessageFormType.php index faf7dbc5..55eca6ed 100644 --- a/FormType/ReplyMessageFormType.php +++ b/FormType/ReplyMessageFormType.php @@ -5,7 +5,7 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * Form type for a reply @@ -20,7 +20,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('body', TextareaType::class, array('label' => 'body', 'translation_domain' => 'FOSMessageBundle')); } - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( 'intention' => 'reply', From c3346079184c4b8203c29d5a173f24d29a69961d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Sm=C3=B3=C5=82kowski?= Date: Thu, 7 Jul 2016 12:44:59 +0200 Subject: [PATCH 16/16] Merge branch 'symfony3' of https://github.com/ubermuda/FOSMessageBundle into ubermuda-symfony3 Conflicts: Controller/MessageController.php FormFactory/AbstractMessageFormFactory.php FormHandler/AbstractMessageFormHandler.php FormType/NewThreadMessageFormType.php FormType/RecipientsType.php Resources/config/form.xml Resources/config/spam_detection.xml Search/QueryFactory.php Security/ParticipantProvider.php --- FormHandler/AbstractMessageFormHandler.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/FormHandler/AbstractMessageFormHandler.php b/FormHandler/AbstractMessageFormHandler.php index 0baa837e..ddf45901 100644 --- a/FormHandler/AbstractMessageFormHandler.php +++ b/FormHandler/AbstractMessageFormHandler.php @@ -2,6 +2,7 @@ namespace FOS\MessageBundle\FormHandler; +use FOS\MessageBundle\Model\MessageInterface; use Symfony\Component\Form\Form; use Symfony\Component\HttpFoundation\RequestStack; use FOS\MessageBundle\Composer\ComposerInterface; @@ -9,9 +10,6 @@ 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