From 23a9fb493803e0745a6fd64ac9305f426a193b5d Mon Sep 17 00:00:00 2001 From: Karel Souffriau Date: Wed, 29 Nov 2017 16:46:45 +0100 Subject: [PATCH 1/2] Drop Symfony 2.7 support --- .travis.yml | 2 - Changelog.md | 3 +- DependencyInjection/Configuration.php | 12 ++-- Form/Type/ChangePasswordFormType.php | 11 ++- Form/Type/GroupFormType.php | 2 - Form/Type/ProfileFormType.php | 9 ++- Form/Type/RegistrationFormType.php | 12 ++-- Form/Type/ResettingFormType.php | 9 ++- Form/Type/UsernameFormType.php | 4 +- .../doc/adding_invitation_registration.rst | 11 --- Resources/doc/command_line_tools.rst | 4 -- Resources/doc/configuration_reference.rst | 10 +-- Resources/doc/form_type.rst | 3 - Resources/doc/index.rst | 4 +- Resources/doc/overriding_forms.rst | 5 -- .../FOSUserExtensionTest.php | 11 --- .../Form/Type/ChangePasswordFormTypeTest.php | 3 +- Tests/Form/Type/GroupFormTypeTest.php | 3 +- Tests/Form/Type/ProfileFormTypeTest.php | 3 +- Tests/Form/Type/RegistrationFormTypeTest.php | 3 +- Tests/Form/Type/ResettingFormTypeTest.php | 3 +- Util/LegacyFormHelper.php | 72 ------------------- composer.json | 18 ++--- 23 files changed, 49 insertions(+), 168 deletions(-) delete mode 100644 Util/LegacyFormHelper.php diff --git a/.travis.yml b/.travis.yml index b86a6508d5..f8a502c985 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,6 @@ matrix: env: TARGET=cs_dry_run - php: 5.5 env: COMPOSER_FLAGS="--prefer-lowest" - - php: 5.6 - env: SYMFONY_VERSION=2.7.* - php: 5.6 env: SYMFONY_VERSION=2.8.* allow_failures: diff --git a/Changelog.md b/Changelog.md index 3166f219c0..87dd2c43b7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,7 +1,8 @@ Changelog ========= -### 3.0.0 (2017-xx-xx) +### 2.1.0 (2017-xx-xx) +* Dropped Symfony < 2.8 support. ### 2.0.1 (2017-05-31) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 88a6e085c7..d0777a27ef 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -11,10 +11,10 @@ namespace FOS\UserBundle\DependencyInjection; -use FOS\UserBundle\Util\LegacyFormHelper; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; +use FOS\UserBundle\Form\Type; /** * This class contains the configuration information for the bundle. @@ -101,7 +101,7 @@ private function addProfileSection(ArrayNodeDefinition $node) ->addDefaultsIfNotSet() ->fixXmlConfig('validation_group') ->children() - ->scalarNode('type')->defaultValue(LegacyFormHelper::getType('FOS\UserBundle\Form\Type\ProfileFormType'))->end() + ->scalarNode('type')->defaultValue(Type\ProfileFormType::class)->end() ->scalarNode('name')->defaultValue('fos_user_profile_form')->end() ->arrayNode('validation_groups') ->prototype('scalar')->end() @@ -142,7 +142,7 @@ private function addRegistrationSection(ArrayNodeDefinition $node) ->arrayNode('form') ->addDefaultsIfNotSet() ->children() - ->scalarNode('type')->defaultValue(LegacyFormHelper::getType('FOS\UserBundle\Form\Type\RegistrationFormType'))->end() + ->scalarNode('type')->defaultValue(Type\RegistrationFormType::class)->end() ->scalarNode('name')->defaultValue('fos_user_registration_form')->end() ->arrayNode('validation_groups') ->prototype('scalar')->end() @@ -184,7 +184,7 @@ private function addResettingSection(ArrayNodeDefinition $node) ->arrayNode('form') ->addDefaultsIfNotSet() ->children() - ->scalarNode('type')->defaultValue(LegacyFormHelper::getType('FOS\UserBundle\Form\Type\ResettingFormType'))->end() + ->scalarNode('type')->defaultValue(Type\ResettingFormType::class)->end() ->scalarNode('name')->defaultValue('fos_user_resetting_form')->end() ->arrayNode('validation_groups') ->prototype('scalar')->end() @@ -211,7 +211,7 @@ private function addChangePasswordSection(ArrayNodeDefinition $node) ->arrayNode('form') ->addDefaultsIfNotSet() ->children() - ->scalarNode('type')->defaultValue(LegacyFormHelper::getType('FOS\UserBundle\Form\Type\ChangePasswordFormType'))->end() + ->scalarNode('type')->defaultValue(Type\ChangePasswordFormType::class)->end() ->scalarNode('name')->defaultValue('fos_user_change_password_form')->end() ->arrayNode('validation_groups') ->prototype('scalar')->end() @@ -262,7 +262,7 @@ private function addGroupSection(ArrayNodeDefinition $node) ->addDefaultsIfNotSet() ->fixXmlConfig('validation_group') ->children() - ->scalarNode('type')->defaultValue(LegacyFormHelper::getType('FOS\UserBundle\Form\Type\GroupFormType'))->end() + ->scalarNode('type')->defaultValue(Type\GroupFormType::class)->end() ->scalarNode('name')->defaultValue('fos_user_group_form')->end() ->arrayNode('validation_groups') ->prototype('scalar')->end() diff --git a/Form/Type/ChangePasswordFormType.php b/Form/Type/ChangePasswordFormType.php index 4e727d8f56..39bbb0592d 100644 --- a/Form/Type/ChangePasswordFormType.php +++ b/Form/Type/ChangePasswordFormType.php @@ -11,8 +11,9 @@ namespace FOS\UserBundle\Form\Type; -use FOS\UserBundle\Util\LegacyFormHelper; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\PasswordType; +use Symfony\Component\Form\Extension\Core\Type\RepeatedType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Security\Core\Validator\Constraints\UserPassword; @@ -46,7 +47,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $constraintsOptions['groups'] = array(reset($options['validation_groups'])); } - $builder->add('current_password', LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\PasswordType'), array( + $builder->add('current_password', PasswordType::class, array( 'label' => 'form.current_password', 'translation_domain' => 'FOSUserBundle', 'mapped' => false, @@ -56,8 +57,8 @@ public function buildForm(FormBuilderInterface $builder, array $options) ), )); - $builder->add('plainPassword', LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\RepeatedType'), array( - 'type' => LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\PasswordType'), + $builder->add('plainPassword', RepeatedType::class, array( + 'type' => PasswordType::class, 'options' => array('translation_domain' => 'FOSUserBundle'), 'first_options' => array('label' => 'form.new_password'), 'second_options' => array('label' => 'form.new_password_confirmation'), @@ -73,8 +74,6 @@ public function configureOptions(OptionsResolver $resolver) $resolver->setDefaults(array( 'data_class' => $this->class, 'csrf_token_id' => 'change_password', - // BC for SF < 2.8 - 'intention' => 'change_password', )); } diff --git a/Form/Type/GroupFormType.php b/Form/Type/GroupFormType.php index 577de283d5..71372ceecc 100644 --- a/Form/Type/GroupFormType.php +++ b/Form/Type/GroupFormType.php @@ -46,8 +46,6 @@ public function configureOptions(OptionsResolver $resolver) $resolver->setDefaults(array( 'data_class' => $this->class, 'csrf_token_id' => 'group', - // BC for SF < 2.8 - 'intention' => 'group', )); } diff --git a/Form/Type/ProfileFormType.php b/Form/Type/ProfileFormType.php index e3158f5164..96a53bf1bd 100644 --- a/Form/Type/ProfileFormType.php +++ b/Form/Type/ProfileFormType.php @@ -11,8 +11,9 @@ namespace FOS\UserBundle\Form\Type; -use FOS\UserBundle\Util\LegacyFormHelper; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\EmailType; +use Symfony\Component\Form\Extension\Core\Type\PasswordType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Security\Core\Validator\Constraints\UserPassword; @@ -48,7 +49,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $constraintsOptions['groups'] = array(reset($options['validation_groups'])); } - $builder->add('current_password', LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\PasswordType'), array( + $builder->add('current_password', PasswordType::class, array( 'label' => 'form.current_password', 'translation_domain' => 'FOSUserBundle', 'mapped' => false, @@ -67,8 +68,6 @@ public function configureOptions(OptionsResolver $resolver) $resolver->setDefaults(array( 'data_class' => $this->class, 'csrf_token_id' => 'profile', - // BC for SF < 2.8 - 'intention' => 'profile', )); } @@ -99,7 +98,7 @@ protected function buildUserForm(FormBuilderInterface $builder, array $options) { $builder ->add('username', null, array('label' => 'form.username', 'translation_domain' => 'FOSUserBundle')) - ->add('email', LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\EmailType'), array('label' => 'form.email', 'translation_domain' => 'FOSUserBundle')) + ->add('email', EmailType::class, array('label' => 'form.email', 'translation_domain' => 'FOSUserBundle')) ; } } diff --git a/Form/Type/RegistrationFormType.php b/Form/Type/RegistrationFormType.php index 5d77991fc0..3db522d57e 100644 --- a/Form/Type/RegistrationFormType.php +++ b/Form/Type/RegistrationFormType.php @@ -11,8 +11,10 @@ namespace FOS\UserBundle\Form\Type; -use FOS\UserBundle\Util\LegacyFormHelper; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\EmailType; +use Symfony\Component\Form\Extension\Core\Type\PasswordType; +use Symfony\Component\Form\Extension\Core\Type\RepeatedType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -37,10 +39,10 @@ public function __construct($class) public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('email', LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\EmailType'), array('label' => 'form.email', 'translation_domain' => 'FOSUserBundle')) + ->add('email', EmailType::class, array('label' => 'form.email', 'translation_domain' => 'FOSUserBundle')) ->add('username', null, array('label' => 'form.username', 'translation_domain' => 'FOSUserBundle')) - ->add('plainPassword', LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\RepeatedType'), array( - 'type' => LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\PasswordType'), + ->add('plainPassword', RepeatedType::class, array( + 'type' => PasswordType::class, 'options' => array('translation_domain' => 'FOSUserBundle'), 'first_options' => array('label' => 'form.password'), 'second_options' => array('label' => 'form.password_confirmation'), @@ -57,8 +59,6 @@ public function configureOptions(OptionsResolver $resolver) $resolver->setDefaults(array( 'data_class' => $this->class, 'csrf_token_id' => 'registration', - // BC for SF < 2.8 - 'intention' => 'registration', )); } diff --git a/Form/Type/ResettingFormType.php b/Form/Type/ResettingFormType.php index a773a276d7..538af78cce 100644 --- a/Form/Type/ResettingFormType.php +++ b/Form/Type/ResettingFormType.php @@ -11,8 +11,9 @@ namespace FOS\UserBundle\Form\Type; -use FOS\UserBundle\Util\LegacyFormHelper; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\PasswordType; +use Symfony\Component\Form\Extension\Core\Type\RepeatedType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -36,8 +37,8 @@ public function __construct($class) */ public function buildForm(FormBuilderInterface $builder, array $options) { - $builder->add('plainPassword', LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\RepeatedType'), array( - 'type' => LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\PasswordType'), + $builder->add('plainPassword', RepeatedType::class, array( + 'type' => PasswordType::class, 'options' => array('translation_domain' => 'FOSUserBundle'), 'first_options' => array('label' => 'form.new_password'), 'second_options' => array('label' => 'form.new_password_confirmation'), @@ -53,8 +54,6 @@ public function configureOptions(OptionsResolver $resolver) $resolver->setDefaults(array( 'data_class' => $this->class, 'csrf_token_id' => 'resetting', - // BC for SF < 2.8 - 'intention' => 'resetting', )); } diff --git a/Form/Type/UsernameFormType.php b/Form/Type/UsernameFormType.php index 38b79eb958..70cc215ce8 100644 --- a/Form/Type/UsernameFormType.php +++ b/Form/Type/UsernameFormType.php @@ -12,8 +12,8 @@ namespace FOS\UserBundle\Form\Type; use FOS\UserBundle\Form\DataTransformer\UserToUsernameTransformer; -use FOS\UserBundle\Util\LegacyFormHelper; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; /** @@ -51,7 +51,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) */ public function getParent() { - return LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\TextType'); + return TextType::class; } // BC for SF < 3.0 diff --git a/Resources/doc/adding_invitation_registration.rst b/Resources/doc/adding_invitation_registration.rst index f71f3a9915..815e28f9d4 100644 --- a/Resources/doc/adding_invitation_registration.rst +++ b/Resources/doc/adding_invitation_registration.rst @@ -120,17 +120,11 @@ Override the default registration form with your own:: public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add('invitation', 'AppBundle\Form\InvitationFormType'); - - // Or for Symfony < 2.8 - // $builder->add('invitation', 'app_invitation_type'); } public function getParent() { return 'FOS\UserBundle\Form\Type\RegistrationFormType'; - - // Or for Symfony < 2.8 - // return 'fos_user_registration'; } public function getBlockPrefix() @@ -183,9 +177,6 @@ Create the invitation field:: public function getParent() { return 'Symfony\Component\Form\Extension\Core\Type\TextType'; - - // Or for Symfony < 2.8 - // return 'text'; } public function getBlockPrefix() @@ -327,7 +318,5 @@ Next overwrite the default ``RegistrationFormType`` with the one just created : registration: form: type: AppBundle\Form\RegistrationFormType - # Or for Symfony < 2.8 - # type: app_user_registration You are done, go to your registration form to see the result. diff --git a/Resources/doc/command_line_tools.rst b/Resources/doc/command_line_tools.rst index 6b55e97ba8..0ee48164b9 100644 --- a/Resources/doc/command_line_tools.rst +++ b/Resources/doc/command_line_tools.rst @@ -72,8 +72,6 @@ to enter one. An example of using this command is listed below. .. code-block:: bash - $ php app/console fos:user:activate testuser - $ # OR if you are using Symfony >= 2.8 with the new directory structure $ php bin/console fos:user:activate testuser Deactivate a User @@ -86,8 +84,6 @@ to enter one. Below is an example of using this command. .. code-block:: bash - $ php app/console fos:user:deactivate testuser - $ # OR if you are using Symfony >= 2.8 with the new directory structure $ php bin/console fos:user:deactivate testuser Promote a User diff --git a/Resources/doc/configuration_reference.rst b/Resources/doc/configuration_reference.rst index 5bbad73966..3e607a6008 100644 --- a/Resources/doc/configuration_reference.rst +++ b/Resources/doc/configuration_reference.rst @@ -19,12 +19,12 @@ All available configuration options are listed below with their default values. sender_name: webmaster profile: form: - type: FOS\UserBundle\Form\Type\ProfileFormType # or 'fos_user_profile' on Symfony < 2.8 + type: FOS\UserBundle\Form\Type\ProfileFormType name: fos_user_profile_form validation_groups: [Profile, Default] change_password: form: - type: FOS\UserBundle\Form\Type\ChangePasswordFormType # or 'fos_user_change_password' on Symfony < 2.8 + type: FOS\UserBundle\Form\Type\ChangePasswordFormType name: fos_user_change_password_form validation_groups: [ChangePassword, Default] registration: @@ -35,7 +35,7 @@ All available configuration options are listed below with their default values. enabled: false # change to true for required email confirmation template: '@FOSUser/Registration/email.txt.twig' form: - type: FOS\UserBundle\Form\Type\RegistrationFormType # or 'fos_user_registration' on Symfony < 2.8 + type: FOS\UserBundle\Form\Type\RegistrationFormType name: fos_user_registration_form validation_groups: [Registration, Default] resetting: @@ -47,7 +47,7 @@ All available configuration options are listed below with their default values. sender_name: ... template: '@FOSUser/Resetting/email.txt.twig' form: - type: FOS\UserBundle\Form\Type\ResettingFormType # or 'fos_user_resetting' on Symfony < 2.8 + type: FOS\UserBundle\Form\Type\ResettingFormType name: fos_user_resetting_form validation_groups: [ResetPassword, Default] service: @@ -60,6 +60,6 @@ All available configuration options are listed below with their default values. group_class: ~ # Required when using groups group_manager: fos_user.group_manager.default form: - type: FOS\UserBundle\Form\Type\GroupFormType # or 'fos_user_group' on Symfony < 2.8 + type: FOS\UserBundle\Form\Type\GroupFormType name: fos_user_group_form validation_groups: [Registration, Default] diff --git a/Resources/doc/form_type.rst b/Resources/doc/form_type.rst index f404484bef..be658898f2 100644 --- a/Resources/doc/form_type.rst +++ b/Resources/doc/form_type.rst @@ -10,9 +10,6 @@ instance:: public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add('recipient', 'FOS\UserBundle\Form\Type\UsernameFormType'); - - // if you are using Symfony < 2.8 you should use the old name instead - // $builder->add('recipient', 'fos_user_username'); } } diff --git a/Resources/doc/index.rst b/Resources/doc/index.rst index 742314f79e..0e040c163d 100644 --- a/Resources/doc/index.rst +++ b/Resources/doc/index.rst @@ -15,7 +15,7 @@ For a video tutorial, check out `FOSUserBundle FTW`_ by KnpUniversity. Prerequisites ------------- -This version of the bundle requires Symfony 2.7+. If you are using an older +This version of the bundle requires Symfony 2.8+. If you are using an older Symfony version, please use the 1.3.x releases of the bundle. Translations @@ -277,8 +277,6 @@ in your application: form_login: provider: fos_userbundle csrf_token_generator: security.csrf.token_manager - # if you are using Symfony < 2.8, use the following config instead: - # csrf_provider: form.csrf_provider logout: true anonymous: true diff --git a/Resources/doc/overriding_forms.rst b/Resources/doc/overriding_forms.rst index 53f026cf59..d7d2bf1748 100644 --- a/Resources/doc/overriding_forms.rst +++ b/Resources/doc/overriding_forms.rst @@ -86,9 +86,6 @@ the form type hierarchy and then adds the custom ``name`` field. public function getParent() { return 'FOS\UserBundle\Form\Type\RegistrationFormType'; - - // Or for Symfony < 2.8 - // return 'fos_user_registration'; } public function getBlockPrefix() @@ -159,8 +156,6 @@ changing the registration form type in YAML. registration: form: type: AppBundle\Form\RegistrationType - # if you are using Symfony < 2.8 you should use the type name instead - # type: app_user_registration Note how the ``alias`` value used in your form type's service configuration tag is used in the bundle configuration to tell the FOSUserBundle to use your custom diff --git a/Tests/DependencyInjection/FOSUserExtensionTest.php b/Tests/DependencyInjection/FOSUserExtensionTest.php index 229ed44899..91cf526018 100644 --- a/Tests/DependencyInjection/FOSUserExtensionTest.php +++ b/Tests/DependencyInjection/FOSUserExtensionTest.php @@ -12,7 +12,6 @@ namespace FOS\UserBundle\Tests\DependencyInjection; use FOS\UserBundle\DependencyInjection\FOSUserExtension; -use FOS\UserBundle\Util\LegacyFormHelper; use PHPUnit\Framework\TestCase; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Yaml\Parser; @@ -176,16 +175,6 @@ public function testUserLoadManagerClass() $this->assertAlias('fos_user.group_manager.default', 'fos_user.group_manager'); } - public function testUserLoadFormClassWithDefaults() - { - $this->createEmptyConfiguration(); - - $this->assertParameter(LegacyFormHelper::getType('FOS\UserBundle\Form\Type\ProfileFormType'), 'fos_user.profile.form.type'); - $this->assertParameter(LegacyFormHelper::getType('FOS\UserBundle\Form\Type\RegistrationFormType'), 'fos_user.registration.form.type'); - $this->assertParameter(LegacyFormHelper::getType('FOS\UserBundle\Form\Type\ChangePasswordFormType'), 'fos_user.change_password.form.type'); - $this->assertParameter(LegacyFormHelper::getType('FOS\UserBundle\Form\Type\ResettingFormType'), 'fos_user.resetting.form.type'); - } - public function testUserLoadFormClass() { $this->createFullConfiguration(); diff --git a/Tests/Form/Type/ChangePasswordFormTypeTest.php b/Tests/Form/Type/ChangePasswordFormTypeTest.php index 8baf249dec..d6bd29f031 100644 --- a/Tests/Form/Type/ChangePasswordFormTypeTest.php +++ b/Tests/Form/Type/ChangePasswordFormTypeTest.php @@ -13,7 +13,6 @@ use FOS\UserBundle\Form\Type\ChangePasswordFormType; use FOS\UserBundle\Tests\TestUser; -use FOS\UserBundle\Util\LegacyFormHelper; class ChangePasswordFormTypeTest extends ValidatorExtensionTypeTestCase { @@ -22,7 +21,7 @@ public function testSubmit() $user = new TestUser(); $user->setPassword('foo'); - $form = $this->factory->create(LegacyFormHelper::getType('FOS\UserBundle\Form\Type\ChangePasswordFormType'), $user); + $form = $this->factory->create(ChangePasswordFormType::class, $user); $formData = array( 'current_password' => 'foo', 'plainPassword' => array( diff --git a/Tests/Form/Type/GroupFormTypeTest.php b/Tests/Form/Type/GroupFormTypeTest.php index bc4aea4504..e96a56a7cc 100644 --- a/Tests/Form/Type/GroupFormTypeTest.php +++ b/Tests/Form/Type/GroupFormTypeTest.php @@ -13,7 +13,6 @@ use FOS\UserBundle\Form\Type\GroupFormType; use FOS\UserBundle\Tests\TestGroup; -use FOS\UserBundle\Util\LegacyFormHelper; class GroupFormTypeTest extends TypeTestCase { @@ -21,7 +20,7 @@ public function testSubmit() { $group = new TestGroup('foo'); - $form = $this->factory->create(LegacyFormHelper::getType('FOS\UserBundle\Form\Type\GroupFormType'), $group); + $form = $this->factory->create(GroupFormType::class, $group); $formData = array( 'name' => 'bar', ); diff --git a/Tests/Form/Type/ProfileFormTypeTest.php b/Tests/Form/Type/ProfileFormTypeTest.php index 2d34614a88..37d07ee042 100644 --- a/Tests/Form/Type/ProfileFormTypeTest.php +++ b/Tests/Form/Type/ProfileFormTypeTest.php @@ -13,7 +13,6 @@ use FOS\UserBundle\Form\Type\ProfileFormType; use FOS\UserBundle\Tests\TestUser; -use FOS\UserBundle\Util\LegacyFormHelper; class ProfileFormTypeTest extends ValidatorExtensionTypeTestCase { @@ -21,7 +20,7 @@ public function testSubmit() { $user = new TestUser(); - $form = $this->factory->create(LegacyFormHelper::getType('FOS\UserBundle\Form\Type\ProfileFormType'), $user); + $form = $this->factory->create(ProfileFormType::class, $user); $formData = array( 'username' => 'bar', 'email' => 'john@doe.com', diff --git a/Tests/Form/Type/RegistrationFormTypeTest.php b/Tests/Form/Type/RegistrationFormTypeTest.php index fbabc8e106..abf8ad548d 100644 --- a/Tests/Form/Type/RegistrationFormTypeTest.php +++ b/Tests/Form/Type/RegistrationFormTypeTest.php @@ -13,7 +13,6 @@ use FOS\UserBundle\Form\Type\RegistrationFormType; use FOS\UserBundle\Tests\TestUser; -use FOS\UserBundle\Util\LegacyFormHelper; class RegistrationFormTypeTest extends ValidatorExtensionTypeTestCase { @@ -21,7 +20,7 @@ public function testSubmit() { $user = new TestUser(); - $form = $this->factory->create(LegacyFormHelper::getType('FOS\UserBundle\Form\Type\RegistrationFormType'), $user); + $form = $this->factory->create(RegistrationFormType::class, $user); $formData = array( 'username' => 'bar', 'email' => 'john@doe.com', diff --git a/Tests/Form/Type/ResettingFormTypeTest.php b/Tests/Form/Type/ResettingFormTypeTest.php index fb497efe91..078490ff05 100644 --- a/Tests/Form/Type/ResettingFormTypeTest.php +++ b/Tests/Form/Type/ResettingFormTypeTest.php @@ -13,7 +13,6 @@ use FOS\UserBundle\Form\Type\ResettingFormType; use FOS\UserBundle\Tests\TestUser; -use FOS\UserBundle\Util\LegacyFormHelper; class ResettingFormTypeTest extends ValidatorExtensionTypeTestCase { @@ -21,7 +20,7 @@ public function testSubmit() { $user = new TestUser(); - $form = $this->factory->create(LegacyFormHelper::getType('FOS\UserBundle\Form\Type\ResettingFormType'), $user); + $form = $this->factory->create(ResettingFormType::class, $user); $formData = array( 'plainPassword' => array( 'first' => 'test', diff --git a/Util/LegacyFormHelper.php b/Util/LegacyFormHelper.php deleted file mode 100644 index 69c09fc6fd..0000000000 --- a/Util/LegacyFormHelper.php +++ /dev/null @@ -1,72 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace FOS\UserBundle\Util; - -/** - * @internal - * - * @author Gabor Egyed - */ -final class LegacyFormHelper -{ - /** - * @var string[] - */ - private static $map = array( - 'FOS\UserBundle\Form\Type\ChangePasswordFormType' => 'fos_user_change_password', - 'FOS\UserBundle\Form\Type\GroupFormType' => 'fos_user_group', - 'FOS\UserBundle\Form\Type\ProfileFormType' => 'fos_user_profile', - 'FOS\UserBundle\Form\Type\RegistrationFormType' => 'fos_user_registration', - 'FOS\UserBundle\Form\Type\ResettingFormType' => 'fos_user_resetting', - 'Symfony\Component\Form\Extension\Core\Type\EmailType' => 'email', - 'Symfony\Component\Form\Extension\Core\Type\PasswordType' => 'password', - 'Symfony\Component\Form\Extension\Core\Type\RepeatedType' => 'repeated', - 'Symfony\Component\Form\Extension\Core\Type\TextType' => 'text', - ); - - /** - * @param $class - * - * @return mixed - */ - public static function getType($class) - { - if (!self::isLegacy()) { - return $class; - } - - if (!isset(self::$map[$class])) { - throw new \InvalidArgumentException(sprintf('Form type with class "%s" can not be found. Please check for typos or add it to the map in LegacyFormHelper', $class)); - } - - return self::$map[$class]; - } - - /** - * @return bool - */ - public static function isLegacy() - { - return !method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix'); - } - - /** - * LegacyFormHelper constructor. - */ - private function __construct() - { - } - - private function __clone() - { - } -} diff --git a/composer.json b/composer.json index 3894c255fc..a06cd47ca8 100644 --- a/composer.json +++ b/composer.json @@ -21,22 +21,22 @@ ], "require": { "php": "^5.5.9 || ^7.0", - "symfony/form": "^2.7 || ^3.0", - "symfony/framework-bundle": "^2.7 || ^3.0", - "symfony/security-bundle": "^2.7 || ^3.0", - "symfony/twig-bundle": "^2.7 || ^3.0", + "symfony/form": "^2.8 || ^3.0", + "symfony/framework-bundle": "^2.8 || ^3.0", + "symfony/security-bundle": "^2.8 || ^3.0", + "symfony/twig-bundle": "^2.8 || ^3.0", "twig/twig": "^1.28 || ^2.0", - "symfony/templating": "^2.7 || ^3.0", + "symfony/templating": "^2.8 || ^3.0", "paragonie/random_compat": "^1 || ^2" }, "require-dev": { "doctrine/doctrine-bundle": "^1.3", "friendsofphp/php-cs-fixer": "^1.11", "swiftmailer/swiftmailer": "^4.3 || ^5.0 || ^6.0", - "symfony/console": "^2.7 || ^3.0", - "symfony/phpunit-bridge": "^2.7 || ^3.0", - "symfony/validator": "^2.7 || ^3.0", - "symfony/yaml": "^2.7 || ^3.0", + "symfony/console": "^2.8 || ^3.0", + "symfony/phpunit-bridge": "^2.8 || ^3.0", + "symfony/validator": "^2.8 || ^3.0", + "symfony/yaml": "^2.8 || ^3.0", "phpunit/phpunit": "^4.8.35|^5.4.3" }, "conflict": { From db424e66ea34ca94a5e17a7f4441cbbffd852639 Mon Sep 17 00:00:00 2001 From: Karel Souffriau Date: Wed, 29 Nov 2017 16:59:31 +0100 Subject: [PATCH 2/2] CS fix --- DependencyInjection/Configuration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index d0777a27ef..26ed0601f0 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -11,10 +11,10 @@ namespace FOS\UserBundle\DependencyInjection; +use FOS\UserBundle\Form\Type; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; -use FOS\UserBundle\Form\Type; /** * This class contains the configuration information for the bundle.