merged branch bschussek/issue6862 (PR symfony#7150)

fabpot · fabpot · commit 37d049122cea · 2013-02-21T22:46:58.000+01:00
This PR was merged into the 2.0 branch. Commits ------- f8812b2 [Form] Fixed "label" option to accept the value "0" Discussion ---------- [Form] Fixed "label" option to accept the value "0" | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#6862 | License | MIT | Doc PR | - @fabpot: This commit will cause troubles when merging 2.0 into 2.1 and up. Tell me if you need help upon conflict resolution.
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FieldType.php b/src/Symfony/Component/Form/Extension/Core/Type/FieldType.php
@@ -52,7 +52,7 @@ public function buildForm(FormBuilder $builder, array $options)
             ->setAttribute('error_mapping', $options['error_mapping'])
             ->setAttribute('max_length', $options['max_length'])
             ->setAttribute('pattern', $options['pattern'])
-            ->setAttribute('label', $options['label'] ?: $this->humanize($builder->getName()))
+            ->setAttribute('label', strlen($options['label']) > 0 ? $options['label'] : $this->humanize($builder->getName()))
             ->setAttribute('attr', $options['attr'] ?: array())
             ->setAttribute('invalid_message', $options['invalid_message'])
             ->setAttribute('invalid_message_parameters', $options['invalid_message_parameters'])
diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/FieldTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/FieldTypeTest.php
@@ -238,4 +238,12 @@ public function testAttributesException()
         $form = $this->factory->create('field', null, array('attr' => ''));
     }
 
+    // https://github.com/symfony/symfony/issues/6862
+    public function testPassZeroLabelToView()
+    {
+        $view = $this->factory->create('field', null, array('label' => 0))->createView();
+
+        $this->assertEquals('0', $view->get('label'));
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -238,4 +238,12 @@ public function testAttributesException()`
`238`	`238`	`$form = $this->factory->create('field', null, array('attr' => ''));`
`239`	`239`	`}`
`240`	`240`
	`241`	`+ // https://github.com/symfony/symfony/issues/6862`
	`242`	`+ public function testPassZeroLabelToView()`
	`243`	`+ {`
	`244`	`+ $view = $this->factory->create('field', null, array('label' => 0))->createView();`
	`245`	`+`
	`246`	`+ $this->assertEquals('0', $view->get('label'));`
	`247`	`+ }`
	`248`	`+`
`241`	`249`	`}`