symfony
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/GenericEntityChoiceListTest.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/GenericEntityChoiceListTest.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php
Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php
Lines changed: 4 additions & 4 deletions
@@ -51,7 +51,7 @@ protected function setUp()
         if (!class_exists('Doctrine\ORM\EntityManager')) {
             $this->markTestSkipped('Doctrine ORM is not available.');
         }
-
+        
         $this->em = DoctrineTestHelper::createTestEntityManager();
 
         $schemaTool = new SchemaTool($this->em);
@@ -110,7 +110,7 @@ public function testEntitiesMustHaveAToStringMethod()
     }
 
     /**
-     * @expectedException \Symfony\Component\Form\Exception\FormException
+     * @expectedException \Symfony\Component\Form\Exception\RuntimeException
      */
     public function testChoicesMustBeManaged()
     {
 
@@ -13,6 +13,7 @@
 
 use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\Form\Test\TypeTestCase;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\GroupableEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity;
@@ -22,7 +23,6 @@
 use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\Common\Collections\ArrayCollection;
 use Symfony\Component\Form\Extension\Core\View\ChoiceView;
-use Symfony\Component\Form\Tests\Extension\Core\Type\TypeTestCase;
 
 class EntityTypeTest extends TypeTestCase
 {
 
@@ -67,7 +67,7 @@ public function transform($choice)
         }
 
         if ($this->placeholderPresent) {
-            $values['placeholder'] = false === $index;
+            $values['placeholder'] = 0 === count($valueMap);
         }
 
         return $values;
 
@@ -114,23 +114,23 @@ public function testSubmitWithEmptyValueUnchecked()
         $this->assertNull($form->getViewData());
     }
 
-    public function testBindWithEmptyValueAndFalseUnchecked()
+    public function testSubmitWithEmptyValueAndFalseUnchecked()
     {
         $form = $this->factory->create('checkbox', null, array(
             'value' => '',
         ));
-        $form->bind(false);
+        $form->submit(false);
 
         $this->assertFalse($form->getData());
         $this->assertNull($form->getViewData());
     }
 
-    public function testBindWithEmptyValueAndTrueChecked()
+    public function testSubmitWithEmptyValueAndTrueChecked()
     {
         $form = $this->factory->create('checkbox', null, array(
             'value' => '',
         ));
-        $form->bind(true);
+        $form->submit(true);
 
         $this->assertTrue($form->getData());
         $this->assertSame('', $form->getViewData());
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ protected function setUp()`
`51`	`51`	`if (!class_exists('Doctrine\ORM\EntityManager')) {`
`52`	`52`	`$this->markTestSkipped('Doctrine ORM is not available.');`
`53`	`53`	`}`
`54`		`-`
	`54`	`+`
`55`	`55`	`$this->em = DoctrineTestHelper::createTestEntityManager();`
`56`	`56`
`57`	`57`	`$schemaTool = new SchemaTool($this->em);`
`@@ -110,7 +110,7 @@ public function testEntitiesMustHaveAToStringMethod()`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`/**`
`113`		`- * @expectedException \Symfony\Component\Form\Exception\FormException`
	`113`	`+ * @expectedException \Symfony\Component\Form\Exception\RuntimeException`
`114`	`114`	`*/`
`115`	`115`	`public function testChoicesMustBeManaged()`
`116`	`116`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function transform($choice)`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`if ($this->placeholderPresent) {`
`70`		`- $values['placeholder'] = false === $index;`
	`70`	`+ $values['placeholder'] = 0 === count($valueMap);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`return $values;`
Original file line number	Diff line number	Diff line change
`@@ -114,23 +114,23 @@ public function testSubmitWithEmptyValueUnchecked()`
`114`	`114`	`$this->assertNull($form->getViewData());`
`115`	`115`	`}`
`116`	`116`
`117`		`- public function testBindWithEmptyValueAndFalseUnchecked()`
	`117`	`+ public function testSubmitWithEmptyValueAndFalseUnchecked()`
`118`	`118`	`{`
`119`	`119`	`$form = $this->factory->create('checkbox', null, array(`
`120`	`120`	`'value' => '',`
`121`	`121`	`));`
`122`		`- $form->bind(false);`
	`122`	`+ $form->submit(false);`
`123`	`123`
`124`	`124`	`$this->assertFalse($form->getData());`
`125`	`125`	`$this->assertNull($form->getViewData());`
`126`	`126`	`}`
`127`	`127`
`128`		`- public function testBindWithEmptyValueAndTrueChecked()`
	`128`	`+ public function testSubmitWithEmptyValueAndTrueChecked()`
`129`	`129`	`{`
`130`	`130`	`$form = $this->factory->create('checkbox', null, array(`
`131`	`131`	`'value' => '',`
`132`	`132`	`));`
`133`		`- $form->bind(true);`
	`133`	`+ $form->submit(true);`
`134`	`134`
`135`	`135`	`$this->assertTrue($form->getData());`
`136`	`136`	`$this->assertSame('', $form->getViewData());`