Skip to content

Commit 1541fe2

Browse files
committed
merged branch bschussek/fix (PR #4478)
Commits ------- d6e8001 Fixed mistake in UPGRADE file a1cd8ae [Form] Removed invalid tests introduced again upon merge Discussion ---------- [Form] Fixed failing tests in master --------------------------------------------------------------------------- by travisbot at 2012-06-01T06:24:55Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1495799) (merged d6e8001 into e082528).
2 parents e082528 + d6e8001 commit 1541fe2

File tree

3 files changed

+4
-40
lines changed

3 files changed

+4
-40
lines changed

UPGRADE-2.1.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -628,12 +628,12 @@
628628
* The following methods in `FormBuilder` were deprecated and have a new
629629
equivalent:
630630
631-
* `prependClientTransformer`: `addViewTransformer`
632-
* `appendClientTransformer`: no new equivalent, consider using `addViewTransformer`
631+
* `prependClientTransformer`: no new equivalent, consider using `addViewTransformer`
632+
* `appendClientTransformer`: `addViewTransformer`
633633
* `getClientTransformers`: `getViewTransformers`
634634
* `resetClientTransformers`: `resetViewTransformers`
635-
* `prependNormTransformer`: no new equivalent, consider using `addModelTransformer`
636-
* `appendNormTransformer`: `addModelTransformer`
635+
* `prependNormTransformer`: `addModelTransformer`
636+
* `appendNormTransformer`: no new equivalent, consider using `addModelTransformer`
637637
* `getNormTransformers`: `getModelTransformers`
638638
* `resetNormTransformers`: `resetModelTransformers`
639639

src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -243,22 +243,4 @@ public function testSingleTextWidgetShouldUseTheRightInputType()
243243
$view = $form->createView();
244244
$this->assertEquals('datetime', $view->getVar('type'));
245245
}
246-
247-
public function testSubmit_invalidDateTimeSingleText()
248-
{
249-
$form = $this->factory->create('datetime', null, array(
250-
'data_timezone' => 'UTC',
251-
'user_timezone' => 'UTC',
252-
'input' => 'datetime',
253-
'widget' => 'single_text',
254-
'invalid_message' => 'Customized invalid message',
255-
));
256-
257-
$form->bind('2012-04-31 03:04:05');
258-
259-
$this->assertFalse($form->isValid());
260-
$this->assertNull($form->getData());
261-
$this->assertEquals('2012-04-31 03:04:05', $form->getClientData());
262-
$this->assertEquals(array(new FormError('Customized invalid message', array())), $form->getErrors());
263-
}
264246
}

src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -547,22 +547,4 @@ public function testSingleTextWidgetShouldUseTheRightInputType()
547547
$view = $form->createView();
548548
$this->assertEquals('date', $view->getVar('type'));
549549
}
550-
551-
public function testInvalidDateWithSingleTextDateTime()
552-
{
553-
$form = $this->factory->create('date', null, array(
554-
'data_timezone' => 'UTC',
555-
'user_timezone' => 'UTC',
556-
'widget' => 'single_text',
557-
'input' => 'datetime',
558-
'invalid_message' => 'Customized invalid message',
559-
));
560-
561-
$form->bind('31.4.2012');
562-
563-
$this->assertFalse($form->isValid());
564-
$this->assertNull($form->getData());
565-
$this->assertEquals('31.4.2012', $form->getClientData());
566-
$this->assertEquals(array(new FormError('Customized invalid message', array())), $form->getErrors());
567-
}
568550
}

0 commit comments

Comments
 (0)