Commit84f5de9

committed

mix attr options between type-guess options and user options

1 parent20485d1 commit84f5de9Copy full SHA for 84f5de9

File tree

-3

lines changed

-3

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,13 @@ public function createBuilderForProperty($class, $property, $data = null, array`
`126`	`126`
`127`	`127`	`// user options may override guessed options`
`128`	`128`	`if ($typeGuess) {`
`129`		`-$options =array_merge($typeGuess->getOptions(),$options);`
	`129`	`+$attrs =array();`
	`130`	`+$typeGuessOptions =$typeGuess->getOptions();`
	`131`	`+if (isset($typeGuessOptions['attr']) &&isset($options['attr'])) {`
	`132`	`+$attrs =array('attr' =>array_merge($typeGuessOptions['attr'],$options['attr']));`
	`133`	`+ }`
	`134`	`+`
	`135`	`+$options =array_merge($typeGuessOptions,$options,$attrs);`
`130`	`136`	`}`
`131`	`137`
`132`	`138`	`return$this->createNamedBuilder($property,$type,$data,$options);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -450,15 +450,15 @@ public function testOptionsCanBeOverridden()`
`450`	`450`	`->with('Application\Author','firstName')`
`451`	`451`	`->will($this->returnValue(newTypeGuess(`
`452`	`452`	`'text',`
`453`		`-array('attr' =>array('maxlength' =>10)),`
	`453`	`+array('attr' =>array('class' =>'foo','maxlength' =>10)),`
`454`	`454`	`Guess::MEDIUM_CONFIDENCE`
`455`	`455`	`)));`
`456`	`456`
`457`	`457`	`$factory =$this->getMockFactory(array('createNamedBuilder'));`
`458`	`458`
`459`	`459`	`$factory->expects($this->once())`
`460`	`460`	`->method('createNamedBuilder')`
`461`		`- ->with('firstName','text',null,array('attr' =>array('maxlength' =>11)))`
	`461`	`+ ->with('firstName','text',null,array('attr' =>array('class' =>'foo','maxlength' =>11)))`
`462`	`462`	`->will($this->returnValue('builderInstance'));`
`463`	`463`
`464`	`464`	`$this->builder =$factory->createBuilderForProperty(`

Comments

(0)