Merge branch '2.0'
* 2.0: [DoctrineBundle] fixed a unit test (detected thanks to PHP 3.6.0) [Form] Fixed lacking attributes in DateTimeType
This commit is contained in:
commit
0e852fe232
@ -513,7 +513,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
|||||||
$this->assertEquals('%doctrine.orm.cache.apc.class%', $cacheDefinition->getClass());
|
$this->assertEquals('%doctrine.orm.cache.apc.class%', $cacheDefinition->getClass());
|
||||||
|
|
||||||
$configDefinition = $container->getDefinition('doctrine.orm.default_configuration');
|
$configDefinition = $container->getDefinition('doctrine.orm.default_configuration');
|
||||||
$this->assertDICDefinitionMethodCallOnce($configDefinition, 'setAutoGenerateProxyClasses', array(true));
|
$this->assertDICDefinitionMethodCallOnce($configDefinition, 'setAutoGenerateProxyClasses', array('%doctrine.orm.auto_generate_proxy_classes%'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSingleEntityManagerMultipleMappingBundleDefinitions()
|
public function testSingleEntityManagerMultipleMappingBundleDefinitions()
|
||||||
|
@ -55,6 +55,8 @@ class DateTimeType extends AbstractType
|
|||||||
'days',
|
'days',
|
||||||
'empty_value',
|
'empty_value',
|
||||||
'required',
|
'required',
|
||||||
|
'invalid_message',
|
||||||
|
'invalid_message_parameters'
|
||||||
)));
|
)));
|
||||||
$timeOptions = array_intersect_key($options, array_flip(array(
|
$timeOptions = array_intersect_key($options, array_flip(array(
|
||||||
'hours',
|
'hours',
|
||||||
@ -63,6 +65,8 @@ class DateTimeType extends AbstractType
|
|||||||
'with_seconds',
|
'with_seconds',
|
||||||
'empty_value',
|
'empty_value',
|
||||||
'required',
|
'required',
|
||||||
|
'invalid_message',
|
||||||
|
'invalid_message_parameters'
|
||||||
)));
|
)));
|
||||||
|
|
||||||
// If `widget` is set, overwrite widget options from `date` and `time`
|
// If `widget` is set, overwrite widget options from `date` and `time`
|
||||||
|
@ -16,6 +16,7 @@ require_once __DIR__ . '/LocalizedTestCase.php';
|
|||||||
use Symfony\Component\Form\DateTimeField;
|
use Symfony\Component\Form\DateTimeField;
|
||||||
use Symfony\Component\Form\DateField;
|
use Symfony\Component\Form\DateField;
|
||||||
use Symfony\Component\Form\TimeField;
|
use Symfony\Component\Form\TimeField;
|
||||||
|
use Symfony\Component\Form\FormError;
|
||||||
|
|
||||||
class DateTimeTypeTest extends LocalizedTestCase
|
class DateTimeTypeTest extends LocalizedTestCase
|
||||||
{
|
{
|
||||||
@ -234,4 +235,27 @@ class DateTimeTypeTest extends LocalizedTestCase
|
|||||||
|
|
||||||
$this->assertDateTimeEquals($dateTime, $form->getData());
|
$this->assertDateTimeEquals($dateTime, $form->getData());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testSubmit_invalidDateTime()
|
||||||
|
{
|
||||||
|
$form = $this->factory->create('datetime', null, array(
|
||||||
|
'invalid_message' => 'Customized invalid message',
|
||||||
|
));
|
||||||
|
|
||||||
|
$form->bind(array(
|
||||||
|
'date' => array(
|
||||||
|
'day' => '31',
|
||||||
|
'month' => '9',
|
||||||
|
'year' => '2010',
|
||||||
|
),
|
||||||
|
'time' => array(
|
||||||
|
'hour' => '25',
|
||||||
|
'minute' => '4',
|
||||||
|
),
|
||||||
|
));
|
||||||
|
|
||||||
|
$this->assertFalse($form->isValid());
|
||||||
|
$this->assertEquals(array(new FormError('Customized invalid message', array())), $form['date']->getErrors());
|
||||||
|
$this->assertEquals(array(new FormError('Customized invalid message', array())), $form['time']->getErrors());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user