Added config for user_to_username_transformer

FriendsOfSymfony · Oct 8, 2013 · c26f00c · c26f00c
1 parent 0891050
commit c26f00c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/DataTransformer/RecipientsDataTransformer.php b/DataTransformer/RecipientsDataTransformer.php
@@ -8,7 +8,6 @@
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
-use FOS\UserBundle\Form\DataTransformer\UserToUsernameTransformer;
 /**
  * Transforms collection of UserInterface into strings separated with coma
  *
@@ -17,14 +16,14 @@
 class RecipientsDataTransformer implements DataTransformerInterface
 {
     /**
-     * @var UserToUsernameTransformer
+     * @var DataTransformerInterface
      */
     private $userToUsernameTransformer;
 
     /**
-     * @param UserToUsernameTransformer $userToUsernameTransformer
+     * @param DataTransformerInterface $userToUsernameTransformer
      */
-    public function __construct(UserToUsernameTransformer $userToUsernameTransformer)
+    public function __construct(DataTransformerInterface $userToUsernameTransformer)
     {
         $this->userToUsernameTransformer = $userToUsernameTransformer;
     }
@@ -71,7 +70,6 @@ public function reverseTransform($usernames)
         }
 
         $recipients = new ArrayCollection();
-        $transformer = $this->userToUsernameTransformer;
         $recipientsNames = array_filter(explode(',', $usernames));
 
         foreach ($recipientsNames as $username) {

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -38,6 +38,7 @@ public function getConfigTreeBuilder()
                 ->scalarNode('deleter')->defaultValue('fos_message.deleter.default')->cannotBeEmpty()->end()
                 ->scalarNode('spam_detector')->defaultValue('fos_message.noop_spam_detector')->cannotBeEmpty()->end()
                 ->scalarNode('twig_extension')->defaultValue('fos_message.twig_extension.default')->cannotBeEmpty()->end()
+                ->scalarNode('user_transformer')->defaultValue('fos_user.user_to_username_transformer')->cannotBeEmpty()->end()
                 ->arrayNode('search')
                     ->addDefaultsIfNotSet()
                     ->children()

diff --git a/DependencyInjection/FOSMessageExtension.php b/DependencyInjection/FOSMessageExtension.php
@@ -3,6 +3,7 @@
 namespace FOS\MessageBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Processor;
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -61,5 +62,8 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setAlias('fos_message.search_finder', $config['search']['finder']);
         $container->getDefinition('fos_message.search_query_factory.default')
             ->replaceArgument(1, $config['search']['query_parameter']);
+
+        $container->getDefinition('fos_message.recipients_data_transformer')
+            ->replaceArgument(0, new Reference($config['user_transformer']));
     }
 }
diff --git a/Resources/doc/index.rst b/Resources/doc/index.rst
@@ -349,6 +349,7 @@ All configuration options are listed below::
         deleter:                fos_message.deleter                 # See Deleter\DeleterInterface
         spam_detector:          fos_message.noop_spam_detector      # See SpamDetection\SpamDetectorInterface
         twig_extension:         fos_message.twig_extension          # See Twig\Extension\MessageExtension
+        user_transformer:       fos_user.user_transformer           # See Symfony\Component\Form\DataTransformerInterface
         search:
             finder:             fos_message.search_finder           # See Finder\FinderInterface
             query_factory:      fos_message.search_query_factory    # See Finder\QueryFactoryInterface