Merge pull request #9 from kaloqndamqnov/master

symfony 3.0 support
Warxcell · Apr 7, 2017 · 1e1a943 · 1e1a943
2 parents 3713be8 + a49663d
commit 1e1a943
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 68 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,8 @@
     ],
     "require": {
         "sonata-project/admin-bundle": "~2.2 || ~3.0",
-        "sonata-project/doctrine-orm-admin-bundle": "~2.2 || ~3.0"
+        "sonata-project/doctrine-orm-admin-bundle": "~2.2 || ~3.0",
+        "symfony/framework-bundle": "~2.4|~3.0"
     },
     "autoload": {
 	"psr-4": {

diff --git a/src/Admin/Language.php b/src/Admin/Language.php
@@ -2,13 +2,13 @@
 
 namespace ObjectBG\TranslationBundle\Admin;
 
-use Sonata\AdminBundle\Admin\Admin;
+use Sonata\AdminBundle\Admin\AbstractAdmin;
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
 use Symfony\Component\DependencyInjection\Container;
 
-class Language extends Admin
+class Language extends AbstractAdmin
 {
 
     private $Container;

diff --git a/src/Admin/TokenTranslation.php b/src/Admin/TokenTranslation.php
@@ -2,10 +2,10 @@
 
 namespace ObjectBG\TranslationBundle\Admin;
 
-use Sonata\AdminBundle\Admin\Admin;
+use Sonata\AdminBundle\Admin\AbstractAdmin;
 use Sonata\AdminBundle\Form\FormMapper;
 
-class TokenTranslation extends Admin
+class TokenTranslation extends AbstractAdmin
 {
 
     /**

diff --git a/src/Admin/TranslationToken.php b/src/Admin/TranslationToken.php
@@ -3,14 +3,14 @@
 namespace ObjectBG\TranslationBundle\Admin;
 
 use Doctrine\ORM\EntityManager;
-use Sonata\AdminBundle\Admin\Admin;
+use Sonata\AdminBundle\Admin\AbstractAdmin;
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 
-class TranslationToken extends Admin
+class TranslationToken extends AbstractAdmin
 {
 
     /**

diff --git a/src/Form/EventListener/TranslationsListener.php b/src/Form/EventListener/TranslationsListener.php
@@ -2,6 +2,7 @@
 
 namespace ObjectBG\TranslationBundle\Form\EventListener;
 
+use ObjectBG\TranslationBundle\Form\Type\TranslationsFieldsType;
 use ObjectBG\TranslationBundle\TranslationService;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Form\FormEvent;
@@ -65,7 +66,7 @@ public function preSetData(FormEvent $event)
             if (isset($fieldsOptions[$locale])) {
                 $form->add(
                     $locale,
-                    'object_bg_translation_fields',
+                    TranslationsFieldsType::class,
                     array(
                         'label' => $name,
                         'data_class' => $translationClass,

diff --git a/src/Form/Type/TranslatedEntityType.php b/src/Form/Type/TranslatedEntityType.php
@@ -3,9 +3,10 @@
 namespace ObjectBG\TranslationBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 
 /**
  * Translated entity
@@ -14,19 +15,21 @@
  */
 class TranslatedEntityType extends AbstractType
 {
-
+    /**
+     * @var Request
+     */
     private $request;
 
-    public function setRequest(Request $request = null)
+    public function setRequest(RequestStack $request = null)
     {
-        $this->request = $request;
+        $this->request = $request->getCurrentRequest();
     }
 
     /**
      *
-     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     * @param \Symfony\Component\OptionsResolver\OptionsResolver $resolver
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
             array(
@@ -37,20 +40,15 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
                         throw new \Exception('Error while getting request');
                     }
 
-                    return $options['translation_path'].'['.$this->request->getLocale(
-                        ).'].'.$options['translation_property'];
+                    return $options['translation_path'] . '[' . $this->request->getLocale() . '].' . $options['translation_property'];
                 },
             )
         );
     }
 
     public function getParent()
     {
-        return 'entity';
+        return EntityType::class;
     }
 
-    public function getName()
-    {
-        return 'object_bg_translated_entity';
-    }
 }
diff --git a/src/Form/Type/TranslationsFieldsType.php b/src/Form/Type/TranslationsFieldsType.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class TranslationsFieldsType extends AbstractType
 {
@@ -26,9 +26,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
     /**
      *
-     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     * @param \Symfony\Component\OptionsResolver\OptionsResolver $resolver
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
             array(
@@ -37,8 +37,5 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         );
     }
 
-    public function getName()
-    {
-        return 'object_bg_translation_fields';
-    }
+
 }
diff --git a/src/Form/Type/TranslationsFormsType.php b/src/Form/Type/TranslationsFormsType.php
@@ -8,7 +8,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  *
@@ -80,9 +80,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     /**
      *
-     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     * @param \Symfony\Component\OptionsResolver\OptionsResolver $resolver
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
             array(
@@ -95,8 +95,4 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         );
     }
 
-    public function getName()
-    {
-        return 'object_bg_translations_forms';
-    }
 }
diff --git a/src/Form/Type/TranslationsLocalesSelectorType.php b/src/Form/Type/TranslationsLocalesSelectorType.php
@@ -3,7 +3,7 @@
 namespace ObjectBG\TranslationBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class TranslationsLocalesSelectorType extends AbstractType
 {
@@ -26,9 +26,9 @@ public function __construct()
 
     /**
      *
-     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     * @param \Symfony\Component\OptionsResolver\OptionsResolver $resolver
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
             array(
@@ -44,11 +44,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
 
     public function getParent()
     {
-        return 'choice';
+       return \Symfony\Component\Form\Extension\Core\Type\ChoiceType::class;
     }
 
-    public function getName()
-    {
-        return 'object_bg_locales_selector';
-    }
 }
diff --git a/src/Form/Type/TranslationsType.php b/src/Form/Type/TranslationsType.php
@@ -8,7 +8,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class TranslationsType extends AbstractType
 {
@@ -53,9 +53,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     /**
      *
-     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     * @param \Symfony\Component\OptionsResolver\OptionsResolver $resolver
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
             array(
@@ -71,8 +71,4 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         );
     }
 
-    public function getName()
-    {
-        return 'object_bg_translations';
-    }
 }
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -59,7 +59,7 @@
 
         <service id="object_bg.translation.form.type.translatedEntity" class="ObjectBG\TranslationBundle\Form\Type\TranslatedEntityType">
             <call method="setRequest">
-                <argument type="service" id="request" on-invalid="null" strict="false" />
+                <argument type="service" id="request_stack" on-invalid="null" strict="false" />
             </call>
             <tag name="form.type" alias="object_bg_translated_entity" />
         </service>

diff --git a/src/TranslationService.php b/src/TranslationService.php
@@ -60,19 +60,19 @@ class TranslationService
 
     /**
      *
-     * @param \Symfony\Component\DependencyInjection\Container $Container
+     * @param \Symfony\Component\DependencyInjection\Container $container
      * @param \Symfony\Component\Form\FormRegistry $formRegistry
      * @param \Doctrine\Common\Persistence\ManagerRegistry $managerRegistry
      * @param \Doctrine\Common\Annotations\Reader $Reader
      */
-    public function __construct(Container $Container)
+    public function __construct(Container $container)
     {
-        $this->container = $Container;
-        $this->typeGuesser = $Container->get('form.registry')->getTypeGuesser();
-        $this->managerRegistry = $Container->get('doctrine');
-        $this->annotationReader = $Container->get('annotation_reader');
-        $this->translator = $Container->get('translator.default');
-        $this->request = $Container->get('request');
+        $this->container = $container;
+        $this->typeGuesser = $container->get('form.registry')->getTypeGuesser();
+        $this->managerRegistry = $container->get('doctrine');
+        $this->annotationReader = $container->get('annotation_reader');
+        $this->translator = $container->get('translator.default');
+        $this->request = $container->get('request_stack')->getCurrentRequest();
         $this->propertyAccess = PropertyAccess::createPropertyAccessor();
     }
 
@@ -349,14 +349,6 @@ public function guessMissingFieldOptions($guesser, $class, $property, $options)
             $options['field_type'] = $typeGuess->getType();
         }
 
-        if (!isset($options['pattern']) && ($patternGuess = $guesser->guessPattern($class, $property))) {
-            $options['pattern'] = $patternGuess->getValue();
-        }
-
-        if (!isset($options['max_length']) && ($maxLengthGuess = $guesser->guessMaxLength($class, $property))) {
-            $options['max_length'] = $maxLengthGuess->getValue();
-        }
-
         return $options;
     }
 }