Merge branch '3.1'

* 3.1:
  fixed Twig support for 1.26 and 2.0
  Fix indexBy type extraction

Author: fabpot

PropertyInfo/DoctrineExtractor.php

@@ -88,7 +88,8 @@ public function getTypes($class, $property, array $context = array())
 
                 if (isset($associationMapping['indexBy'])) {
                     $indexProperty = $associationMapping['indexBy'];
-                    $typeOfField = $metadata->getTypeOfField($indexProperty);
+                    $subMetadata = $this->classMetadataFactory->getMetadataFor($associationMapping['targetEntity']);
+                    $typeOfField = $subMetadata->getTypeOfField($indexProperty);
 
                     $collectionKeyType = $this->getPhpType($typeOfField);
                 }

Tests/PropertyInfo/Fixtures/DoctrineDummy.php

@@ -41,7 +41,7 @@ class DoctrineDummy
     public $bar;
 
     /**
-     * @ManyToMany(targetEntity="DoctrineRelation", indexBy="guid")
+     * @ManyToMany(targetEntity="DoctrineRelation", indexBy="rguid")
      */
     protected $indexedBar;
 

Tests/PropertyInfo/Fixtures/DoctrineRelation.php

@@ -31,5 +31,5 @@ class DoctrineRelation
     /**
      * @Column(type="guid")
      */
-    protected $guid;
+    protected $rguid;
 }