Merge branch '2.7' into 2.8.x

Author: beberlei

docs/en/reference/annotations-reference.rst

@@ -99,7 +99,7 @@ Optional attributes:
 
 -  **length**: Used by the "string" type to determine its maximum
    length in the database. Doctrine does not validate the length of a
-   string values for you.
+   string value for you.
 
 -  **precision**: The precision for a decimal (exact numeric) column
    (applies only for decimal column), which is the maximum number of

lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php

@@ -22,6 +22,7 @@
 use PDO;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query;
+use function in_array;
 
 class SimpleObjectHydrator extends AbstractHydrator
 {
@@ -78,8 +79,9 @@ protected function hydrateAllData()
      */
     protected function hydrateRowData(array $sqlResult, array &$result)
     {
-        $entityName = $this->class->name;
-        $data       = [];
+        $entityName       = $this->class->name;
+        $data             = [];
+        $discrColumnValue = null;
 
         // We need to find the correct entity class name if we have inheritance in resultset
         if ($this->class->inheritanceType !== ClassMetadata::INHERITANCE_TYPE_NONE) {
@@ -104,7 +106,8 @@ protected function hydrateRowData(array $sqlResult, array &$result)
                 throw HydrationException::invalidDiscriminatorValue($sqlResult[$discrColumnName], array_keys($discrMap));
             }
 
-            $entityName = $discrMap[$sqlResult[$discrColumnName]];
+            $entityName       = $discrMap[$sqlResult[$discrColumnName]];
+            $discrColumnValue = $sqlResult[$discrColumnName];
 
             unset($sqlResult[$discrColumnName]);
         }
@@ -134,6 +137,11 @@ protected function hydrateRowData(array $sqlResult, array &$result)
 
             // Prevent overwrite in case of inherit classes using same property name (See AbstractHydrator)
             if ( ! isset($data[$fieldName]) || ! $valueIsNull) {
+                // If we have inheritance in resultset, make sure the field belongs to the correct class
+                if (isset($cacheKeyInfo['discriminatorValues']) && ! in_array($discrColumnValue, $cacheKeyInfo['discriminatorValues'], true)) {
+                    continue;
+                }
+
                 $data[$fieldName] = $value;
             }
         }

tests/Doctrine/Tests/ORM/Functional/Ticket/GH7505Test.php

@@ -0,0 +1,92 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+/**
+ * @group GH7505
+ */
+final class GH7505Test extends OrmFunctionalTestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    protected function setUp() : void
+    {
+        parent::setUp();
+
+        $this->setUpEntitySchema([
+            GH7505AbstractResponse::class,
+            GH7505ArrayResponse::class,
+            GH7505TextResponse::class,
+        ]);
+    }
+
+    public function testSimpleArrayTypeHydratedCorrectly() : void
+    {
+        $arrayResponse = new GH7505ArrayResponse();
+        $this->_em->persist($arrayResponse);
+
+        $textResponse = new GH7505TextResponse();
+        $this->_em->persist($textResponse);
+
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $repository = $this->_em->getRepository(GH7505AbstractResponse::class);
+
+        /** @var GH7505ArrayResponse $arrayResponse */
+        $arrayResponse = $repository->find($arrayResponse->id);
+        self::assertSame([], $arrayResponse->value);
+
+        /** @var GH7505TextResponse $textResponse */
+        $textResponse = $repository->find($textResponse->id);
+        self::assertNull($textResponse->value);
+    }
+}
+
+/**
+ * @Entity()
+ * @Table(name="gh7505_responses")
+ * @InheritanceType("SINGLE_TABLE")
+ * @DiscriminatorColumn(name="discr", type="string")
+ * @DiscriminatorMap({
+ *     "array" = GH7505ArrayResponse::class,
+ *     "text"  = GH7505TextResponse::class,
+ * })
+ */
+abstract class GH7505AbstractResponse
+{
+    /**
+     * @Id @GeneratedValue
+     * @Column(type="integer")
+     */
+    public $id;
+}
+
+/**
+ * @Entity()
+ */
+class GH7505ArrayResponse extends GH7505AbstractResponse
+{
+    /**
+     * @Column(name="value_array", type="simple_array")
+     * @var array
+     */
+    public $value = [];
+}
+
+/**
+ * @Entity()
+ */
+class GH7505TextResponse extends GH7505AbstractResponse
+{
+    /**
+     * @Column(name="value_string", type="string")
+     * @var string|null
+     */
+    public $value;
+}