diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 9d32ba25b..efd0ea1c0 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -11,7 +11,7 @@ namespace FOS\CommentBundle\DependencyInjection; -use FOS\CommentBundle\Util\LegacyFormHelper; +use FOS\CommentBundle\Form as FormTypes; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; @@ -56,31 +56,31 @@ public function getConfigTreeBuilder() ->children() ->arrayNode('comment')->addDefaultsIfNotSet() ->children() - ->scalarNode('type')->defaultValue(LegacyFormHelper::getType('FOS\CommentBundle\Form\CommentType'))->end() + ->scalarNode('type')->defaultValue(FormTypes\CommentType::class)->end() ->scalarNode('name')->defaultValue('fos_comment_comment')->end() ->end() ->end() ->arrayNode('thread')->addDefaultsIfNotSet() ->children() - ->scalarNode('type')->defaultValue(LegacyFormHelper::getType('FOS\CommentBundle\Form\ThreadType'))->end() + ->scalarNode('type')->defaultValue(FormTypes\ThreadType::class)->end() ->scalarNode('name')->defaultValue('fos_comment_thread')->end() ->end() ->end() ->arrayNode('commentable_thread')->addDefaultsIfNotSet() ->children() - ->scalarNode('type')->defaultValue(LegacyFormHelper::getType('FOS\CommentBundle\Form\CommentableThreadType'))->end() + ->scalarNode('type')->defaultValue(FormTypes\CommentableThreadType::class)->end() ->scalarNode('name')->defaultValue('fos_comment_commentable_thread')->end() ->end() ->end() ->arrayNode('delete_comment')->addDefaultsIfNotSet() ->children() - ->scalarNode('type')->defaultValue(LegacyFormHelper::getType('FOS\CommentBundle\Form\DeleteCommentType'))->end() + ->scalarNode('type')->defaultValue(FormTypes\DeleteCommentType::class)->end() ->scalarNode('name')->defaultValue('fos_comment_delete_comment')->end() ->end() ->end() ->arrayNode('vote')->addDefaultsIfNotSet() ->children() - ->scalarNode('type')->defaultValue(LegacyFormHelper::getType('FOS\CommentBundle\Form\VoteType'))->end() + ->scalarNode('type')->defaultValue(FormTypes\VoteType::class)->end() ->scalarNode('name')->defaultValue('fos_comment_vote')->end() ->end() ->end() diff --git a/Form/CommentType.php b/Form/CommentType.php index 4194d4214..6a949210c 100644 --- a/Form/CommentType.php +++ b/Form/CommentType.php @@ -11,8 +11,8 @@ namespace FOS\CommentBundle\Form; -use FOS\CommentBundle\Util\LegacyFormHelper; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolverInterface; @@ -34,12 +34,7 @@ public function __construct($commentClass) */ public function buildForm(FormBuilderInterface $builder, array $options) { - $builder->add('body', LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\TextareaType')); - } - - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); + $builder->add('body', TextareaType::class); } /** @@ -59,9 +54,4 @@ public function getBlockPrefix() { return 'fos_comment_comment'; } - - public function getName() - { - return $this->getBlockPrefix(); - } } diff --git a/Form/CommentableThreadType.php b/Form/CommentableThreadType.php index 8552a9952..fb065abae 100644 --- a/Form/CommentableThreadType.php +++ b/Form/CommentableThreadType.php @@ -11,8 +11,8 @@ namespace FOS\CommentBundle\Form; -use FOS\CommentBundle\Util\LegacyFormHelper; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolverInterface; @@ -34,12 +34,9 @@ public function __construct($threadClass) */ public function buildForm(FormBuilderInterface $builder, array $options) { - $builder->add('isCommentable', LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\HiddenType'), array('property_path' => 'commentable')); - } - - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); + $builder->add('isCommentable', HiddenType::class, [ + 'property_path' => 'commentable', + ]); } /** @@ -59,9 +56,4 @@ public function getBlockPrefix() { return 'fos_comment_commentable_thread'; } - - public function getName() - { - return $this->getBlockPrefix(); - } } diff --git a/Form/DeleteCommentType.php b/Form/DeleteCommentType.php index 0d674a5ee..1b5ecad19 100644 --- a/Form/DeleteCommentType.php +++ b/Form/DeleteCommentType.php @@ -11,8 +11,8 @@ namespace FOS\CommentBundle\Form; -use FOS\CommentBundle\Util\LegacyFormHelper; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolverInterface; @@ -34,12 +34,7 @@ public function __construct($commentClass) */ public function buildForm(FormBuilderInterface $builder, array $options) { - $builder->add('state', LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\HiddenType')); - } - - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); + $builder->add('state', HiddenType::class); } /** @@ -59,9 +54,4 @@ public function getBlockPrefix() { return 'fos_comment_delete_comment'; } - - public function getName() - { - return $this->getBlockPrefix(); - } } diff --git a/Form/ThreadType.php b/Form/ThreadType.php index c645d76b0..cb1fda994 100644 --- a/Form/ThreadType.php +++ b/Form/ThreadType.php @@ -11,11 +11,11 @@ namespace FOS\CommentBundle\Form; -use FOS\CommentBundle\Util\LegacyFormHelper; 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; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; class ThreadType extends AbstractType { @@ -34,13 +34,8 @@ public function __construct($threadClass) */ public function buildForm(FormBuilderInterface $builder, array $options) { - $builder->add('id', LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\TextType')); - $builder->add('permalink', LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\TextareaType')); - } - - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); + $builder->add('id', TextType::class); + $builder->add('permalink', TextareaType::class); } /** @@ -60,9 +55,4 @@ public function getBlockPrefix() { return 'fos_comment_thread'; } - - public function getName() - { - return $this->getBlockPrefix(); - } } diff --git a/Form/VoteType.php b/Form/VoteType.php index 6d56e8ca3..6fbe9fc26 100644 --- a/Form/VoteType.php +++ b/Form/VoteType.php @@ -11,8 +11,8 @@ namespace FOS\CommentBundle\Form; -use FOS\CommentBundle\Util\LegacyFormHelper; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolverInterface; @@ -34,12 +34,7 @@ public function __construct($voteClass) */ public function buildForm(FormBuilderInterface $builder, array $options) { - $builder->add('value', LegacyFormHelper::getType('Symfony\Component\Form\Extension\Core\Type\TextareaType')); - } - - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); + $builder->add('value', TextareaType::class); } /** @@ -59,9 +54,4 @@ public function getBlockPrefix() { return 'fos_comment_vote'; } - - public function getName() - { - return $this->getBlockPrefix(); - } } diff --git a/Tests/Functional/app/Basic/config.yml b/Tests/Functional/app/Basic/config.yml index 1b04c1599..c5a75cf0b 100644 --- a/Tests/Functional/app/Basic/config.yml +++ b/Tests/Functional/app/Basic/config.yml @@ -11,6 +11,8 @@ fos_comment: vote: FOS\CommentBundle\Tests\Functional\Bundle\CommentBundle\Entity\Vote fos_rest: + service: + templating: twig format_listener: rules: - { path: '^/', priorities: ['json', 'html'], fallback_format: json } diff --git a/Tests/Functional/app/config/default.yml b/Tests/Functional/app/config/default.yml index 5c77efe7e..0b2c99867 100644 --- a/Tests/Functional/app/config/default.yml +++ b/Tests/Functional/app/config/default.yml @@ -10,8 +10,6 @@ framework: enable_annotations: true router: resource: '%kernel.root_dir%/%kernel.test_case%/routing.yml' - templating: - engines: [twig] translator: enabled: false diff --git a/Util/LegacyFormHelper.php b/Util/LegacyFormHelper.php deleted file mode 100644 index 0de4b5c5b..000000000 --- a/Util/LegacyFormHelper.php +++ /dev/null @@ -1,67 +0,0 @@ - - * - * This source file is subject to the MIT license that is bundled - * with this source code in the file LICENSE. - */ - -namespace FOS\CommentBundle\Util; - -/** - * Extracted from FOSUserBundle. - * - * @internal - * - * @author Gabor Egyed - */ -final class LegacyFormHelper -{ - private static $map = array( - 'FOS\CommentBundle\Form\CommentableThreadType' => 'fos_comment_commentable_thread', - 'FOS\CommentBundle\Form\CommentType' => 'fos_comment_comment', - 'FOS\CommentBundle\Form\DeleteCommentType' => 'fos_comment_delete_comment', - 'FOS\CommentBundle\Form\ThreadType' => 'fos_comment_thread', - 'FOS\CommentBundle\Form\VoteType' => 'fos_comment_vote', - 'Symfony\Component\Form\Extension\Core\Type\TextType' => 'text', - 'Symfony\Component\Form\Extension\Core\Type\HiddenType' => 'hidden', - 'Symfony\Component\Form\Extension\Core\Type\TextareaType' => 'textarea', - ); - - private function __construct() - { - } - - private function __clone() - { - } - - /** - * @param string $class - * - * @return string|null - */ - 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'); - } -}