[Form] Improved labels generated by default from form names

webmozart · webmozart · commit 658472193dc1 · 2012-04-06T19:50:06.000+02:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FieldType.php b/src/Symfony/Component/Form/Extension/Core/Type/FieldType.php
@@ -200,6 +200,6 @@ public function getName()
 
     private function humanize($text)
     {
-        return ucfirst(strtolower(str_replace('_', ' ', $text)));
+        return ucfirst(trim(strtolower(preg_replace('/[_\s]+/', ' ', $text))));
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FieldTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FieldTypeTest.php
@@ -188,6 +188,22 @@ public function testPassTranslationDomainToView()
         $this->assertSame('test', $view->get('translation_domain'));
     }
 
+    public function testPassDefaultLabelToView()
+    {
+        $form = $this->factory->createNamed('field', '__test___field');
+        $view = $form->createView();
+
+        $this->assertSame('Test field', $view->get('label'));
+    }
+
+    public function testPassLabelToView()
+    {
+        $form = $this->factory->createNamed('field', '__test___field', null, array('label' => 'My label'));
+        $view = $form->createView();
+
+        $this->assertSame('My label', $view->get('label'));
+    }
+
     public function testDefaultTranslationDomain()
     {
         $form = $this->factory->create('field');

Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,6 @@ public function getName()`
`200`	`200`
`201`	`201`	`private function humanize($text)`
`202`	`202`	`{`
`203`		`- return ucfirst(strtolower(str_replace('_', ' ', $text)));`
	`203`	`+ return ucfirst(trim(strtolower(preg_replace('/[_\s]+/', ' ', $text))));`
`204`	`204`	`}`
`205`	`205`	`}`