symfony · fabpot · Oct 1, 2015 · Sep 30, 2015 · Sep 30, 2015 · Sep 30, 2015
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -22,7 +22,6 @@
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntityValidator;
 use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;
-use Symfony\Component\Validator\Validation;
 use Doctrine\ORM\Tools\SchemaTool;
 
 /**
@@ -47,11 +46,6 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest
      */
     protected $repository;
 
-    protected function getApiVersion()
-    {
-        return Validation::API_VERSION_2_5;
-    }
-
     protected function setUp()
     {
         $this->em = DoctrineTestHelper::createTestEntityManager();

diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -13,7 +13,7 @@
 
 use Symfony\Bridge\Twig\TokenParser\FormThemeTokenParser;
 use Symfony\Bridge\Twig\Form\TwigRendererInterface;
-use Symfony\Component\Form\Extension\Core\View\ChoiceView;
+use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 
 /**
  * FormExtension extends Twig with form capabilities.

diff --git a/src/Symfony/Component/Form/AbstractExtension.php b/src/Symfony/Component/Form/AbstractExtension.php
@@ -156,15 +156,7 @@ private function initTypes()
                 throw new UnexpectedTypeException($type, 'Symfony\Component\Form\FormTypeInterface');
             }
 
-            // Since Symfony 3.0 types are identified by their FQCN
-            $fqcn = get_class($type);
-            $legacyName = $type->getName();
-
-            $this->types[$fqcn] = $type;
-
-            if ($legacyName) {
-                $this->types[$legacyName] = $type;
-            }
+            $this->types[get_class($type)] = $type;
         }
     }
 

diff --git a/src/Symfony/Component/Form/AbstractType.php b/src/Symfony/Component/Form/AbstractType.php
@@ -47,15 +47,6 @@ public function configureOptions(OptionsResolver $resolver)
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        // As of Symfony 2.8, the name defaults to the fully-qualified class name
-        return get_class($this);
-    }
-
     /**
      * Returns the prefix of the template block name for this type.
      *
@@ -66,11 +57,7 @@ public function getName()
      */
     public function getBlockPrefix()
     {
-        $fqcn = get_class($this);
-        $name = $this->getName();
-
-        // For BC: Use the name as block prefix if one is set
-        return $name !== $fqcn ? $name : StringUtil::fqcnToBlockPrefix($fqcn);
+        return StringUtil::fqcnToBlockPrefix(get_class($this));
     }
 
     /**

diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -378,23 +378,6 @@ public function setByReference($byReference)
         throw new BadMethodCallException('Buttons do not support data mapping.');
     }
 
-    /**
-     * Unsupported method.
-     *
-     * This method should not be invoked.
-     *
-     * @param bool $virtual
-     *
-     * @throws BadMethodCallException
-     *
-     * @deprecated since version 2.3, to be removed in 3.0. Use
-     *             {@link setInheritData()} instead.
-     */
-    public function setVirtual($virtual)
-    {
-        throw new BadMethodCallException('Buttons cannot be virtual.');
-    }
-
     /**
      * Unsupported method.
      *
@@ -587,21 +570,6 @@ public function getByReference()
         return false;
     }
 
-    /**
-     * Unsupported method.
-     *
-     * @return bool Always returns false.
-     *
-     * @deprecated since version 2.3, to be removed in 3.0.
-     *             Use {@link getInheritData()} instead.
-     */
-    public function getVirtual()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\FormConfigBuilder::getInheritData method instead.', E_USER_DEPRECATED);
-
-        return false;
-    }
-
     /**
      * Unsupported method.
      *

diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
@@ -15,12 +15,10 @@
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
 use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
 use Symfony\Component\Form\ChoiceList\LazyChoiceList;
-use Symfony\Component\Form\ChoiceList\LegacyChoiceListAdapter;
 use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
 use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceListView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
-use Symfony\Component\Form\Extension\Core\View\ChoiceView as LegacyChoiceView;
 
 /**
  * Default implementation of {@link ChoiceListFactoryInterface}.
@@ -65,23 +63,6 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
      */
     public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null)
     {
-        // Backwards compatibility
-        if ($list instanceof LegacyChoiceListAdapter && empty($preferredChoices)
-            && null === $label && null === $index && null === $groupBy && null === $attr) {
-            $mapToNonLegacyChoiceView = function (LegacyChoiceView &$choiceView) {
-                $choiceView = new ChoiceView($choiceView->data, $choiceView->value, $choiceView->label);
-            };
-
-            $adaptedList = $list->getAdaptedList();
-
-            $remainingViews = $adaptedList->getRemainingViews();
-            $preferredViews = $adaptedList->getPreferredViews();
-            array_walk_recursive($remainingViews, $mapToNonLegacyChoiceView);
-            array_walk_recursive($preferredViews, $mapToNonLegacyChoiceView);
-
-            return new ChoiceListView($remainingViews, $preferredViews);
-        }
-
         $preferredViews = array();
         $otherViews = array();
         $choices = $list->getChoices();

diff --git a/src/Symfony/Component/Form/ChoiceList/LegacyChoiceListAdapter.php b/src/Symfony/Component/Form/ChoiceList/LegacyChoiceListAdapter.php
diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php
@@ -9,15 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\Extension\Core\View;
+namespace Symfony\Component\Form\ChoiceList\View;
 
 /**
  * Represents a choice in templates.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.7, to be removed in 3.0.
- *             Use {@link \Symfony\Component\Form\ChoiceList\View\ChoiceView} instead.
  */
 class ChoiceView
 {
@@ -42,32 +39,6 @@ class ChoiceView
      */
     public $data;
 
-    /**
-     * Creates a new ChoiceView.
-     *
-     * @param mixed  $data  The original choice.
-     * @param string $value The view representation of the choice.
-     * @param string $label The label displayed to humans.
-     */
-    public function __construct($data, $value, $label)
-    {
-        $this->data = $data;
-        $this->value = $value;
-        $this->label = $label;
-    }
-}
-
-namespace Symfony\Component\Form\ChoiceList\View;
-
-use Symfony\Component\Form\Extension\Core\View\ChoiceView as LegacyChoiceView;
-
-/**
- * Represents a choice in templates.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class ChoiceView extends LegacyChoiceView
-{
     /**
      * Additional attributes for the HTML tag.
      *
@@ -85,8 +56,9 @@ class ChoiceView extends LegacyChoiceView
      */
     public function __construct($data, $value, $label, array $attr = array())
     {
-        parent::__construct($data, $value, $label);
-
+        $this->data = $data;
+        $this->value = $value;
+        $this->label = $label;
         $this->attr = $attr;
     }
 }
diff --git a/src/Symfony/Component/Form/Exception/AlreadyBoundException.php b/src/Symfony/Component/Form/Exception/AlreadyBoundException.php