diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 d6e80012 into e0825289).
This commit is contained in:
Fabien Potencier 2012-06-01 08:37:11 +02:00
parent e08252897a d6e80012b2
commit 1541fe26e4
3 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UPGRADE-2.1.md
View File

@ -628,12 +628,12 @@
* The following methods in `FormBuilder` were deprecated and have a new
equivalent:
* `prependClientTransformer`: `addViewTransformer`
* `appendClientTransformer`: no new equivalent, consider using `addViewTransformer`
* `prependClientTransformer`: no new equivalent, consider using `addViewTransformer`
* `appendClientTransformer`: `addViewTransformer`
* `getClientTransformers`: `getViewTransformers`
* `resetClientTransformers`: `resetViewTransformers`
* `prependNormTransformer`: no new equivalent, consider using `addModelTransformer`
* `appendNormTransformer`: `addModelTransformer`
* `prependNormTransformer`: `addModelTransformer`
* `appendNormTransformer`: no new equivalent, consider using `addModelTransformer`
* `getNormTransformers`: `getModelTransformers`
* `resetNormTransformers`: `resetModelTransformers`

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

@ -243,22 +243,4 @@ class DateTimeTypeTest extends LocalizedTestCase
$view = $form->createView();
$this->assertEquals('datetime', $view->getVar('type'));
}
public function testSubmit_invalidDateTimeSingleText()
{
$form = $this->factory->create('datetime', null, array(
'data_timezone' => 'UTC',
'user_timezone' => 'UTC',
'input' => 'datetime',
'widget' => 'single_text',
'invalid_message' => 'Customized invalid message',
));
$form->bind('2012-04-31 03:04:05');
$this->assertFalse($form->isValid());
$this->assertNull($form->getData());
$this->assertEquals('2012-04-31 03:04:05', $form->getClientData());
$this->assertEquals(array(new FormError('Customized invalid message', array())), $form->getErrors());
}
}

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

@ -547,22 +547,4 @@ class DateTypeTest extends LocalizedTestCase
$view = $form->createView();
$this->assertEquals('date', $view->getVar('type'));
}
public function testInvalidDateWithSingleTextDateTime()
{
$form = $this->factory->create('date', null, array(
'data_timezone' => 'UTC',
'user_timezone' => 'UTC',
'widget' => 'single_text',
'input' => 'datetime',
'invalid_message' => 'Customized invalid message',
));
$form->bind('31.4.2012');
$this->assertFalse($form->isValid());
$this->assertNull($form->getData());
$this->assertEquals('31.4.2012', $form->getClientData());
$this->assertEquals(array(new FormError('Customized invalid message', array())), $form->getErrors());
}
}