Symfony 3.0 upgrade

src/Akeneo/Bundle/FileStorageBundle/Form/Type/FileInfoType.php

@@ -3,6 +3,7 @@
 namespace Akeneo\Bundle\FileStorageBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\FileType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -31,7 +32,7 @@ public function __construct($dataClass)
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('uploadedFile', 'file', ['required' => false]);
+        $builder->add('uploadedFile', FileType::class, ['required' => false]);
     }
 
     /**
@@ -49,7 +50,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'akeneo_file_storage_file_info';
     }

src/Oro/Bundle/DataGridBundle/Controller/GridController.php

@@ -6,6 +6,7 @@
 use Oro\Bundle\DataGridBundle\Extension\MassAction\MassActionParametersParser;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 class GridController extends Controller
@@ -30,10 +31,8 @@ public function getAction($gridName)
      * @throws \LogicException
      * @return Response
      */
-    public function massActionAction($gridName, $actionName)
+    public function massActionAction(Request $request, $gridName, $actionName)
     {
-        $request = $this->getRequest();
-
         /** @var MassActionParametersParser $massActionParametersParser */
         $parametersParser = $this->get('oro_datagrid.mass_action.parameters_parser');
         $parameters       = $parametersParser->parse($request);

src/Oro/Bundle/FilterBundle/Form/Type/Filter/DateRangeFilterType.php

@@ -33,7 +33,7 @@ public function __construct(TranslatorInterface $translator)
     /**
      * {@inheritDoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return self::NAME;
     }

src/Oro/Bundle/FilterBundle/Form/Type/Filter/DateTimeRangeFilterType.php

@@ -31,7 +31,7 @@ public function __construct(TranslatorInterface $translator)
     /**
      * {@inheritDoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return self::NAME;
     }

src/Oro/Bundle/FilterBundle/Form/Type/Filter/FilterType.php

@@ -31,7 +31,7 @@ public function __construct(TranslatorInterface $translator)
     /**
      * {@inheritDoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return self::NAME;
     }

src/Oro/Bundle/FilterBundle/Form/Type/Filter/NumberFilterType.php

@@ -36,7 +36,7 @@ public function __construct(TranslatorInterface $translator)
     /**
      * {@inheritDoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return self::NAME;
     }

src/Oro/Bundle/FilterBundle/Form/Type/Filter/TextFilterType.php

@@ -31,7 +31,7 @@ public function __construct(TranslatorInterface $translator)
     /**
      * {@inheritDoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return self::NAME;
     }

src/Oro/Bundle/FormBundle/Form/DataTransformer/EntityToIdTransformer.php

@@ -56,7 +56,7 @@ public function __construct(EntityManager $em, $className, $property = null, $qu
             $property = $this->getIdPropertyPathFromEntityManager($em, $className);
         }
         $this->property = $property;
-        $this->propertyAccessor = PropertyAccess::getPropertyAccessor();
+        $this->propertyAccessor = PropertyAccess::createPropertyAccessor();
         $this->propertyPath = new PropertyPath($this->property);
         if (null !== $queryBuilderCallback && !is_callable($queryBuilderCallback)) {
             throw new UnexpectedTypeException($queryBuilderCallback, 'callable');

src/Oro/Bundle/FormBundle/Form/EventListener/FixArrayToStringListener.php

@@ -28,6 +28,6 @@ public function preBind(FormEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return [FormEvents::PRE_BIND => 'preBind'];
+        return [FormEvents::PRE_SUBMIT => 'preBind'];
     }
 }

src/Oro/Bundle/FormBundle/Form/Type/EntityIdentifierType.php

@@ -10,6 +10,7 @@
 use Oro\Bundle\FormBundle\Form\EventListener\FixArrayToStringListener;
 use Oro\Bundle\FormBundle\Form\Exception\FormException;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -133,7 +134,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return self::NAME;
     }
@@ -143,6 +144,6 @@ public function getName()
      */
     public function getParent()
     {
-        return 'hidden';
+        return HiddenType::class;
     }
 }

src/Oro/Bundle/NavigationBundle/Form/Type/PageStateType.php

@@ -3,6 +3,8 @@
 namespace Oro\Bundle\NavigationBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -16,14 +18,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder
             ->add(
                 'pageId',
-                'text',
+                TextType::class,
                 [
                     'required' => true,
                 ]
             )
             ->add(
                 'data',
-                'textarea',
+                TextareaType::class,
                 [
                     'required' => true,
                 ]
@@ -47,7 +49,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'pagestate';
     }

src/Oro/Bundle/SecurityBundle/Form/Type/AclPermissionType.php

@@ -3,6 +3,7 @@
 namespace Oro\Bundle\SecurityBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -22,7 +23,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         );
         $builder->add(
             'name',
-            'hidden',
+            HiddenType::class,
             [
                 'required' => false,
             ]
@@ -32,7 +33,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'oro_acl_permission';
     }

src/Oro/Bundle/SecurityBundle/Form/Type/AclPrivilegeIdentityType.php

@@ -3,6 +3,7 @@
 namespace Oro\Bundle\SecurityBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -15,7 +16,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add(
             'id',
-            'hidden',
+            HiddenType::class,
             [
                 'required' => true,
             ]
@@ -32,7 +33,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'oro_acl_privilege_identity';
     }

src/Oro/Bundle/SecurityBundle/Form/Type/AclPrivilegeType.php

@@ -64,7 +64,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'oro_acl_privilege';
     }

src/Oro/Bundle/SecurityBundle/Form/Type/ObjectLabelType.php

@@ -3,13 +3,14 @@
 namespace Oro\Bundle\SecurityBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 
 class ObjectLabelType extends AbstractType
 {
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'oro_acl_label';
     }
@@ -19,6 +20,6 @@ public function getName()
      */
     public function getParent()
     {
-        return 'hidden';
+        return HiddenType::class;
     }
 }

src/Oro/Bundle/SecurityBundle/Form/Type/PermissionCollectionType.php

@@ -3,6 +3,7 @@
 namespace Oro\Bundle\SecurityBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 
@@ -23,7 +24,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'oro_acl_permission_collection';
     }
@@ -33,6 +34,6 @@ public function getName()
      */
     public function getParent()
     {
-        return 'collection';
+        return CollectionType::class;
     }
 }

src/Oro/Bundle/SecurityBundle/Form/Type/PrivilegeCollectionType.php

@@ -3,6 +3,7 @@
 namespace Oro\Bundle\SecurityBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 
@@ -23,7 +24,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'oro_acl_collection';
     }
@@ -33,6 +34,6 @@ public function getName()
      */
     public function getParent()
     {
-        return 'collection';
+        return CollectionType::class;
     }
 }

src/Oro/Bundle/UserBundle/Controller/ResetController.php

@@ -5,6 +5,7 @@
 use Pim\Bundle\UserBundle\Entity\UserInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
 
 class ResetController extends Controller
 {
@@ -21,9 +22,9 @@ public function requestAction()
     /**
      * Request reset user password
      */
-    public function sendEmailAction()
+    public function sendEmailAction(Request $request)
     {
-        $username = $this->getRequest()->request->get('username');
+        $username = $request->request->get('username');
         $user = $this->get('oro_user.manager')->findUserByUsernameOrEmail($username);
 
         if (null === $user) {

src/Oro/Bundle/UserBundle/Controller/UserController.php

@@ -14,6 +14,7 @@
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\EventDispatcher\GenericEvent;
 use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\User\UserInterface;
 
@@ -56,7 +57,7 @@ public function updateProfileAction()
      *
      * @return JsonResponse|Response
      */
-    public function apigenAction($id)
+    public function apigenAction(Request $request, $id)
     {
         $userRepository = $this->container->get('pim_user.repository.user');
         $user           = $userRepository->findOneBy(['id' => $id]);
@@ -73,7 +74,7 @@ public function apigenAction($id)
         $em->persist($api);
         $em->flush();
 
-        return $this->getRequest()->isXmlHttpRequest()
+        return $request->isXmlHttpRequest()
             ? new JsonResponse($api->getApiKey())
             : $this->forward('OroUserBundle:User:view', ['user' => $user]);
     }

src/Oro/Bundle/UserBundle/Form/EventListener/PatchSubscriber.php

@@ -19,7 +19,7 @@ class PatchSubscriber implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
-        return [FormEvents::PRE_BIND => 'preBind'];
+        return [FormEvents::PRE_SUBMIT => 'preBind'];
     }
 
     public function preBind(FormEvent $event)

src/Oro/Bundle/UserBundle/Form/Type/AclRoleType.php

@@ -5,6 +5,7 @@
 use Oro\Bundle\SecurityBundle\Form\Type\AclPrivilegeType;
 use Oro\Bundle\SecurityBundle\Form\Type\PrivilegeCollectionType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -30,7 +31,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add(
             'label',
-            'text',
+            TextType::class,
             [
                 'required' => true,
                 'label'    => 'Role'
@@ -93,7 +94,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'oro_user_role_form';
     }