merged branch bschussek/fix-submit (PR #8764)
This PR was merged into the 2.3 branch.
Discussion
----------
[Form] Fixed: Added "validation_groups" option to submit button
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #8209
| License | MIT
| Doc PR | -
Commits
-------
c342715
[Form] Fixed: Added "validation_groups" option to submit button
This commit is contained in:
commit
e2f7d1e51a
@ -11,12 +11,10 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Form\Extension\Validator\Type;
|
namespace Symfony\Component\Form\Extension\Validator\Type;
|
||||||
|
|
||||||
use Symfony\Component\Form\AbstractTypeExtension;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||||
*/
|
*/
|
||||||
class SubmitTypeValidatorExtension extends AbstractTypeExtension
|
class SubmitTypeValidatorExtension extends BaseValidatorExtension
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* {@inheritdoc}
|
* {@inheritdoc}
|
||||||
|
@ -0,0 +1,74 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Symfony package.
|
||||||
|
*
|
||||||
|
* (c) Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
|
||||||
|
|
||||||
|
use Symfony\Component\Form\Test\FormInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||||
|
*/
|
||||||
|
abstract class BaseValidatorExtensionTest extends TypeTestCase
|
||||||
|
{
|
||||||
|
public function testValidationGroupNullByDefault()
|
||||||
|
{
|
||||||
|
$form = $this->createForm();
|
||||||
|
|
||||||
|
$this->assertNull($form->getConfig()->getOption('validation_groups'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testValidationGroupsTransformedToArray()
|
||||||
|
{
|
||||||
|
$form = $this->createForm(array(
|
||||||
|
'validation_groups' => 'group',
|
||||||
|
));
|
||||||
|
|
||||||
|
$this->assertEquals(array('group'), $form->getConfig()->getOption('validation_groups'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testValidationGroupsCanBeSetToArray()
|
||||||
|
{
|
||||||
|
$form = $this->createForm(array(
|
||||||
|
'validation_groups' => array('group1', 'group2'),
|
||||||
|
));
|
||||||
|
|
||||||
|
$this->assertEquals(array('group1', 'group2'), $form->getConfig()->getOption('validation_groups'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testValidationGroupsCanBeSetToFalse()
|
||||||
|
{
|
||||||
|
$form = $this->createForm(array(
|
||||||
|
'validation_groups' => false,
|
||||||
|
));
|
||||||
|
|
||||||
|
$this->assertEquals(array(), $form->getConfig()->getOption('validation_groups'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testValidationGroupsCanBeSetToCallback()
|
||||||
|
{
|
||||||
|
$form = $this->createForm(array(
|
||||||
|
'validation_groups' => array($this, 'testValidationGroupsCanBeSetToCallback'),
|
||||||
|
));
|
||||||
|
|
||||||
|
$this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testValidationGroupsCanBeSetToClosure()
|
||||||
|
{
|
||||||
|
$form = $this->createForm(array(
|
||||||
|
'validation_groups' => function(FormInterface $form){ return null; },
|
||||||
|
));
|
||||||
|
|
||||||
|
$this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));
|
||||||
|
}
|
||||||
|
|
||||||
|
abstract protected function createForm(array $options = array());
|
||||||
|
}
|
@ -11,62 +11,8 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
|
namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
|
||||||
|
|
||||||
use Symfony\Component\Form\FormInterface;
|
class FormTypeValidatorExtensionTest extends BaseValidatorExtensionTest
|
||||||
|
|
||||||
class FormTypeValidatorExtensionTest extends TypeTestCase
|
|
||||||
{
|
{
|
||||||
public function testValidationGroupNullByDefault()
|
|
||||||
{
|
|
||||||
$form = $this->factory->create('form');
|
|
||||||
|
|
||||||
$this->assertNull($form->getConfig()->getOption('validation_groups'));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testValidationGroupsTransformedToArray()
|
|
||||||
{
|
|
||||||
$form = $this->factory->create('form', null, array(
|
|
||||||
'validation_groups' => 'group',
|
|
||||||
));
|
|
||||||
|
|
||||||
$this->assertEquals(array('group'), $form->getConfig()->getOption('validation_groups'));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testValidationGroupsCanBeSetToArray()
|
|
||||||
{
|
|
||||||
$form = $this->factory->create('form', null, array(
|
|
||||||
'validation_groups' => array('group1', 'group2'),
|
|
||||||
));
|
|
||||||
|
|
||||||
$this->assertEquals(array('group1', 'group2'), $form->getConfig()->getOption('validation_groups'));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testValidationGroupsCanBeSetToFalse()
|
|
||||||
{
|
|
||||||
$form = $this->factory->create('form', null, array(
|
|
||||||
'validation_groups' => false,
|
|
||||||
));
|
|
||||||
|
|
||||||
$this->assertEquals(array(), $form->getConfig()->getOption('validation_groups'));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testValidationGroupsCanBeSetToCallback()
|
|
||||||
{
|
|
||||||
$form = $this->factory->create('form', null, array(
|
|
||||||
'validation_groups' => array($this, 'testValidationGroupsCanBeSetToCallback'),
|
|
||||||
));
|
|
||||||
|
|
||||||
$this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testValidationGroupsCanBeSetToClosure()
|
|
||||||
{
|
|
||||||
$form = $this->factory->create('form', null, array(
|
|
||||||
'validation_groups' => function(FormInterface $form){ return null; },
|
|
||||||
));
|
|
||||||
|
|
||||||
$this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testSubmitValidatesData()
|
public function testSubmitValidatesData()
|
||||||
{
|
{
|
||||||
$builder = $this->factory->createBuilder('form', null, array(
|
$builder = $this->factory->createBuilder('form', null, array(
|
||||||
@ -82,4 +28,9 @@ class FormTypeValidatorExtensionTest extends TypeTestCase
|
|||||||
// specific data is irrelevant
|
// specific data is irrelevant
|
||||||
$form->submit(array());
|
$form->submit(array());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function createForm(array $options = array())
|
||||||
|
{
|
||||||
|
return $this->factory->create('form', null, $options);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,20 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Symfony package.
|
||||||
|
*
|
||||||
|
* (c) Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
|
||||||
|
|
||||||
|
class SubmitTypeValidatorExtensionTest extends BaseValidatorExtensionTest
|
||||||
|
{
|
||||||
|
protected function createForm(array $options = array())
|
||||||
|
{
|
||||||
|
return $this->factory->create('submit', null, $options);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user