From cdbc2d68c8dcf3b587164d3624d5b13fd5d349a8 Mon Sep 17 00:00:00 2001
From: Marcel <marcel@ambta.com>
Date: Tue, 8 Mar 2016 16:40:04 +0100
Subject: [PATCH] Added changes

---
 Form/EventListener/TranslationsListener.php | 14 +++++++-------
 Resources/config/services.xml               |  4 +---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Form/EventListener/TranslationsListener.php b/Form/EventListener/TranslationsListener.php
index 423711b..12fe110 100644
--- a/Form/EventListener/TranslationsListener.php
+++ b/Form/EventListener/TranslationsListener.php
@@ -31,7 +31,7 @@ public function __construct(TranslationForm $translationForm)
     public function preSetData(FormEvent $event)
     {
         $form = $event->getForm();
-        
+
         $translatableClass = $form->getParent()->getConfig()->getDataClass();
         $translationClass = $this->getTranslationClass($translatableClass);
 
@@ -54,7 +54,7 @@ public function preSetData(FormEvent $event)
             }
         }
     }
-    
+
     /**
      *
      * @param \Symfony\Component\Form\FormEvent $event
@@ -67,7 +67,7 @@ public function submit(FormEvent $event)
             // Remove useless Translation object
             if (!$translation) {
                 $data->removeElement($translation);
-                
+
             } else {
                 $translation->setLocale($locale);
             }
@@ -81,7 +81,7 @@ public static function getSubscribedEvents()
             FormEvents::SUBMIT => 'submit',
         );
     }
-    
+
     /**
      *
      * @param string $translatableClass
@@ -91,12 +91,12 @@ private function getTranslationClass($translatableClass)
         // Knp
         if (method_exists($translatableClass, "getTranslationEntityClass")) {
             return $translatableClass::getTranslationEntityClass();
-        
-        // Gedmo    
+
+        // Gedmo
         } elseif (method_exists($translatableClass, "getTranslationClass")) {
             return $translatableClass::getTranslationClass();
         }
-        
+
         return $translatableClass .'Translation';
     }
 }
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index b833e02..61a2453 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -57,9 +57,7 @@
             <tag name="form.type" alias="ambta_translationsLocalesSelector" />
         </service>
         <service id="ambta_translation_form.default.type.translatedEntity" class="%ambta_translation_form.default.type.translatedEntity.class%">
-            <call method="setRequest">
-                <argument type="service" id="request" on-invalid="null" strict="false" />
-            </call>
+            <argument type="service" id="request_stack" />
             <tag name="form.type" alias="ambta_translatedEntity" />
         </service>       
     </services>