symfony
diff --git a/‎UPGRADE-2.8.md
Lines changed: 97 additions & 2 deletions b/‎UPGRADE-2.8.md
Lines changed: 97 additions & 2 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
Lines changed: 4 additions & 4 deletions
@@ -12,7 +12,7 @@ Form
    Before:
 
    ```php
-   $form = $this->createForm('form', $article, array('cascade_validation' => true))
+   $form = $this->createFormBuilder($article, array('cascade_validation' => true))
        ->add('author', new AuthorType())
        ->getForm();
    ```
@@ -22,7 +22,7 @@ Form
    ```php
    use Symfony\Component\Validator\Constraints\Valid;
 
-   $form = $this->createForm('form', $article)
+   $form = $this->createFormBuilder($article)
        ->add('author', new AuthorType(), array(
            'constraints' => new Valid(),
        ))
@@ -42,6 +42,101 @@ Form
        private $author;
    }
    ```
+   
+ * Type names were deprecated and will be removed in Symfony 3.0. Instead of
+   referencing types by name, you should reference them by their
+   fully-qualified class name (FQCN) instead. With PHP 5.5 or later, you should
+   use the "class" constant for that:
+   
+   Before:
+   
+   ```php
+   $form = $this->createFormBuilder()
+       ->add('name', 'text')
+       ->add('age', 'integer')
+       ->getForm();
+   ```
+   
+   After:
+   
+   ```php
+   use Symfony\Component\Form\Extension\Core\Type\FormType;
+   use Symfony\Component\Form\Extension\Core\Type\IntegerType;
+   use Symfony\Component\Form\Extension\Core\Type\TextType;
+   
+   $form = $this->createFormBuilder()
+       ->add('name', TextType::class)
+       ->add('age', IntegerType::class)
+       ->getForm();
+   ```
+   
+   As a further consequence, the method `FormTypeInterface::getName()` was
+   deprecated and will be removed in Symfony 3.0. You should remove this method
+   from your form types.
+   
+   If you define your form types in the Dependency Injection configuration, you
+   should further remove the "alias" attribute:
+   
+   Before:
+   
+   ```xml
+   <service id="my.type" class="Vendor\Type\MyType">
+       <tag name="form.type" alias="mytype" />
+   </service>
+   ```
+   
+   After:
+   
+   ```xml
+   <service id="my.type" class="Vendor\Type\MyType">
+       <tag name="form.type" />
+   </service>
+   ```
+   
+ * Returning type instances from `FormTypeInterface::getParent()` is deprecated
+   and will not be supported anymore in Symfony 3.0. Return the fully-qualified
+   class name of the parent type class instead.
+   
+   Before:
+   
+   ```php
+   class MyType
+   {
+       public function getParent()
+       {
+           return new ParentType();
+       }
+   }
+   ```
+   
+   After:
+   
+   ```php
+   class MyType
+   {
+       public function getParent()
+       {
+           return ParentType::class;
+       }
+   }
+   ```
+   
+ * Passing type instances to `Form::add()`, `FormBuilder::add()` and the
+   `FormFactory::create*()` methods is deprecated and will not be supported
+   anymore in Symfony 3.0. Pass the fully-qualified class name of the type
+   instead.
+   
+   Before:
+   
+   ```php
+   $form = $this->createForm(new MyType());
+   ```
+   
+   After:
+   
+   ```php
+   $form = $this->createForm(MyType::class);
+   ```
 
 Translator
 ----------
 
@@ -94,12 +94,12 @@ public static function createChoiceName($choice, $key, $value)
      * Gets important parts from QueryBuilder that will allow to cache its results.
      * For instance in ORM two query builders with an equal SQL string and
      * equal parameters are considered to be equal.
-     * 
+     *
      * @param object $queryBuilder
-     * 
+     *
      * @return array|false Array with important QueryBuilder parts or false if
      *                     they can't be determined
-     * 
+     *
      * @internal This method is public to be usable as callback. It should not
      *           be used in user code.
      */
@@ -335,6 +335,6 @@ abstract public function getLoader(ObjectManager $manager, $queryBuilder, $class
 
     public function getParent()
     {
-        return 'choice';
+        return 'Symfony\Component\Form\Extension\Core\Type\ChoiceType';
     }
 }