Merge branch '4.4' into 5.1

* 4.4:
  [Security] Replace message data in JSON security error response
  [DI] Skip deprecated definitions in CheckTypeDeclarationsPass
  [DoctrineBridge] Take into account that indexBy="person_id" could be a db column name, for a referenced entity

Author: chalasr

PropertyInfo/DoctrineExtractor.php

@@ -110,7 +110,12 @@ public function getTypes(string $class, string $property, array $context = [])
                             /** @var ClassMetadataInfo $subMetadata */
                             $indexProperty = $subMetadata->getSingleAssociationReferencedJoinColumnName($fieldName);
                             $subMetadata = $this->entityManager ? $this->entityManager->getClassMetadata($associationMapping['targetEntity']) : $this->classMetadataFactory->getMetadataFor($associationMapping['targetEntity']);
-                            $typeOfField = $subMetadata->getTypeOfField($indexProperty);
+
+                            //Not a property, maybe a column name?
+                            if (null === ($typeOfField = $subMetadata->getTypeOfField($indexProperty))) {
+                                $fieldName = $subMetadata->getFieldForColumn($indexProperty);
+                                $typeOfField = $subMetadata->getTypeOfField($fieldName);
+                            }
                         }
                     }
 

Tests/PropertyInfo/DoctrineExtractorTest.php

@@ -75,6 +75,7 @@ public function testGetProperties()
             'indexedByDt',
             'indexedByCustomType',
             'indexedBuz',
+            'dummyGeneratedValueList',
         ]);
 
         $this->assertEquals(
@@ -202,6 +203,15 @@ public function typesProvider()
                 new Type(Type::BUILTIN_TYPE_STRING),
                 new Type(Type::BUILTIN_TYPE_OBJECT, false, DoctrineRelation::class)
             )]],
+            ['dummyGeneratedValueList', [new Type(
+                Type::BUILTIN_TYPE_OBJECT,
+                false,
+                'Doctrine\Common\Collections\Collection',
+                true,
+                new Type(Type::BUILTIN_TYPE_INT),
+                new Type(Type::BUILTIN_TYPE_OBJECT, false, DoctrineRelation::class)
+            )]],
+            ['json', null],
         ];
 
         if (class_exists(Types::class)) {

Tests/PropertyInfo/Fixtures/DoctrineDummy.php

@@ -137,4 +137,9 @@ class DoctrineDummy
      * @OneToMany(targetEntity="DoctrineRelation", mappedBy="buzField", indexBy="buzField")
      */
     protected $indexedBuz;
+
+    /**
+     * @OneToMany(targetEntity="DoctrineRelation", mappedBy="dummyRelation", indexBy="gen_value_col_id", orphanRemoval=true)
+     */
+    protected $dummyGeneratedValueList;
 }

Tests/PropertyInfo/Fixtures/DoctrineGeneratedValue.php

@@ -15,6 +15,7 @@
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\GeneratedValue;
 use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping\OneToMany;
 
 /**
  * @author Kévin Dunglas <[email protected]>
@@ -34,4 +35,15 @@ class DoctrineGeneratedValue
      * @Column
      */
     public $foo;
+
+    /**
+     * @var int
+     * @Column(type="integer", name="gen_value_col_id")
+     */
+    public $valueId;
+
+    /**
+     * @OneToMany(targetEntity="DoctrineRelation", mappedBy="generatedValueRelation", indexBy="rguid_column", orphanRemoval=true)
+     */
+    protected $relationList;
 }

Tests/PropertyInfo/Fixtures/DoctrineRelation.php

@@ -15,6 +15,7 @@
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\Id;
 use Doctrine\ORM\Mapping\ManyToOne;
+use Doctrine\ORM\Mapping\JoinColumn;
 
 /**
  * @Entity
@@ -60,4 +61,15 @@ class DoctrineRelation
      * @ManyToOne(targetEntity="DoctrineDummy", inversedBy="indexedBuz")
      */
     protected $buzField;
+
+    /**
+     * @ManyToOne(targetEntity="DoctrineDummy", inversedBy="dummyGeneratedValueList")
+     */
+    private $dummyRelation;
+
+    /**
+     * @ManyToOne(targetEntity="DoctrineGeneratedValue", inversedBy="relationList")
+     * @JoinColumn(name="gen_value_col_id", referencedColumnName="gen_value_col_id")
+     */
+    private $generatedValueRelation;
 }