From 5d97c8ace56fe63b7c755659b7654824e503dd41 Mon Sep 17 00:00:00 2001
From: Steffen Brem <steffenbrem@gmail.com>
Date: Sun, 22 Nov 2015 15:40:24 +0100
Subject: [PATCH 01/14] Make test to check if you can post a UUID as the value
 of a PHPCR document (phpcr_document form type).

---
 .../ChoiceList/PhpcrOdmQueryBuilderLoader.php |  2 +
 Form/Type/DocumentType.php                    | 34 +++++++++++++
 .../Functional/Form/Type/DocumentTypeTest.php | 50 ++++++++++++++-----
 Tests/Resources/Document/ReferrerDocument.php |  8 +++
 Tests/Resources/app/config/config.php         |  8 +++
 composer.json                                 |  4 +-
 6 files changed, 91 insertions(+), 15 deletions(-)

diff --git a/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php b/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
index 7a46d782..4a5b9b88 100644
--- a/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
+++ b/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
@@ -77,6 +77,8 @@ public function getEntities()
      */
     public function getEntitiesByIds($identifier, array $values)
     {
+        //return array_values($this->manager->findMany(null, $values)->toArray());
+
         $values = array_values(array_filter($values, function ($v) {
             return !empty($v);
         }));
diff --git a/Form/Type/DocumentType.php b/Form/Type/DocumentType.php
index 53643523..cbf86023 100644
--- a/Form/Type/DocumentType.php
+++ b/Form/Type/DocumentType.php
@@ -19,6 +19,7 @@
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Bundle\PHPCRBundle\Form\ChoiceList\PhpcrOdmQueryBuilderLoader;
 use Symfony\Bridge\Doctrine\Form\Type\DoctrineType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class DocumentType extends DoctrineType
 {
@@ -34,6 +35,39 @@ public function getLoader(ObjectManager $manager, $queryBuilder, $class)
         );
     }
 
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        parent::configureOptions($resolver);
+//
+//        $resolver->setDefaults(array(
+//            'choice_value' => 'uuid'
+//        ));
+
+//        // Set the "id_reader" option via the normalizer. This option is not
+//        // supposed to be set by the user.
+//        $idReaderNormalizer = function (Options $options) use (&$idReaders) {
+//            $hash = CachingFactoryDecorator::generateHash(array(
+//                $options['em'],
+//                $options['class'],
+//            ));
+//
+//            // The ID reader is a utility that is needed to read the object IDs
+//            // when generating the field values. The callback generating the
+//            // field values has no access to the object manager or the class
+//            // of the field, so we store that information in the reader.
+//            // The reader is cached so that two choice lists for the same class
+//            // (and hence with the same reader) can successfully be cached.
+//            if (!isset($idReaders[$hash])) {
+//                $classMetadata = $options['em']->getClassMetadata($options['class']);
+//                $idReaders[$hash] = new IdReader($options['em'], $classMetadata);
+//            }
+//
+//            return $idReaders[$hash];
+//        };
+//
+//        $resolver->setNormalizer('id_reader', $idReaderNormalizer);
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/Tests/Functional/Form/Type/DocumentTypeTest.php b/Tests/Functional/Form/Type/DocumentTypeTest.php
index 6626c719..240d5bb9 100644
--- a/Tests/Functional/Form/Type/DocumentTypeTest.php
+++ b/Tests/Functional/Form/Type/DocumentTypeTest.php
@@ -25,9 +25,9 @@ public function setUp()
     {
         $this->legacy = !method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix');
 
-        $this->db('PHPCR')->loadFixtures(array(
+        $this->db('PHPCR')->loadFixtures([
             'Doctrine\Bundle\PHPCRBundle\Tests\Resources\DataFixtures\PHPCR\LoadData',
-        ));
+        ]);
         $this->dm = $this->db('PHPCR')->getOm();
         $document = $this->dm->find(null, '/test/doc');
         $this->assertNotNull($document, 'fixture loading not working');
@@ -38,7 +38,7 @@ public function setUp()
     /**
      * @return FormBuilderInterface
      */
-    private function createFormBuilder($data, $options = array())
+    private function createFormBuilder($data, $options = [])
     {
         return $this->container->get('form.factory')->createBuilder($this->legacy ? 'form' : 'Symfony\Component\Form\Extension\Core\Type\FormType', $data, $options);
     }
@@ -51,19 +51,47 @@ private function renderForm(FormBuilderInterface $formBuilder)
         $formView = $formBuilder->getForm()->createView();
         $templating = $this->getContainer()->get('templating');
 
-        return $templating->render('::form.html.twig', array('form' => $formView));
+        return $templating->render('::form.html.twig', ['form' => $formView]);
     }
 
-    public function testUnfiltered()
+    public function testUuid()
     {
+        $document = $this->dm->find(null, '/test/doc');
+        $uuid = $document->uuid;
+
         $formBuilder = $this->createFormBuilder($this->referrer);
 
         $formBuilder
-            ->add('single', $this->legacy ? 'phpcr_document' : 'Doctrine\Bundle\PHPCRBundle\Form\Type\DocumentType', array(
+            ->add('single', $this->legacy ? 'phpcr_document' : 'Doctrine\Bundle\PHPCRBundle\Form\Type\DocumentType', [
                 'class' => 'Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument',
-            ))
+                'choice_value' => 'uuid'
+            ])
         ;
 
+        $form = $formBuilder->getForm();
+
+        $form->submit(array(
+            'single' => $uuid
+        ));
+
+        $this->assertInstanceOf('Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument', $this->referrer->getSingle());
+        $this->assertEquals('doc', $this->referrer->getSingle()->nodename);
+        $this->assertTrue($form->isValid());
+
+        $html = $this->renderForm($formBuilder);
+        $this->assertContains('<select id="form_single" name="form[single]"', $html);
+        $this->assertContains(sprintf('<option value="%s"', $uuid), $html);
+    }
+
+    public function testUnfiltered()
+    {
+        $formBuilder = $this->createFormBuilder($this->referrer);
+
+        $formBuilder
+            ->add('single', $this->legacy ? 'phpcr_document' : 'Doctrine\Bundle\PHPCRBundle\Form\Type\DocumentType', [
+                'class' => 'Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument',
+            ]);
+
         $html = $this->renderForm($formBuilder);
         $this->assertContains('<select id="form_single" name="form[single]"', $html);
         $this->assertContains('<option value="/test/doc"', $html);
@@ -73,17 +101,15 @@ public function testFiltered()
     {
         $qb = $this->dm
             ->getRepository('Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument')
-            ->createQueryBuilder('e')
-        ;
+            ->createQueryBuilder('e');
         $qb->where()->eq()->field('e.text')->literal('thiswillnotmatch');
         $formBuilder = $this->createFormBuilder($this->referrer);
 
         $formBuilder
-            ->add('single', $this->legacy ? 'phpcr_document' : 'Doctrine\Bundle\PHPCRBundle\Form\Type\DocumentType', array(
+            ->add('single', $this->legacy ? 'phpcr_document' : 'Doctrine\Bundle\PHPCRBundle\Form\Type\DocumentType', [
                 'class' => 'Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument',
                 'query_builder' => $qb,
-            ))
-        ;
+            ]);
 
         $html = $this->renderForm($formBuilder);
         $this->assertContains('<select id="form_single" name="form[single]"', $html);
diff --git a/Tests/Resources/Document/ReferrerDocument.php b/Tests/Resources/Document/ReferrerDocument.php
index b62b3879..7d89014c 100644
--- a/Tests/Resources/Document/ReferrerDocument.php
+++ b/Tests/Resources/Document/ReferrerDocument.php
@@ -63,6 +63,14 @@ public function getSingle()
         return $this->single;
     }
 
+    /**
+     * @param $doc
+     */
+    public function setSingle($doc)
+    {
+        $this->single = $doc;
+    }
+
     /**
      * @return mixed
      */
diff --git a/Tests/Resources/app/config/config.php b/Tests/Resources/app/config/config.php
index 9d4fb196..03284738 100644
--- a/Tests/Resources/app/config/config.php
+++ b/Tests/Resources/app/config/config.php
@@ -5,3 +5,11 @@
 
 $loader->import(CMF_TEST_CONFIG_DIR.'/default.php');
 $loader->import(CMF_TEST_CONFIG_DIR.'/phpcr_odm.php');
+
+$config = array(
+    'form' => array(
+        'csrf_protection' => false
+    )
+);
+
+$container->loadFromExtension('framework', $config);
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 3008f808..aafe6e4e 100644
--- a/composer.json
+++ b/composer.json
@@ -19,15 +19,13 @@
     "prefer-stable": true,
     "require": {
         "php": ">=5.3.9",
-        "symfony/framework-bundle": "~2.3.27 || ^2.6.6 || ~3.0",
-        "symfony/doctrine-bridge": "~2.3 || ~3.0",
+        "symfony/symfony": "~2.7",
         "phpcr/phpcr-implementation": "2.1.*",
         "phpcr/phpcr-utils": "^1.2.7"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.5",
         "phpunit/php-code-coverage": "@stable",
-        "symfony/form": "~2.3 || ~3.0",
         "doctrine/phpcr-odm": "~1.3,>1.3.0-rc3",
         "symfony-cmf/testing": "^1.3.0",
         "matthiasnoback/symfony-dependency-injection-test": "~0.7",

From 8c6ed79a89ea8e215833e8beff3ccd2478cc1142 Mon Sep 17 00:00:00 2001
From: Steffen Brem <steffenbrem@gmail.com>
Date: Sun, 22 Nov 2015 18:00:02 +0100
Subject: [PATCH 02/14] Add own IdReader

---
 Form/ChoiceList/IdReader.php                  | 52 ++++++++++++++++
 .../ChoiceList/PhpcrOdmQueryBuilderLoader.php | 11 ++--
 Form/Type/DocumentType.php                    | 59 +++++++++++--------
 .../PhpcrOdmQueryBuilderLoaderTest.php        | 16 +++++
 .../Functional/Form/Type/DocumentTypeTest.php |  1 -
 5 files changed, 111 insertions(+), 28 deletions(-)
 create mode 100644 Form/ChoiceList/IdReader.php

diff --git a/Form/ChoiceList/IdReader.php b/Form/ChoiceList/IdReader.php
new file mode 100644
index 00000000..eacf87e8
--- /dev/null
+++ b/Form/ChoiceList/IdReader.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * (c) Steffen Brem <steffenbrem@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Doctrine\Bundle\PHPCRBundle\Form\ChoiceList;
+
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
+use Doctrine\Common\Persistence\ObjectManager;
+use Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader as BaseIdReader;
+use Symfony\Component\PropertyAccess\PropertyAccess;
+
+class IdReader extends BaseIdReader
+{
+    protected $idField;
+
+    /**
+     * @param ObjectManager $om
+     * @param ClassMetadata $classMetadata
+     * @param string        $idField
+     */
+    public function __construct(ObjectManager $om, ClassMetadata $classMetadata, $idField = null)
+    {
+        parent::__construct($om, $classMetadata);
+        $this->idField = $idField;
+
+        $this->propertyAccessor = PropertyAccess::createPropertyAccessor();
+    }
+
+    public function getIdValue($object)
+    {
+        if ($this->idField !== null) {
+            if ($this->propertyAccessor->isReadable($object, $this->idField)) {
+                return $this->propertyAccessor->getValue($object, $this->idField);
+            }
+        }
+
+        return parent::getIdValue($object);
+    }
+
+    public function getIdField()
+    {
+        if ($this->idField !== null) {
+            return $this->idField;
+        }
+
+        return parent::getIdField();
+    }
+}
\ No newline at end of file
diff --git a/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php b/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
index 4a5b9b88..eee1fb90 100644
--- a/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
+++ b/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
@@ -77,14 +77,12 @@ public function getEntities()
      */
     public function getEntitiesByIds($identifier, array $values)
     {
-        //return array_values($this->manager->findMany(null, $values)->toArray());
-
         $values = array_values(array_filter($values, function ($v) {
             return !empty($v);
         }));
 
         if (0 == count($values)) {
-            return array();
+            return [];
         }
 
         /* performance: if we could figure out whether the query builder is "
@@ -95,8 +93,13 @@ public function getEntitiesByIds($identifier, array $values)
         $qb = clone $this->queryBuilder;
         $alias = $qb->getPrimaryAlias();
         $where = $qb->andWhere()->orX();
+
         foreach ($values as $val) {
-            $where->same($val, $alias);
+            if ($identifier === 'id') {
+                $where->same($val, $alias);
+            } else {
+                $where->eq()->field($alias . '.' . $identifier)->literal($val)->end();
+            }
         }
 
         return $this->getResult($qb);
diff --git a/Form/Type/DocumentType.php b/Form/Type/DocumentType.php
index cbf86023..4b1fbfca 100644
--- a/Form/Type/DocumentType.php
+++ b/Form/Type/DocumentType.php
@@ -16,13 +16,19 @@
 
 namespace Doctrine\Bundle\PHPCRBundle\Form\Type;
 
+use Doctrine\Bundle\PHPCRBundle\Form\ChoiceList\IdReader;
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Bundle\PHPCRBundle\Form\ChoiceList\PhpcrOdmQueryBuilderLoader;
+use Doctrine\ODM\PHPCR\Mapping\ClassMetadata;
 use Symfony\Bridge\Doctrine\Form\Type\DoctrineType;
+use Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator;
+use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class DocumentType extends DoctrineType
 {
+    private $idReaders = array();
+
     /**
      * {@inheritdoc}
      */
@@ -43,29 +49,36 @@ public function configureOptions(OptionsResolver $resolver)
 //            'choice_value' => 'uuid'
 //        ));
 
-//        // Set the "id_reader" option via the normalizer. This option is not
-//        // supposed to be set by the user.
-//        $idReaderNormalizer = function (Options $options) use (&$idReaders) {
-//            $hash = CachingFactoryDecorator::generateHash(array(
-//                $options['em'],
-//                $options['class'],
-//            ));
-//
-//            // The ID reader is a utility that is needed to read the object IDs
-//            // when generating the field values. The callback generating the
-//            // field values has no access to the object manager or the class
-//            // of the field, so we store that information in the reader.
-//            // The reader is cached so that two choice lists for the same class
-//            // (and hence with the same reader) can successfully be cached.
-//            if (!isset($idReaders[$hash])) {
-//                $classMetadata = $options['em']->getClassMetadata($options['class']);
-//                $idReaders[$hash] = new IdReader($options['em'], $classMetadata);
-//            }
-//
-//            return $idReaders[$hash];
-//        };
-//
-//        $resolver->setNormalizer('id_reader', $idReaderNormalizer);
+        $idReaders =& $idReaders;
+
+        // Set the "id_reader" option via the normalizer. This option is not
+        // supposed to be set by the user.
+        $idReaderNormalizer = function (Options $options) use (&$idReaders) {
+            $hash = CachingFactoryDecorator::generateHash(array(
+                $options['em'],
+                $options['class'],
+            ));
+
+            // The ID reader is a utility that is needed to read the object IDs
+            // when generating the field values. The callback generating the
+            // field values has no access to the object manager or the class
+            // of the field, so we store that information in the reader.
+            // The reader is cached so that two choice lists for the same class
+            // (and hence with the same reader) can successfully be cached.
+            if (!isset($idReaders[$hash])) {
+                /** @var ClassMetadata $classMetadata */
+                $classMetadata = $options['em']->getClassMetadata($options['class']);
+                $uuidFieldName = null;
+                if ($classMetadata->referenceable) {
+                    $uuidFieldName = $classMetadata->uuidFieldName;
+                }
+                $idReaders[$hash] = new IdReader($options['em'], $classMetadata, $uuidFieldName);
+            }
+
+            return $idReaders[$hash];
+        };
+
+        $resolver->setNormalizer('id_reader', $idReaderNormalizer);
     }
 
     /**
diff --git a/Tests/Functional/Form/ChoiceList/PhpcrOdmQueryBuilderLoaderTest.php b/Tests/Functional/Form/ChoiceList/PhpcrOdmQueryBuilderLoaderTest.php
index 80c9674c..3c208bdb 100644
--- a/Tests/Functional/Form/ChoiceList/PhpcrOdmQueryBuilderLoaderTest.php
+++ b/Tests/Functional/Form/ChoiceList/PhpcrOdmQueryBuilderLoaderTest.php
@@ -35,6 +35,22 @@ public function testGetByIds()
         }
     }
 
+    public function testGetByIdsWithUuid()
+    {
+        $qb = $this->dm->getRepository('Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument')->createQueryBuilder('e');
+        $loader = new PhpcrOdmQueryBuilderLoader($qb, $this->dm);
+
+        $doc = $this->dm->find(null, '/test/doc');
+        $uuids = array($doc->uuid, 'non-existing-uuid');
+
+        $documents = $loader->getEntitiesByIds('uuid', $uuids);
+        $this->assertCount(1, $documents);
+        foreach ($documents as $i => $document) {
+            $this->assertInstanceOf('Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument', $document);
+            $this->assertTrue(in_array($document->uuid, $uuids));
+        }
+    }
+
     public function testGetByIdsNotFound()
     {
         $qb = $this->dm->getRepository('Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument')->createQueryBuilder('e');
diff --git a/Tests/Functional/Form/Type/DocumentTypeTest.php b/Tests/Functional/Form/Type/DocumentTypeTest.php
index 240d5bb9..3381ed8c 100644
--- a/Tests/Functional/Form/Type/DocumentTypeTest.php
+++ b/Tests/Functional/Form/Type/DocumentTypeTest.php
@@ -76,7 +76,6 @@ public function testUuid()
 
         $this->assertInstanceOf('Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument', $this->referrer->getSingle());
         $this->assertEquals('doc', $this->referrer->getSingle()->nodename);
-        $this->assertTrue($form->isValid());
 
         $html = $this->renderForm($formBuilder);
         $this->assertContains('<select id="form_single" name="form[single]"', $html);

From 2d6df56d11bfa5ebf07924c98f8db6ab897a11b8 Mon Sep 17 00:00:00 2001
From: Steffen Brem <steffenbrem@gmail.com>
Date: Sun, 22 Nov 2015 18:12:54 +0100
Subject: [PATCH 03/14] clean up a bit + use idReaders property (small bug).

---
 Form/ChoiceList/IdReader.php | 6 ++----
 Form/Type/DocumentType.php   | 6 +-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Form/ChoiceList/IdReader.php b/Form/ChoiceList/IdReader.php
index eacf87e8..03aa3f41 100644
--- a/Form/ChoiceList/IdReader.php
+++ b/Form/ChoiceList/IdReader.php
@@ -32,10 +32,8 @@ public function __construct(ObjectManager $om, ClassMetadata $classMetadata, $id
 
     public function getIdValue($object)
     {
-        if ($this->idField !== null) {
-            if ($this->propertyAccessor->isReadable($object, $this->idField)) {
-                return $this->propertyAccessor->getValue($object, $this->idField);
-            }
+        if ($this->idField !== null && $this->propertyAccessor->isReadable($object, $this->idField)) {
+            return $this->propertyAccessor->getValue($object, $this->idField);
         }
 
         return parent::getIdValue($object);
diff --git a/Form/Type/DocumentType.php b/Form/Type/DocumentType.php
index 4b1fbfca..5d2baf10 100644
--- a/Form/Type/DocumentType.php
+++ b/Form/Type/DocumentType.php
@@ -44,12 +44,8 @@ public function getLoader(ObjectManager $manager, $queryBuilder, $class)
     public function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
-//
-//        $resolver->setDefaults(array(
-//            'choice_value' => 'uuid'
-//        ));
 
-        $idReaders =& $idReaders;
+        $idReaders =& $this->idReaders;
 
         // Set the "id_reader" option via the normalizer. This option is not
         // supposed to be set by the user.

From 77545145376d3bc2a30d414ef2c35f034ca07e9f Mon Sep 17 00:00:00 2001
From: Steffen Brem <steffenbrem@gmail.com>
Date: Sun, 22 Nov 2015 19:19:51 +0100
Subject: [PATCH 04/14] Utitlize UUIDHelper class to determine if we should use
 the UUID field or not (this also fixes the tests).

---
 Form/ChoiceList/DoctrineChoiceLoader.php      | 194 ++++++++++++++++++
 Form/ChoiceList/IdReader.php                  |  50 -----
 .../ChoiceList/PhpcrOdmQueryBuilderLoader.php |   7 +-
 Form/Type/DocumentType.php                    | 104 +++++++---
 4 files changed, 271 insertions(+), 84 deletions(-)
 create mode 100644 Form/ChoiceList/DoctrineChoiceLoader.php
 delete mode 100644 Form/ChoiceList/IdReader.php

diff --git a/Form/ChoiceList/DoctrineChoiceLoader.php b/Form/ChoiceList/DoctrineChoiceLoader.php
new file mode 100644
index 00000000..739afff9
--- /dev/null
+++ b/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * (c) Steffen Brem <steffenbrem@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Doctrine\Bundle\PHPCRBundle\Form\ChoiceList;
+
+use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\ODM\PHPCR\Mapping\ClassMetadata;
+use PHPCR\Util\UUIDHelper;
+use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface;
+use Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader;
+use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
+use Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface;
+use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
+use Symfony\Component\PropertyAccess\PropertyAccess;
+
+/**
+ * DoctrineChoiceLoader
+ *
+ * @author Steffen Brem <steffenbrem@gmail.com>
+ */
+class DoctrineChoiceLoader implements ChoiceLoaderInterface
+{
+    /**
+     * @var ChoiceListFactoryInterface
+     */
+    private $factory;
+
+    /**
+     * @var ObjectManager
+     */
+    private $manager;
+
+    /**
+     * @var string
+     */
+    private $class;
+
+    /**
+     * @var IdReader
+     */
+    private $idReader;
+
+    /**
+     * @var null|EntityLoaderInterface
+     */
+    private $objectLoader;
+
+    /**
+     * @var ChoiceListInterface
+     */
+    private $choiceList;
+
+    /**
+     * Creates a new choice loader.
+     *
+     * Optionally, an implementation of {@link EntityLoaderInterface} can be
+     * passed which optimizes the object loading for one of the Doctrine
+     * mapper implementations.
+     *
+     * @param ChoiceListFactoryInterface $factory      The factory for creating
+     *                                                 the loaded choice list
+     * @param ObjectManager              $manager      The object manager
+     * @param string                     $class        The class name of the
+     *                                                 loaded objects
+     * @param IdReader                   $idReader     The reader for the object
+     *                                                 IDs.
+     * @param null|EntityLoaderInterface $objectLoader The objects loader
+     */
+    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 = $classMetadata->getName();
+        $this->idReader = $idReader ?: new IdReader($manager, $classMetadata);
+        $this->objectLoader = $objectLoader;
+
+        $this->propertyAccessor = PropertyAccess::createPropertyAccessor();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function loadChoiceList($value = null)
+    {
+        if ($this->choiceList) {
+            return $this->choiceList;
+        }
+
+        $objects = $this->objectLoader
+            ? $this->objectLoader->getEntities()
+            : $this->manager->getRepository($this->class)->findAll();
+
+        $this->choiceList = $this->factory->createListFromChoices($objects, $value);
+
+        return $this->choiceList;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function loadValuesForChoices(array $choices, $value = null)
+    {
+        // Performance optimization
+        if (empty($choices)) {
+            return array();
+        }
+
+        // Optimize performance for single-field identifiers. We already
+        // know that the IDs are used as values
+
+        // Attention: This optimization does not check choices for existence
+        if (!$this->choiceList && $this->idReader->isSingleId()) {
+            $values = array();
+
+            // Maintain order and indices of the given objects
+            foreach ($choices as $i => $object) {
+                if ($object instanceof $this->class) {
+                    // Make sure to convert to the right format
+                    $values[$i] = (string)$this->idReader->getIdValue($object);
+                }
+            }
+
+            return $values;
+        }
+
+        return $this->loadChoiceList($value)->getValuesForChoices($choices);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function loadChoicesForValues(array $values, $value = null)
+    {
+        // Performance optimization
+        // Also prevents the generation of "WHERE id IN ()" queries through the
+        // object loader. At least with MySQL and on the development machine
+        // this was tested on, no exception was thrown for such invalid
+        // statements, consequently no test fails when this code is removed.
+        // https://github.com/symfony/symfony/pull/8981#issuecomment-24230557
+        if (empty($values)) {
+            return array();
+        }
+
+        $classMetadata = $this->manager->getClassMetadata($this->class);
+
+        $uuidFieldName = null;
+
+        if ($classMetadata instanceof ClassMetadata) {
+            if ($classMetadata->referenceable) {
+                $uuidFieldName = $classMetadata->getUuidFieldName();
+            }
+        }
+
+        // Optimize performance in case we have an object loader and
+        // a single-field identifier
+        if (!$this->choiceList && $this->objectLoader && $this->idReader->isSingleId()) {
+            $unorderedObjects = $this->objectLoader->getEntitiesByIds($this->idReader->getIdField(), $values);
+            $objectsById = array();
+            $objects = array();
+
+            // Maintain order and indices from the given $values
+            // An alternative approach to the following loop is to add the
+            // "INDEX BY" clause to the Doctrine query in the loader,
+            // but I'm not sure whether that's doable in a generic fashion.
+            foreach ($unorderedObjects as $object) {
+                $objectsById[$this->idReader->getIdValue($object)] = $object;
+            }
+
+            foreach ($values as $i => $id) {
+                if (UUIDHelper::isUUID($id)) {
+                    foreach ($unorderedObjects as $object) {
+                        if ($id === $this->propertyAccessor->getValue($object, $uuidFieldName)) {
+                            $objects[$i] = $object;
+                            break;
+                        }
+                    }
+                } else if (isset($objectsById[$id])) {
+                    $objects[$i] = $objectsById[$id];
+                }
+            }
+
+            return $objects;
+        }
+
+        return $this->loadChoiceList($value)->getChoicesForValues($values);
+    }
+}
diff --git a/Form/ChoiceList/IdReader.php b/Form/ChoiceList/IdReader.php
deleted file mode 100644
index 03aa3f41..00000000
--- a/Form/ChoiceList/IdReader.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * (c) Steffen Brem <steffenbrem@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Doctrine\Bundle\PHPCRBundle\Form\ChoiceList;
-
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\Common\Persistence\ObjectManager;
-use Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader as BaseIdReader;
-use Symfony\Component\PropertyAccess\PropertyAccess;
-
-class IdReader extends BaseIdReader
-{
-    protected $idField;
-
-    /**
-     * @param ObjectManager $om
-     * @param ClassMetadata $classMetadata
-     * @param string        $idField
-     */
-    public function __construct(ObjectManager $om, ClassMetadata $classMetadata, $idField = null)
-    {
-        parent::__construct($om, $classMetadata);
-        $this->idField = $idField;
-
-        $this->propertyAccessor = PropertyAccess::createPropertyAccessor();
-    }
-
-    public function getIdValue($object)
-    {
-        if ($this->idField !== null && $this->propertyAccessor->isReadable($object, $this->idField)) {
-            return $this->propertyAccessor->getValue($object, $this->idField);
-        }
-
-        return parent::getIdValue($object);
-    }
-
-    public function getIdField()
-    {
-        if ($this->idField !== null) {
-            return $this->idField;
-        }
-
-        return parent::getIdField();
-    }
-}
\ No newline at end of file
diff --git a/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php b/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
index eee1fb90..9c3ce35c 100644
--- a/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
+++ b/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
@@ -4,6 +4,7 @@
 
 use Doctrine\ODM\PHPCR\DocumentManager;
 use Doctrine\ODM\PHPCR\Query\Builder\QueryBuilder;
+use PHPCR\Util\UUIDHelper;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
@@ -95,10 +96,10 @@ public function getEntitiesByIds($identifier, array $values)
         $where = $qb->andWhere()->orX();
 
         foreach ($values as $val) {
-            if ($identifier === 'id') {
-                $where->same($val, $alias);
+            if (UUIDHelper::isUUID($val)) {
+                $where->eq()->field($alias.'.uuid')->literal($val)->end();
             } else {
-                $where->eq()->field($alias . '.' . $identifier)->literal($val)->end();
+                $where->same($val, $alias);
             }
         }
 
diff --git a/Form/Type/DocumentType.php b/Form/Type/DocumentType.php
index 5d2baf10..5a8d8057 100644
--- a/Form/Type/DocumentType.php
+++ b/Form/Type/DocumentType.php
@@ -16,18 +16,34 @@
 
 namespace Doctrine\Bundle\PHPCRBundle\Form\Type;
 
-use Doctrine\Bundle\PHPCRBundle\Form\ChoiceList\IdReader;
+use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\Common\Persistence\ObjectManager;
-use Doctrine\Bundle\PHPCRBundle\Form\ChoiceList\PhpcrOdmQueryBuilderLoader;
-use Doctrine\ODM\PHPCR\Mapping\ClassMetadata;
-use Symfony\Bridge\Doctrine\Form\Type\DoctrineType;
+use Doctrine\Bundle\PHPCRBundle\Form\ChoiceList\DoctrineChoiceLoader;
 use Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator;
+use Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface;
+use Symfony\Component\Form\ChoiceList\Factory\DefaultChoiceListFactory;
+use Symfony\Component\Form\ChoiceList\Factory\PropertyAccessDecorator;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
+
+use Doctrine\Bundle\PHPCRBundle\Form\ChoiceList\PhpcrOdmQueryBuilderLoader;
+use Symfony\Bridge\Doctrine\Form\Type\DoctrineType;
 
 class DocumentType extends DoctrineType
 {
-    private $idReaders = array();
+    private $choiceListFactory;
+
+    /**
+     * @var DoctrineChoiceLoader[]
+     */
+    private $choiceLoaders = array();
+
+    public function __construct(ManagerRegistry $registry, PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null)
+    {
+        parent::__construct($registry, $propertyAccessor, $choiceListFactory);
+        $this->choiceListFactory = $choiceListFactory ?: new PropertyAccessDecorator(new DefaultChoiceListFactory(), $propertyAccessor);
+    }
 
     /**
      * {@inheritdoc}
@@ -45,36 +61,62 @@ public function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 
-        $idReaders =& $this->idReaders;
-
-        // Set the "id_reader" option via the normalizer. This option is not
-        // supposed to be set by the user.
-        $idReaderNormalizer = function (Options $options) use (&$idReaders) {
-            $hash = CachingFactoryDecorator::generateHash(array(
-                $options['em'],
-                $options['class'],
-            ));
-
-            // The ID reader is a utility that is needed to read the object IDs
-            // when generating the field values. The callback generating the
-            // field values has no access to the object manager or the class
-            // of the field, so we store that information in the reader.
-            // The reader is cached so that two choice lists for the same class
-            // (and hence with the same reader) can successfully be cached.
-            if (!isset($idReaders[$hash])) {
-                /** @var ClassMetadata $classMetadata */
-                $classMetadata = $options['em']->getClassMetadata($options['class']);
-                $uuidFieldName = null;
-                if ($classMetadata->referenceable) {
-                    $uuidFieldName = $classMetadata->uuidFieldName;
+        $choiceListFactory = $this->choiceListFactory;
+        $choiceLoaders = &$this->choiceLoaders;
+        $type = $this;
+
+        $choiceLoader = function (Options $options) use ($choiceListFactory, &$choiceLoaders, $type) {
+
+            // Unless the choices are given explicitly, load them on demand
+            if (null === $options['choices']) {
+                $hash = null;
+                $qbParts = null;
+
+                // If there is no QueryBuilder we can safely cache DoctrineChoiceLoader,
+                // also if concrete Type can return important QueryBuilder parts to generate
+                // hash key we go for it as well
+                if (!$options['query_builder'] || false !== ($qbParts = $type->getQueryBuilderPartsForCachingHash($options['query_builder']))) {
+                    $hash = CachingFactoryDecorator::generateHash(array(
+                        $options['em'],
+                        $options['class'],
+                        $qbParts,
+                        $options['loader'],
+                    ));
+
+                    if (isset($choiceLoaders[$hash])) {
+                        return $choiceLoaders[$hash];
+                    }
+                }
+
+                if ($options['loader']) {
+                    $entityLoader = $options['loader'];
+                } elseif (null !== $options['query_builder']) {
+                    $entityLoader = $type->getLoader($options['em'], $options['query_builder'], $options['class']);
+                } else {
+                    $queryBuilder = $options['em']->getRepository($options['class'])->createQueryBuilder('e');
+                    $entityLoader = $type->getLoader($options['em'], $queryBuilder, $options['class']);
                 }
-                $idReaders[$hash] = new IdReader($options['em'], $classMetadata, $uuidFieldName);
-            }
 
-            return $idReaders[$hash];
+                $doctrineChoiceLoader = new DoctrineChoiceLoader(
+                    $choiceListFactory,
+                    $options['em'],
+                    $options['class'],
+                    $options['id_reader'],
+                    $entityLoader
+                );
+
+                if ($hash !== null) {
+                    $choiceLoaders[$hash] = $doctrineChoiceLoader;
+                }
+
+                return $doctrineChoiceLoader;
+            }
         };
 
-        $resolver->setNormalizer('id_reader', $idReaderNormalizer);
+
+        $resolver->setDefaults(array(
+            'choice_loader' => $choiceLoader
+        ));
     }
 
     /**

From e544a55a5cc09b771b99d901ec52cb2bf3563ec1 Mon Sep 17 00:00:00 2001
From: Steffen Brem <steffenbrem@gmail.com>
Date: Sun, 22 Nov 2015 19:28:44 +0100
Subject: [PATCH 05/14] Replace new array syntax with old one to support older
 PHP versions.

---
 Tests/Functional/Form/Type/DocumentTypeTest.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Tests/Functional/Form/Type/DocumentTypeTest.php b/Tests/Functional/Form/Type/DocumentTypeTest.php
index 3381ed8c..15db275e 100644
--- a/Tests/Functional/Form/Type/DocumentTypeTest.php
+++ b/Tests/Functional/Form/Type/DocumentTypeTest.php
@@ -38,7 +38,7 @@ public function setUp()
     /**
      * @return FormBuilderInterface
      */
-    private function createFormBuilder($data, $options = [])
+    private function createFormBuilder($data, $options = array())
     {
         return $this->container->get('form.factory')->createBuilder($this->legacy ? 'form' : 'Symfony\Component\Form\Extension\Core\Type\FormType', $data, $options);
     }
@@ -51,7 +51,7 @@ private function renderForm(FormBuilderInterface $formBuilder)
         $formView = $formBuilder->getForm()->createView();
         $templating = $this->getContainer()->get('templating');
 
-        return $templating->render('::form.html.twig', ['form' => $formView]);
+        return $templating->render('::form.html.twig', array('form' => $formView));
     }
 
     public function testUuid()
@@ -62,10 +62,10 @@ public function testUuid()
         $formBuilder = $this->createFormBuilder($this->referrer);
 
         $formBuilder
-            ->add('single', $this->legacy ? 'phpcr_document' : 'Doctrine\Bundle\PHPCRBundle\Form\Type\DocumentType', [
+            ->add('single', $this->legacy ? 'phpcr_document' : 'Doctrine\Bundle\PHPCRBundle\Form\Type\DocumentType', array(
                 'class' => 'Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument',
                 'choice_value' => 'uuid'
-            ])
+            ))
         ;
 
         $form = $formBuilder->getForm();
@@ -87,9 +87,9 @@ public function testUnfiltered()
         $formBuilder = $this->createFormBuilder($this->referrer);
 
         $formBuilder
-            ->add('single', $this->legacy ? 'phpcr_document' : 'Doctrine\Bundle\PHPCRBundle\Form\Type\DocumentType', [
+            ->add('single', $this->legacy ? 'phpcr_document' : 'Doctrine\Bundle\PHPCRBundle\Form\Type\DocumentType', array(
                 'class' => 'Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument',
-            ]);
+            ));
 
         $html = $this->renderForm($formBuilder);
         $this->assertContains('<select id="form_single" name="form[single]"', $html);
@@ -105,10 +105,10 @@ public function testFiltered()
         $formBuilder = $this->createFormBuilder($this->referrer);
 
         $formBuilder
-            ->add('single', $this->legacy ? 'phpcr_document' : 'Doctrine\Bundle\PHPCRBundle\Form\Type\DocumentType', [
+            ->add('single', $this->legacy ? 'phpcr_document' : 'Doctrine\Bundle\PHPCRBundle\Form\Type\DocumentType', array(
                 'class' => 'Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument',
                 'query_builder' => $qb,
-            ]);
+            ));
 
         $html = $this->renderForm($formBuilder);
         $this->assertContains('<select id="form_single" name="form[single]"', $html);

From 386103b36012d139fbd1a865b3ce91780ba6ee48 Mon Sep 17 00:00:00 2001
From: Steffen Brem <steffenbrem@gmail.com>
Date: Mon, 23 Nov 2015 13:30:47 +0100
Subject: [PATCH 06/14] Minimal symfony related bundles and components are 2.7
 and also support 3.0; Also worked through code comments and made necessary
 changes. Now extends DoctrineChoiceLoader from the doctrine-bridge. Only
 changed code is now in there.

---
 Form/ChoiceList/DoctrineChoiceLoader.php      | 91 ++++---------------
 .../ChoiceList/PhpcrOdmQueryBuilderLoader.php |  2 +-
 Form/Type/DocumentType.php                    |  4 +-
 .../Functional/Form/Type/DocumentTypeTest.php |  7 +-
 composer.json                                 |  4 +-
 5 files changed, 29 insertions(+), 79 deletions(-)

diff --git a/Form/ChoiceList/DoctrineChoiceLoader.php b/Form/ChoiceList/DoctrineChoiceLoader.php
index 739afff9..e960ffe9 100644
--- a/Form/ChoiceList/DoctrineChoiceLoader.php
+++ b/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -1,44 +1,35 @@
 <?php
-/**
- * (c) Steffen Brem <steffenbrem@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Doctrine\Bundle\PHPCRBundle\Form\ChoiceList;
 
+use Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader as BaseDoctrineChoiceLoader;
 use Doctrine\Common\Persistence\ObjectManager;
-use Doctrine\ODM\PHPCR\Mapping\ClassMetadata;
+use Doctrine\ODM\PHPCR\Mapping\ClassMetadata as PHPCRClassMetadata;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use PHPCR\Util\UUIDHelper;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader;
 use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
 use Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface;
-use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
 use Symfony\Component\PropertyAccess\PropertyAccess;
+use Symfony\Component\PropertyAccess\PropertyAccessor;
 
 /**
  * DoctrineChoiceLoader
  *
  * @author Steffen Brem <steffenbrem@gmail.com>
  */
-class DoctrineChoiceLoader implements ChoiceLoaderInterface
+class DoctrineChoiceLoader extends BaseDoctrineChoiceLoader
 {
-    /**
-     * @var ChoiceListFactoryInterface
-     */
-    private $factory;
-
     /**
      * @var ObjectManager
      */
     private $manager;
 
     /**
-     * @var string
+     * @var ClassMetadata
      */
-    private $class;
+    private $classMetadata;
 
     /**
      * @var IdReader
@@ -55,6 +46,11 @@ class DoctrineChoiceLoader implements ChoiceLoaderInterface
      */
     private $choiceList;
 
+    /**
+     * @var PropertyAccessor
+     */
+    private $propertyAccessor;
+
     /**
      * Creates a new choice loader.
      *
@@ -73,66 +69,17 @@ class DoctrineChoiceLoader implements ChoiceLoaderInterface
      */
     public function __construct(ChoiceListFactoryInterface $factory, ObjectManager $manager, $class, IdReader $idReader = null, EntityLoaderInterface $objectLoader = null)
     {
+        parent::__construct($factory, $manager, $class, $idReader, $objectLoader);
+
         $classMetadata = $manager->getClassMetadata($class);
 
-        $this->factory = $factory;
         $this->manager = $manager;
-        $this->class = $classMetadata->getName();
+        $this->classMetadata = $classMetadata;
         $this->idReader = $idReader ?: new IdReader($manager, $classMetadata);
         $this->objectLoader = $objectLoader;
-
         $this->propertyAccessor = PropertyAccess::createPropertyAccessor();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function loadChoiceList($value = null)
-    {
-        if ($this->choiceList) {
-            return $this->choiceList;
-        }
-
-        $objects = $this->objectLoader
-            ? $this->objectLoader->getEntities()
-            : $this->manager->getRepository($this->class)->findAll();
-
-        $this->choiceList = $this->factory->createListFromChoices($objects, $value);
-
-        return $this->choiceList;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function loadValuesForChoices(array $choices, $value = null)
-    {
-        // Performance optimization
-        if (empty($choices)) {
-            return array();
-        }
-
-        // Optimize performance for single-field identifiers. We already
-        // know that the IDs are used as values
-
-        // Attention: This optimization does not check choices for existence
-        if (!$this->choiceList && $this->idReader->isSingleId()) {
-            $values = array();
-
-            // Maintain order and indices of the given objects
-            foreach ($choices as $i => $object) {
-                if ($object instanceof $this->class) {
-                    // Make sure to convert to the right format
-                    $values[$i] = (string)$this->idReader->getIdValue($object);
-                }
-            }
-
-            return $values;
-        }
-
-        return $this->loadChoiceList($value)->getValuesForChoices($choices);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -148,13 +95,11 @@ public function loadChoicesForValues(array $values, $value = null)
             return array();
         }
 
-        $classMetadata = $this->manager->getClassMetadata($this->class);
-
         $uuidFieldName = null;
 
-        if ($classMetadata instanceof ClassMetadata) {
-            if ($classMetadata->referenceable) {
-                $uuidFieldName = $classMetadata->getUuidFieldName();
+        if ($this->classMetadata instanceof PHPCRClassMetadata) {
+            if ($this->classMetadata->referenceable) {
+                $uuidFieldName = $this->classMetadata->getUuidFieldName();
             }
         }
 
diff --git a/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php b/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
index 9c3ce35c..a1470562 100644
--- a/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
+++ b/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
@@ -83,7 +83,7 @@ public function getEntitiesByIds($identifier, array $values)
         }));
 
         if (0 == count($values)) {
-            return [];
+            return array();
         }
 
         /* performance: if we could figure out whether the query builder is "
diff --git a/Form/Type/DocumentType.php b/Form/Type/DocumentType.php
index 5a8d8057..948bff1c 100644
--- a/Form/Type/DocumentType.php
+++ b/Form/Type/DocumentType.php
@@ -65,8 +65,8 @@ public function configureOptions(OptionsResolver $resolver)
         $choiceLoaders = &$this->choiceLoaders;
         $type = $this;
 
+        // we need to override the default choiceLoader, since we want to use our own class
         $choiceLoader = function (Options $options) use ($choiceListFactory, &$choiceLoaders, $type) {
-
             // Unless the choices are given explicitly, load them on demand
             if (null === $options['choices']) {
                 $hash = null;
@@ -97,6 +97,8 @@ public function configureOptions(OptionsResolver $resolver)
                     $entityLoader = $type->getLoader($options['em'], $queryBuilder, $options['class']);
                 }
 
+                // this line is different from the original choice loader, we use our own DoctrineChoiceLoader,
+                // were we have our changes to support UUIDs
                 $doctrineChoiceLoader = new DoctrineChoiceLoader(
                     $choiceListFactory,
                     $options['em'],
diff --git a/Tests/Functional/Form/Type/DocumentTypeTest.php b/Tests/Functional/Form/Type/DocumentTypeTest.php
index 15db275e..5fce48d1 100644
--- a/Tests/Functional/Form/Type/DocumentTypeTest.php
+++ b/Tests/Functional/Form/Type/DocumentTypeTest.php
@@ -25,9 +25,9 @@ public function setUp()
     {
         $this->legacy = !method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix');
 
-        $this->db('PHPCR')->loadFixtures([
+        $this->db('PHPCR')->loadFixtures(array(
             'Doctrine\Bundle\PHPCRBundle\Tests\Resources\DataFixtures\PHPCR\LoadData',
-        ]);
+        ));
         $this->dm = $this->db('PHPCR')->getOm();
         $document = $this->dm->find(null, '/test/doc');
         $this->assertNotNull($document, 'fixture loading not working');
@@ -89,7 +89,8 @@ public function testUnfiltered()
         $formBuilder
             ->add('single', $this->legacy ? 'phpcr_document' : 'Doctrine\Bundle\PHPCRBundle\Form\Type\DocumentType', array(
                 'class' => 'Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument',
-            ));
+            ))
+        ;
 
         $html = $this->renderForm($formBuilder);
         $this->assertContains('<select id="form_single" name="form[single]"', $html);
diff --git a/composer.json b/composer.json
index aafe6e4e..59a849cd 100644
--- a/composer.json
+++ b/composer.json
@@ -19,13 +19,15 @@
     "prefer-stable": true,
     "require": {
         "php": ">=5.3.9",
-        "symfony/symfony": "~2.7",
+        "symfony/framework-bundle": "~2.7 || ~3.0",
+        "symfony/doctrine-bridge": "~2.7 || ~3.0",
         "phpcr/phpcr-implementation": "2.1.*",
         "phpcr/phpcr-utils": "^1.2.7"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.5",
         "phpunit/php-code-coverage": "@stable",
+        "symfony/form": "~2.7 || ~3.0",
         "doctrine/phpcr-odm": "~1.3,>1.3.0-rc3",
         "symfony-cmf/testing": "^1.3.0",
         "matthiasnoback/symfony-dependency-injection-test": "~0.7",

From dbb7196078a919c9149a5d71c86ffa1da493d39e Mon Sep 17 00:00:00 2001
From: Steffen Brem <steffenbrem@gmail.com>
Date: Mon, 23 Nov 2015 13:33:51 +0100
Subject: [PATCH 07/14] Fixed a bug where if a Document would not have a UUID
 field mapped, it would still try to use a UUID, but now it will skip it and
 fall back to using IDs only.

---
 Form/ChoiceList/DoctrineChoiceLoader.php | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/Form/ChoiceList/DoctrineChoiceLoader.php b/Form/ChoiceList/DoctrineChoiceLoader.php
index e960ffe9..9447a442 100644
--- a/Form/ChoiceList/DoctrineChoiceLoader.php
+++ b/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -52,20 +52,7 @@ class DoctrineChoiceLoader extends BaseDoctrineChoiceLoader
     private $propertyAccessor;
 
     /**
-     * Creates a new choice loader.
-     *
-     * Optionally, an implementation of {@link EntityLoaderInterface} can be
-     * passed which optimizes the object loading for one of the Doctrine
-     * mapper implementations.
-     *
-     * @param ChoiceListFactoryInterface $factory      The factory for creating
-     *                                                 the loaded choice list
-     * @param ObjectManager              $manager      The object manager
-     * @param string                     $class        The class name of the
-     *                                                 loaded objects
-     * @param IdReader                   $idReader     The reader for the object
-     *                                                 IDs.
-     * @param null|EntityLoaderInterface $objectLoader The objects loader
+     * {@inheritdoc}
      */
     public function __construct(ChoiceListFactoryInterface $factory, ObjectManager $manager, $class, IdReader $idReader = null, EntityLoaderInterface $objectLoader = null)
     {
@@ -96,7 +83,6 @@ public function loadChoicesForValues(array $values, $value = null)
         }
 
         $uuidFieldName = null;
-
         if ($this->classMetadata instanceof PHPCRClassMetadata) {
             if ($this->classMetadata->referenceable) {
                 $uuidFieldName = $this->classMetadata->getUuidFieldName();
@@ -119,7 +105,7 @@ public function loadChoicesForValues(array $values, $value = null)
             }
 
             foreach ($values as $i => $id) {
-                if (UUIDHelper::isUUID($id)) {
+                if (UUIDHelper::isUUID($id) && null !== $uuidFieldName) {
                     foreach ($unorderedObjects as $object) {
                         if ($id === $this->propertyAccessor->getValue($object, $uuidFieldName)) {
                             $objects[$i] = $object;

From d046e7601b7327295661f82883bdc0ec3b6501fa Mon Sep 17 00:00:00 2001
From: Steffen Brem <steffenbrem@gmail.com>
Date: Mon, 23 Nov 2015 13:37:07 +0100
Subject: [PATCH 08/14] Drop Symfony 2.3 in travis CI builds

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1073a487..4995221f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,10 +13,6 @@ sudo: false
 
 matrix:
   include:
-    - php: 5.3
-      env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
-    - php: 5.6
-      env: SYMFONY_VERSION=2.3.* SYMFONY_DEPRECATIONS_HELPER=weak
     - php: 5.6
       env: SYMFONY_VERSION=2.8.*
     - php: 5.6

From 66a98950cbf2f93ee713938eea71800f6cd2ce91 Mon Sep 17 00:00:00 2001
From: Steffen Brem <steffenbrem@gmail.com>
Date: Mon, 23 Nov 2015 13:49:28 +0100
Subject: [PATCH 09/14] CS fixing

---
 Form/ChoiceList/DoctrineChoiceLoader.php        | 5 +++--
 Form/Type/DocumentType.php                      | 2 +-
 Tests/Functional/Form/Type/DocumentTypeTest.php | 4 ++--
 Tests/Resources/app/config/config.php           | 7 +++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Form/ChoiceList/DoctrineChoiceLoader.php b/Form/ChoiceList/DoctrineChoiceLoader.php
index 9447a442..1ed9f30e 100644
--- a/Form/ChoiceList/DoctrineChoiceLoader.php
+++ b/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -15,7 +15,8 @@
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 
 /**
- * DoctrineChoiceLoader
+ * Supports UUIDs as choice values, it will automatically detect them and if the PHPCR document
+ * has a UUID field mapping it will be enabled.
  *
  * @author Steffen Brem <steffenbrem@gmail.com>
  */
@@ -112,7 +113,7 @@ public function loadChoicesForValues(array $values, $value = null)
                             break;
                         }
                     }
-                } else if (isset($objectsById[$id])) {
+                } elseif (isset($objectsById[$id])) {
                     $objects[$i] = $objectsById[$id];
                 }
             }
diff --git a/Form/Type/DocumentType.php b/Form/Type/DocumentType.php
index 948bff1c..cbdee518 100644
--- a/Form/Type/DocumentType.php
+++ b/Form/Type/DocumentType.php
@@ -117,7 +117,7 @@ public function configureOptions(OptionsResolver $resolver)
 
 
         $resolver->setDefaults(array(
-            'choice_loader' => $choiceLoader
+            'choice_loader' => $choiceLoader,
         ));
     }
 
diff --git a/Tests/Functional/Form/Type/DocumentTypeTest.php b/Tests/Functional/Form/Type/DocumentTypeTest.php
index 5fce48d1..4871f86e 100644
--- a/Tests/Functional/Form/Type/DocumentTypeTest.php
+++ b/Tests/Functional/Form/Type/DocumentTypeTest.php
@@ -64,14 +64,14 @@ public function testUuid()
         $formBuilder
             ->add('single', $this->legacy ? 'phpcr_document' : 'Doctrine\Bundle\PHPCRBundle\Form\Type\DocumentType', array(
                 'class' => 'Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument',
-                'choice_value' => 'uuid'
+                'choice_value' => 'uuid',
             ))
         ;
 
         $form = $formBuilder->getForm();
 
         $form->submit(array(
-            'single' => $uuid
+            'single' => $uuid,
         ));
 
         $this->assertInstanceOf('Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument', $this->referrer->getSingle());
diff --git a/Tests/Resources/app/config/config.php b/Tests/Resources/app/config/config.php
index 03284738..76276445 100644
--- a/Tests/Resources/app/config/config.php
+++ b/Tests/Resources/app/config/config.php
@@ -8,8 +8,7 @@
 
 $config = array(
     'form' => array(
-        'csrf_protection' => false
-    )
+        'csrf_protection' => false,
+    ),
 );
-
-$container->loadFromExtension('framework', $config);
\ No newline at end of file
+$container->loadFromExtension('framework', $config);

From b3846f7f68df041ce98c3a63a2709a5bf8985308 Mon Sep 17 00:00:00 2001
From: Steffen Brem <steffenbrem@gmail.com>
Date: Mon, 23 Nov 2015 13:50:25 +0100
Subject: [PATCH 10/14] CS fixing

---
 Form/Type/DocumentType.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Form/Type/DocumentType.php b/Form/Type/DocumentType.php
index cbdee518..1fa0f416 100644
--- a/Form/Type/DocumentType.php
+++ b/Form/Type/DocumentType.php
@@ -26,7 +26,6 @@
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-
 use Doctrine\Bundle\PHPCRBundle\Form\ChoiceList\PhpcrOdmQueryBuilderLoader;
 use Symfony\Bridge\Doctrine\Form\Type\DoctrineType;
 
@@ -115,7 +114,6 @@ public function configureOptions(OptionsResolver $resolver)
             }
         };
 
-
         $resolver->setDefaults(array(
             'choice_loader' => $choiceLoader,
         ));

From 43f65ad9cdaaccd264a87442e9dd0b16fc7bc01e Mon Sep 17 00:00:00 2001
From: Steffen Brem <steffenbrem@gmail.com>
Date: Mon, 23 Nov 2015 13:53:24 +0100
Subject: [PATCH 11/14] Add docblock instead of simple comment to explain why
 we override form options.

---
 Form/Type/DocumentType.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Form/Type/DocumentType.php b/Form/Type/DocumentType.php
index 1fa0f416..3712630d 100644
--- a/Form/Type/DocumentType.php
+++ b/Form/Type/DocumentType.php
@@ -56,6 +56,12 @@ public function getLoader(ObjectManager $manager, $queryBuilder, $class)
         );
     }
 
+    /**
+     * We need to overrive the `choice_loader`, so that we can use our own DoctrineChoiceLoader
+     * class that includes support for UUIDs.
+     *
+     * @param OptionsResolver $resolver
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
@@ -64,7 +70,6 @@ public function configureOptions(OptionsResolver $resolver)
         $choiceLoaders = &$this->choiceLoaders;
         $type = $this;
 
-        // we need to override the default choiceLoader, since we want to use our own class
         $choiceLoader = function (Options $options) use ($choiceListFactory, &$choiceLoaders, $type) {
             // Unless the choices are given explicitly, load them on demand
             if (null === $options['choices']) {

From d794f90cc828cd60559530efce54213a58367a4b Mon Sep 17 00:00:00 2001
From: Steffen Brem <steffenbrem@gmail.com>
Date: Mon, 23 Nov 2015 16:42:20 +0100
Subject: [PATCH 12/14] Use proper class metadata to get the property that is
 used for the UUID.

---
 Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php | 17 +++++++++++++++--
 .../PhpcrOdmQueryBuilderLoaderTest.php         | 18 +++++++++++-------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php b/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
index a1470562..70adb162 100644
--- a/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
+++ b/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
@@ -3,6 +3,7 @@
 namespace Doctrine\Bundle\PHPCRBundle\Form\ChoiceList;
 
 use Doctrine\ODM\PHPCR\DocumentManager;
+use Doctrine\ODM\PHPCR\Mapping\ClassMetadata;
 use Doctrine\ODM\PHPCR\Query\Builder\QueryBuilder;
 use PHPCR\Util\UUIDHelper;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface;
@@ -27,6 +28,11 @@ class PhpcrOdmQueryBuilderLoader implements EntityLoaderInterface
      */
     private $queryBuilder;
 
+    /**
+     * @var ClassMetadata
+     */
+    private $classMetadata;
+
     /**
      * Construct a PHPCR-ODM Query Builder Loader.
      *
@@ -53,6 +59,13 @@ public function __construct($queryBuilder, DocumentManager $manager = null, $cla
         $this->manager = $manager;
 
         $this->queryBuilder = $queryBuilder;
+
+        if (null !== $class) {
+            $classMetadata = $this->manager->getClassMetadata($class);
+            if ($classMetadata instanceof ClassMetadata) {
+                $this->classMetadata = $classMetadata;
+            }
+        }
     }
 
     /**
@@ -96,8 +109,8 @@ public function getEntitiesByIds($identifier, array $values)
         $where = $qb->andWhere()->orX();
 
         foreach ($values as $val) {
-            if (UUIDHelper::isUUID($val)) {
-                $where->eq()->field($alias.'.uuid')->literal($val)->end();
+            if (UUIDHelper::isUUID($val) && $this->classMetadata) {
+                $where->eq()->field($alias . '.' . $this->classMetadata->getUuidFieldName())->literal($val)->end();
             } else {
                 $where->same($val, $alias);
             }
diff --git a/Tests/Functional/Form/ChoiceList/PhpcrOdmQueryBuilderLoaderTest.php b/Tests/Functional/Form/ChoiceList/PhpcrOdmQueryBuilderLoaderTest.php
index 3c208bdb..be4a7736 100644
--- a/Tests/Functional/Form/ChoiceList/PhpcrOdmQueryBuilderLoaderTest.php
+++ b/Tests/Functional/Form/ChoiceList/PhpcrOdmQueryBuilderLoaderTest.php
@@ -24,8 +24,9 @@ public function setUp()
 
     public function testGetByIds()
     {
-        $qb = $this->dm->getRepository('Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument')->createQueryBuilder('e');
-        $loader = new PhpcrOdmQueryBuilderLoader($qb, $this->dm);
+        $class = 'Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument';
+        $qb = $this->dm->getRepository($class)->createQueryBuilder('e');
+        $loader = new PhpcrOdmQueryBuilderLoader($qb, $this->dm, $class);
         $ids = array('/test/doc', '/test/doc2', '/test/doc3');
         $documents = $loader->getEntitiesByIds('id', $ids);
         $this->assertCount(2, $documents);
@@ -37,8 +38,9 @@ public function testGetByIds()
 
     public function testGetByIdsWithUuid()
     {
-        $qb = $this->dm->getRepository('Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument')->createQueryBuilder('e');
-        $loader = new PhpcrOdmQueryBuilderLoader($qb, $this->dm);
+        $class = 'Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument';
+        $qb = $this->dm->getRepository($class)->createQueryBuilder('e');
+        $loader = new PhpcrOdmQueryBuilderLoader($qb, $this->dm, $class);
 
         $doc = $this->dm->find(null, '/test/doc');
         $uuids = array($doc->uuid, 'non-existing-uuid');
@@ -53,17 +55,19 @@ public function testGetByIdsWithUuid()
 
     public function testGetByIdsNotFound()
     {
-        $qb = $this->dm->getRepository('Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument')->createQueryBuilder('e');
-        $loader = new PhpcrOdmQueryBuilderLoader($qb, $this->dm);
+        $class = 'Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument';
+        $qb = $this->dm->getRepository($class)->createQueryBuilder('e');
+        $loader = new PhpcrOdmQueryBuilderLoader($qb, $this->dm, $class);
         $documents = $loader->getEntitiesByIds('id', array('/foo/bar'));
         $this->assertCount(0, $documents);
     }
 
     public function testGetByIdsFilter()
     {
+        $class = 'Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument';
         $qb = $this->dm->getRepository('Doctrine\Bundle\PHPCRBundle\Tests\Resources\Document\TestDocument')->createQueryBuilder('e');
         $qb->where()->eq()->field('e.text')->literal('thiswillnotmatch');
-        $loader = new PhpcrOdmQueryBuilderLoader($qb, $this->dm);
+        $loader = new PhpcrOdmQueryBuilderLoader($qb, $this->dm, $class);
         $documents = $loader->getEntitiesByIds('id', array('/test/doc'));
         $this->assertCount(0, $documents);
     }

From 42a04e433ba7aaf52682c3a54166c7a315d5bba3 Mon Sep 17 00:00:00 2001
From: Steffen Brem <steffenbrem@gmail.com>
Date: Mon, 23 Nov 2015 16:44:21 +0100
Subject: [PATCH 13/14] CS

---
 Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php b/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
index 70adb162..fd89aecd 100644
--- a/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
+++ b/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
@@ -110,7 +110,7 @@ public function getEntitiesByIds($identifier, array $values)
 
         foreach ($values as $val) {
             if (UUIDHelper::isUUID($val) && $this->classMetadata) {
-                $where->eq()->field($alias . '.' . $this->classMetadata->getUuidFieldName())->literal($val)->end();
+                $where->eq()->field($alias.'.'.$this->classMetadata->getUuidFieldName())->literal($val)->end();
             } else {
                 $where->same($val, $alias);
             }

From a2a1446241ffe8766aebdbdd31625438ad43fd78 Mon Sep 17 00:00:00 2001
From: Steffen Brem <steffenbrem@gmail.com>
Date: Tue, 1 Dec 2015 22:29:54 +0100
Subject: [PATCH 14/14] Patched according to comments; Better performance.

---
 Form/ChoiceList/DoctrineChoiceLoader.php       | 8 +++-----
 Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Form/ChoiceList/DoctrineChoiceLoader.php b/Form/ChoiceList/DoctrineChoiceLoader.php
index 1ed9f30e..a8748f14 100644
--- a/Form/ChoiceList/DoctrineChoiceLoader.php
+++ b/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -84,10 +84,8 @@ public function loadChoicesForValues(array $values, $value = null)
         }
 
         $uuidFieldName = null;
-        if ($this->classMetadata instanceof PHPCRClassMetadata) {
-            if ($this->classMetadata->referenceable) {
-                $uuidFieldName = $this->classMetadata->getUuidFieldName();
-            }
+        if ($this->classMetadata instanceof PHPCRClassMetadata && $this->classMetadata->referenceable) {
+            $uuidFieldName = $this->classMetadata->getUuidFieldName();
         }
 
         // Optimize performance in case we have an object loader and
@@ -106,7 +104,7 @@ public function loadChoicesForValues(array $values, $value = null)
             }
 
             foreach ($values as $i => $id) {
-                if (UUIDHelper::isUUID($id) && null !== $uuidFieldName) {
+                if (null !== $uuidFieldName && UUIDHelper::isUUID($id)) {
                     foreach ($unorderedObjects as $object) {
                         if ($id === $this->propertyAccessor->getValue($object, $uuidFieldName)) {
                             $objects[$i] = $object;
diff --git a/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php b/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
index fd89aecd..e5b053e5 100644
--- a/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
+++ b/Form/ChoiceList/PhpcrOdmQueryBuilderLoader.php
@@ -109,7 +109,7 @@ public function getEntitiesByIds($identifier, array $values)
         $where = $qb->andWhere()->orX();
 
         foreach ($values as $val) {
-            if (UUIDHelper::isUUID($val) && $this->classMetadata) {
+            if ($this->classMetadata && $this->classMetadata->referenceable && UUIDHelper::isUUID($val)) {
                 $where->eq()->field($alias.'.'.$this->classMetadata->getUuidFieldName())->literal($val)->end();
             } else {
                 $where->same($val, $alias);