merged branch Tobion/deprecated-form-exception (PR #7927)

fabpot · fabpot · commit c8f95b5dab63 · 2013-05-04T14:33:51.000+02:00
This PR was merged into the master branch. Discussion ---------- [Form] removed deprecated exceptions Removed deprecated exceptions for 2.3. | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 82ff360 [Form] removed deprecated exceptions
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bridge\Doctrine\Form\ChoiceList;
 
-use Symfony\Component\Form\Exception\Exception;
+use Symfony\Component\Form\Exception\RuntimeException;
 use Symfony\Component\Form\Exception\StringCastException;
 use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList;
 use Doctrine\Common\Persistence\ObjectManager;
@@ -406,12 +406,12 @@ private function load()
      *
      * @return array          The identifier values
      *
-     * @throws Exception If the entity does not exist in Doctrine's identity map
+     * @throws RuntimeException If the entity does not exist in Doctrine's identity map
      */
     private function getIdentifierValues($entity)
     {
         if (!$this->em->contains($entity)) {
-            throw new Exception(
+            throw new RuntimeException(
                 'Entities passed to the choice field must be managed. Maybe ' .
                 'persist them in the entity manager?'
             );
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -12,7 +12,7 @@
 namespace Symfony\Bridge\Doctrine\Form\Type;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
-use Symfony\Component\Form\Exception\Exception;
+use Symfony\Component\Form\Exception\RuntimeException;
 use Doctrine\Common\Persistence\ObjectManager;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityChoiceList;
@@ -144,7 +144,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             $em = $registry->getManagerForClass($options['class']);
 
             if (null === $em) {
-                throw new Exception(sprintf(
+                throw new RuntimeException(sprintf(
                     'Class "%s" seems not to be a managed Doctrine entity. ' .
                     'Did you forget to map it?',
                     $options['class']
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/EntityChoiceListTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/EntityChoiceListTest.php
@@ -70,7 +70,7 @@ protected function tearDown()
     }
 
     /**
-     * @expectedException \Symfony\Component\Form\Exception\FormException
+     * @expectedException \Symfony\Component\Form\Exception\StringCastException
      * @expectedMessage   Entity "Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIdentEntity" passed to the choice field must have a "__toString()" method defined (or you can also override the "property" option).
      */
     public function testEntitiesMustHaveAToStringMethod()
@@ -97,7 +97,7 @@ public function testEntitiesMustHaveAToStringMethod()
     }
 
     /**
-     * @expectedException \Symfony\Component\Form\Exception\FormException
+     * @expectedException \Symfony\Component\Form\Exception\RuntimeException
      */
     public function testChoicesMustBeManaged()
     {
diff --git a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
@@ -15,7 +15,6 @@
 use \BaseObject;
 use \Persistent;
 
-use Symfony\Component\Form\Exception\FormException;
 use Symfony\Component\Form\Exception\StringCastException;
 use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
@@ -379,8 +378,6 @@ private function load()
      * @param object $model The model for which to get the identifier
      *
      * @return array
-     *
-     * @throws FormException If the model does not exist
      */
     private function getIdentifierValues($model)
     {
diff --git a/src/Symfony/Component/Form/Exception/Exception.php b/src/Symfony/Component/Form/Exception/Exception.php
diff --git a/src/Symfony/Component/Form/Exception/ExceptionInterface.php b/src/Symfony/Component/Form/Exception/ExceptionInterface.php
@@ -16,6 +16,6 @@
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-interface ExceptionInterface extends FormException
+interface ExceptionInterface
 {
 }
diff --git a/src/Symfony/Component/Form/Exception/FormException.php b/src/Symfony/Component/Form/Exception/FormException.php

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ protected function tearDown()`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`/**`
`73`		`- * @expectedException \Symfony\Component\Form\Exception\FormException`
	`73`	`+ * @expectedException \Symfony\Component\Form\Exception\StringCastException`
`74`	`74`	`* @expectedMessage Entity "Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIdentEntity" passed to the choice field must have a "__toString()" method defined (or you can also override the "property" option).`
`75`	`75`	`*/`
`76`	`76`	`public function testEntitiesMustHaveAToStringMethod()`
`@@ -97,7 +97,7 @@ public function testEntitiesMustHaveAToStringMethod()`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`/**`
`100`		`- * @expectedException \Symfony\Component\Form\Exception\FormException`
	`100`	`+ * @expectedException \Symfony\Component\Form\Exception\RuntimeException`
`101`	`101`	`*/`
`102`	`102`	`public function testChoicesMustBeManaged()`
`103`	`103`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@`
`16`	`16`	`*`
`17`	`17`	`* @author Bernhard Schussek <[email protected]>`
`18`	`18`	`*/`
`19`		`-interface ExceptionInterface extends FormException`
	`19`	`+interface ExceptionInterface`
`20`	`20`	`{`
`21`	`21`	`}`