Add a functional test (FriendsOfSymfony#330)

* Add a functional test * CS
fluxion8 · Sep 15, 2018 · ad8b51c · ad8b51c
1 parent 3196bb0
commit ad8b51c
Show file tree

Hide file tree

Showing 53 changed files with 489 additions and 101 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,8 @@
 composer.lock
 phpunit.xml
-vendor
 .phpunit
+vendor
+.php_cs.cache
+.php_cs
+Tests/Functional/cache
+Tests/Functional/logs
diff --git a/.php_cs b/.php_cs
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -0,0 +1,15 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__)
+    ->exclude('Tests/Functional/cache')
+;
+
+return PhpCsFixer\Config::create()
+    ->setRules(array(
+        '@Symfony' => true,
+        'ordered_imports' => true,
+        'phpdoc_order' => true,
+    ))
+    ->setFinder($finder)
+;
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 sudo: false
-dist: precise
 
 cache:
   directories:
@@ -15,10 +14,10 @@ branches:
 matrix:
   fast_finish: true
   include:
-    - php: 5.3
+    - php: 5.5
       env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
     - php: 7.2
-      env: SYMFONY_LTS='^3'
+      env: SYMFONY_LTS='^3' SYMFONY_DEPRECATIONS_HELPER=weak
     - php: 7.2
 
 before_install:

diff --git a/Command/MongoDBMigrateMetadataCommand.php b/Command/MongoDBMigrateMetadataCommand.php
@@ -343,7 +343,7 @@ private function createThreadActiveParticipantArrays(array &$thread)
 
         foreach ($thread['participants'] as $participantRef) {
             foreach ($thread['metadata'] as $metadata) {
-                if ($metadata['isDeleted'] && $participantRef['$id'] === $metadata['participant']['$id']) {
+                if ($metadata['isDeleted'] && $metadata['participant']['$id'] === $participantRef['$id']) {
                     continue 2;
                 }
             }
@@ -361,7 +361,7 @@ private function createThreadActiveParticipantArrays(array &$thread)
                     throw new \UnexpectedValueException(sprintf('Sender reference not found for message "%s"', $messageRef['$id']));
                 }
 
-                if ($participantRef['$id'] == $message['sender']['$id']) {
+                if ($message['sender']['$id'] == $participantRef['$id']) {
                     $participantIsActiveSender = true;
                 } elseif (!$thread['isSpam']) {
                     $participantIsActiveRecipient = true;
@@ -396,9 +396,9 @@ private function createThreadActiveParticipantArrays(array &$thread)
      * @param ManagerRegistry $registry
      * @param string          $class
      *
-     * @return \MongoCollection
-     *
      * @throws \RuntimeException if the class has no DocumentManager
+     *
+     * @return \MongoCollection
      */
     private function getMongoCollectionForClass(ManagerRegistry $registry, $class)
     {

diff --git a/Composer/Composer.php b/Composer/Composer.php
@@ -2,11 +2,11 @@
 
 namespace FOS\MessageBundle\Composer;
 
-use FOS\MessageBundle\ModelManager\MessageManagerInterface;
-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;
 
 /**
  * Factory for message builders.

diff --git a/Controller/MessageController.php b/Controller/MessageController.php
@@ -39,7 +39,7 @@ public function sentAction()
     {
         $threads = $this->getProvider()->getSentThreads();
 
-        return $this->render('@FOSMessage/Message/sent.html.twig',, array(
+        return $this->render('@FOSMessage/Message/sent.html.twig', array(
             'threads' => $threads,
         ));
     }

diff --git a/DataTransformer/RecipientsDataTransformer.php b/DataTransformer/RecipientsDataTransformer.php
@@ -2,12 +2,12 @@
 
 namespace FOS\MessageBundle\DataTransformer;
 
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 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\Collections\Collection;
-use Doctrine\Common\Collections\ArrayCollection;
 
 /**
  * Transforms collection of UserInterface into strings separated with coma.
@@ -35,7 +35,7 @@ public function __construct(DataTransformerInterface $userToUsernameTransformer)
      */
     public function transform($recipients)
     {
-        if ($recipients === null || $recipients->count() === 0) {
+        if (null === $recipients || 0 === $recipients->count()) {
             return '';
         }
 

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

diff --git a/DependencyInjection/FOSMessageExtension.php b/DependencyInjection/FOSMessageExtension.php
@@ -3,12 +3,12 @@
 namespace FOS\MessageBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Processor;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Alias;
+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,8 +2,8 @@
 
 namespace FOS\MessageBundle\Document;
 
-use FOS\MessageBundle\Model\Thread as AbstractThread;
 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,14 +3,14 @@
 namespace FOS\MessageBundle\DocumentManager;
 
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\ODM\MongoDB\Query\Builder;
 use FOS\MessageBundle\Document\Message;
 use FOS\MessageBundle\Document\MessageMetadata;
 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
@@ -5,10 +5,10 @@
 use Doctrine\ODM\MongoDB\DocumentManager;
 use FOS\MessageBundle\Document\Thread;
 use FOS\MessageBundle\Document\ThreadMetadata;
-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;
 
 /**
  * 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;
 
 abstract class Thread extends BaseThread

diff --git a/EntityManager/MessageManager.php b/EntityManager/MessageManager.php
@@ -2,12 +2,12 @@
 
 namespace FOS\MessageBundle\EntityManager;
 
-use FOS\MessageBundle\ModelManager\MessageManager as BaseMessageManager;
 use Doctrine\ORM\EntityManager;
 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 FOS\MessageBundle\ModelManager\MessageManager as BaseMessageManager;
 
 /**
  * Default ORM MessageManager.

diff --git a/EntityManager/ThreadManager.php b/EntityManager/ThreadManager.php
@@ -2,11 +2,11 @@
 
 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 FOS\MessageBundle\Model\ReadableInterface;
+use FOS\MessageBundle\Model\ThreadInterface;
+use FOS\MessageBundle\ModelManager\ThreadManager as BaseThreadManager;
 
 /**
  * Default ORM ThreadManager.

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

diff --git a/Event/ThreadEvent.php b/Event/ThreadEvent.php
@@ -2,8 +2,8 @@
 
 namespace FOS\MessageBundle\Event;
 
-use Symfony\Component\EventDispatcher\Event;
 use FOS\MessageBundle\Model\ThreadInterface;
+use Symfony\Component\EventDispatcher\Event;
 
 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,15 +2,15 @@
 
 namespace FOS\MessageBundle\FormHandler;
 
-use FOS\MessageBundle\Model\MessageInterface;
-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;
+use FOS\MessageBundle\Model\MessageInterface;
 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.

diff --git a/FormHandler/NewThreadMessageFormHandler.php b/FormHandler/NewThreadMessageFormHandler.php
@@ -13,9 +13,9 @@ class NewThreadMessageFormHandler extends AbstractMessageFormHandler
      *
      * @param AbstractMessage $message
      *
-     * @return MessageInterface the composed message ready to be sent
-     *
      * @throws \InvalidArgumentException if the message is not a NewThreadMessage
+     *
+     * @return MessageInterface the composed message ready to be sent
      */
     public function composeMessage(AbstractMessage $message)
     {

diff --git a/FormHandler/NewThreadMultipleMessageFormHandler.php b/FormHandler/NewThreadMultipleMessageFormHandler.php
@@ -18,9 +18,9 @@ class NewThreadMultipleMessageFormHandler extends AbstractMessageFormHandler
      *
      * @param AbstractMessage $message
      *
-     * @return MessageInterface the composed message ready to be sent
-     *
      * @throws \InvalidArgumentException if the message is not a NewThreadMessage
+     *
+     * @return MessageInterface the composed message ready to be sent
      */
     public function composeMessage(AbstractMessage $message)
     {

diff --git a/FormHandler/ReplyMessageFormHandler.php b/FormHandler/ReplyMessageFormHandler.php
@@ -13,9 +13,9 @@ class ReplyMessageFormHandler extends AbstractMessageFormHandler
      *
      * @param AbstractMessage $message
      *
-     * @return MessageInterface the composed message ready to be sent
-     *
      * @throws \InvalidArgumentException if the message is not a ReplyMessage
+     *
+     * @return MessageInterface the composed message ready to be sent
      */
     public function composeMessage(AbstractMessage $message)
     {

diff --git a/FormType/NewThreadMultipleMessageFormType.php b/FormType/NewThreadMultipleMessageFormType.php
@@ -3,8 +3,8 @@
 namespace FOS\MessageBundle\FormType;
 
 use FOS\MessageBundle\Util\LegacyFormHelper;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * Message form type for starting a new conversation with multiple recipients.

diff --git a/FormType/RecipientsType.php b/FormType/RecipientsType.php
@@ -2,12 +2,12 @@
 
 namespace FOS\MessageBundle\FormType;
 
+use FOS\MessageBundle\DataTransformer\RecipientsDataTransformer;
 use FOS\MessageBundle\Util\LegacyFormHelper;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use FOS\MessageBundle\DataTransformer\RecipientsDataTransformer;
 
 /**
  * Description of RecipientsType.

diff --git a/MessageBuilder/NewThreadMessageBuilder.php b/MessageBuilder/NewThreadMessageBuilder.php
@@ -2,8 +2,8 @@
 
 namespace FOS\MessageBundle\MessageBuilder;
 
-use FOS\MessageBundle\Model\ParticipantInterface;
 use Doctrine\Common\Collections\Collection;
+use FOS\MessageBundle\Model\ParticipantInterface;
 
 /**
  * Fluent interface message builder for new thread messages.

diff --git 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,