minor #14200 [Form] Updated CHANGELOG and UPGRADE files (webmozart)

This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Updated CHANGELOG and UPGRADE files

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

This PR includes the changes from #14050 in the CHANGELOG/UPGRADE files.

Commits
-------

6863ba5 [Form] Updated CHANGELOG and UPGRADE files

Author: fabpot

CHANGELOG.md

@@ -1,6 +1,16 @@
 CHANGELOG
 =========
 
+2.7.0
+-----
+
+ * added DoctrineChoiceLoader
+ * deprecated EntityChoiceList
+ * deprecated passing a query builder closure to ORMQueryBuilderLoader
+ * deprecated $manager and $em arguments of ORMQueryBuilderLoader
+ * added optional arguments $propertyAccessor and $choiceListFactory to DoctrineOrmExtension constructor
+ * deprecated "loader" and "property" options of DoctrineType
+
 2.4.0
 -----
 

Form/ChoiceList/DoctrineChoiceLoader.php

@@ -69,12 +69,14 @@ class DoctrineChoiceLoader implements ChoiceLoaderInterface
      *                                                 IDs.
      * @param null|EntityLoaderInterface $objectLoader The objects loader
      */
-    public function __construct(ChoiceListFactoryInterface $factory, ObjectManager $manager, $class, IdReader $idReader, EntityLoaderInterface $objectLoader = null)
+    public function __construct(ChoiceListFactoryInterface $factory, ObjectManager $manager, $class, IdReader $idReader = null, EntityLoaderInterface $objectLoader = null)
     {
+        $classMetadata = $manager->getClassMetadata($class);
+
         $this->factory = $factory;
         $this->manager = $manager;
-        $this->class = $manager->getClassMetadata($class)->getName();
-        $this->idReader = $idReader;
+        $this->class = $classMetadata->getName();
+        $this->idReader = $idReader ?: new IdReader($manager, $classMetadata);
         $this->objectLoader = $objectLoader;
     }