Commit0309d2c

committed

invalidate forms on transformation failures

1 parent8322494 commit0309d2cCopy full SHA for 0309d2c

File tree

+27

-9

lines changed

+27

-9

lines changed

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -664,6 +664,22 @@ public function submit($submittedData, $clearMissing = true)`
`664`	`664`	`$dispatcher->dispatch(FormEvents::POST_SUBMIT,$event);`
`665`	`665`	`}`
`666`	`666`
	`667`	`+if (null !==$this->transformationFailure &&null ===$this->config->getOption('invalid_message') &&$this->isValid()) {`
	`668`	`+$childrenSynchronized =true;`
	`669`	`+`
	`670`	`+foreach ($this->childrenas$child) {`
	`671`	`+if (!$child->isSynchronized()) {`
	`672`	`+$childrenSynchronized =false;`
	`673`	`+break;`
	`674`	`+ }`
	`675`	`+ }`
	`676`	`+`
	`677`	`+if ($childrenSynchronized) {`
	`678`	`+$clientDataAsString =is_scalar($this->getViewData()) ? (string)$this->getViewData() :\gettype($this->getViewData());`
	`679`	`+$this->addError(newFormError('This value is not valid.','This value is not valid.',array('{{ value }}' =>$clientDataAsString),null,$this->transformationFailure));`
	`680`	`+ }`
	`681`	`+ }`
	`682`	`+`
`667`	`683`	`return$this;`
`668`	`684`	`}`
`669`	`685`

Lines changed: 9 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -385,14 +385,16 @@ function () {`
`385`	`385`
`386`	`386`	`$form->submit('Foobar');`
`387`	`387`
	`388`	`+$submittedData =$this->dataExtractor->extractSubmittedData($form);`
	`389`	`+`
	`390`	`+$this->assertInternalType('array',$submittedData);`
	`391`	`+$this->assertArrayHasKey('submitted_data',$submittedData);`
`388`	`392`	`$this->assertSame(array(`
`389`		`-'submitted_data' =>array(`
`390`		`-'norm' =>"'Foobar'",`
`391`		`-'model' =>'NULL',`
`392`		`- ),`
`393`		`-'errors' =>array(),`
`394`		`-'synchronized' =>'false',`
`395`		`- ),$this->dataExtractor->extractSubmittedData($form));`
	`393`	`+'norm' =>"'Foobar'",`
	`394`	`+'model' =>'NULL',`
	`395`	`+ ),$submittedData['submitted_data']);`
	`396`	`+$this->assertArrayHasKey('synchronized',$submittedData);`
	`397`	`+$this->assertSame('false',$submittedData['synchronized']);`
`396`	`398`	`}`
`397`	`399`
`398`	`400`	`publicfunctiontestExtractViewVariables()`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public function testAbortMappingIfNotSynchronized()`
`182`	`182`	`$this->mapper->mapViolation($violation,$parent);`
`183`	`183`
`184`	`184`	`$this->assertCount(0,$parent->getErrors(),$parent->getName().' should not have an error, but has one');`
`185`		`-$this->assertCount(0,$child->getErrors(),$child->getName().' shouldnothave an error, but has one');`
	`185`	`+$this->assertCount(1,$child->getErrors(),$child->getName().' should have an error as it is not synchronized');`
`186`	`186`	`$this->assertCount(0,$grandChild->getErrors(),$grandChild->getName().' should not have an error, but has one');`
`187`	`187`	`}`
`188`	`188`
`@@ -206,7 +206,7 @@ public function testAbortDotRuleMappingIfNotSynchronized()`
`206`	`206`	`$this->mapper->mapViolation($violation,$parent);`
`207`	`207`
`208`	`208`	`$this->assertCount(0,$parent->getErrors(),$parent->getName().' should not have an error, but has one');`
`209`		`-$this->assertCount(0,$child->getErrors(),$child->getName().' shouldnothave an error, but has one');`
	`209`	`+$this->assertCount(1,$child->getErrors(),$child->getName().' should have an error as it is not synchronized');`
`210`	`210`	`$this->assertCount(0,$grandChild->getErrors(),$grandChild->getName().' should not have an error, but has one');`
`211`	`211`	`}`
`212`	`212`

Comments

(0)