From 896b38bea24de92a361df6af31a5aafbd70deac1 Mon Sep 17 00:00:00 2001
From: Bozhidar Hristov <b.hristov@vm5.eu>
Date: Mon, 4 Dec 2017 17:46:32 +0200
Subject: [PATCH] Fix deprecation of vm5_entity_translations.translation_loader
 service. Fix Form Type missing use. Fix wrong Twig Extension definition

---
 src/Form/Type/TranslationsType.php | 1 +
 src/Resources/config/services.xml  | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Form/Type/TranslationsType.php b/src/Form/Type/TranslationsType.php
index 92e25cb..57a6e0e 100644
--- a/src/Form/Type/TranslationsType.php
+++ b/src/Form/Type/TranslationsType.php
@@ -11,6 +11,7 @@
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use VM5\EntityTranslationsBundle\Model\EditableTranslation;
 use VM5\EntityTranslationsBundle\Model\Language;
 use VM5\EntityTranslationsBundle\Model\Translatable;
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index 11793e6..fa65873 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -13,9 +13,7 @@
         <service id="vm5_entity_translations.translation_loader"
                  class="VM5\EntityTranslationsBundle\Translator"
                  public="true">
-            <deprecated>The "%service_id%" service is deprecated since 1.2 and will be removed in 2.0. Please use
-                vm5_entity_translations.translator instead.
-            </deprecated>
+            <deprecated>The "%service_id%" service is deprecated since 1.2 and will be removed in 2.0. Please use vm5_entity_translations.translator instead.</deprecated>
         </service>
 
         <service id="vm5_entity_translations.doctrine.translation_loader"
@@ -34,7 +32,7 @@
         </service>
 
         <service id="VM5\EntityTranslationsBundle\Twig\Extension\TranslationExtension"
-                 class="VM5\EntityTranslationsBundle\Form\Type\TranslationsType"
+                 class="VM5\EntityTranslationsBundle\Twig\Extension\TranslationExtension"
                  public="false">
             <argument type="service" id="vm5_entity_translations.translator"/>
             <argument type="service" id="property_accessor"/>