Skip to content

Commit

Permalink
Removed legacy form helpers
Browse files Browse the repository at this point in the history
  • Loading branch information
@XWB
XWB committed Nov 13, 2019
1 parent 83b361a commit 1b41571
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 137 deletions.
12 changes: 6 additions & 6 deletions DependencyInjection/Configuration.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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()
Expand Down
14 changes: 2 additions & 12 deletions Form/CommentType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}

/**
Expand All @@ -59,9 +54,4 @@ public function getBlockPrefix()
{
return 'fos_comment_comment';
}

public function getName()
{
return $this->getBlockPrefix();
}
}
16 changes: 4 additions & 12 deletions Form/CommentableThreadType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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',
]);
}

/**
Expand All @@ -59,9 +56,4 @@ public function getBlockPrefix()
{
return 'fos_comment_commentable_thread';
}

public function getName()
{
return $this->getBlockPrefix();
}
}
14 changes: 2 additions & 12 deletions Form/DeleteCommentType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}

/**
Expand All @@ -59,9 +54,4 @@ public function getBlockPrefix()
{
return 'fos_comment_delete_comment';
}

public function getName()
{
return $this->getBlockPrefix();
}
}
18 changes: 4 additions & 14 deletions Form/ThreadType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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);
}

/**
Expand All @@ -60,9 +55,4 @@ public function getBlockPrefix()
{
return 'fos_comment_thread';
}

public function getName()
{
return $this->getBlockPrefix();
}
}
14 changes: 2 additions & 12 deletions Form/VoteType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}

/**
Expand All @@ -59,9 +54,4 @@ public function getBlockPrefix()
{
return 'fos_comment_vote';
}

public function getName()
{
return $this->getBlockPrefix();
}
}
2 changes: 2 additions & 0 deletions Tests/Functional/app/Basic/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
2 changes: 0 additions & 2 deletions Tests/Functional/app/config/default.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ framework:
enable_annotations: true
router:
resource: '%kernel.root_dir%/%kernel.test_case%/routing.yml'
templating:
engines: [twig]
translator:
enabled: false

Expand Down
67 changes: 0 additions & 67 deletions Util/LegacyFormHelper.php
View file

This file was deleted.

0 comments on commit 1b41571

Please sign in to comment.