This commit is contained in:
Fabien Potencier 2012-05-20 18:17:03 +02:00
parent 9b7aab5e94
commit 1407f112fc
2 changed files with 3 additions and 6 deletions

View File

@ -112,12 +112,10 @@ class CheckboxTypeTest extends TypeTestCase
{ {
// present a binary status field as a checkbox // present a binary status field as a checkbox
$transformer = new CallbackTransformer( $transformer = new CallbackTransformer(
function ($value) function ($value) {
{
return 'expedited' == $value; return 'expedited' == $value;
}, },
function ($value) function ($value) {
{
return $value ? 'expedited' : 'standard'; return $value ? 'expedited' : 'standard';
} }
); );

View File

@ -389,8 +389,7 @@ class Options implements \ArrayAccess, \Iterator, \Countable
{ {
if ($this->options[$option] instanceof LazyOption) { if ($this->options[$option] instanceof LazyOption) {
if ($this->lock[$option]) { if ($this->lock[$option]) {
$conflicts = array_keys(array_filter($this->lock, function ($locked) $conflicts = array_keys(array_filter($this->lock, function ($locked) {
{
return $locked; return $locked;
})); }));