do not process private properties from parent class

xabbuh · xabbuh · commit adfa1ef3ceee · 2019-06-04T10:43:25.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/DoctrineLoaderEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/DoctrineLoaderEntity.php
@@ -21,7 +21,7 @@
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-class DoctrineLoaderEntity
+class DoctrineLoaderEntity extends DoctrineLoaderParentEntity
 {
     /**
      * @ORM\Id
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/DoctrineLoaderParentEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/DoctrineLoaderParentEntity.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\MappedSuperclass
+ */
+class DoctrineLoaderParentEntity
+{
+    /**
+     * @ORM\Column(length=35)
+     */
+    public $publicParentMaxLength;
+
+    /**
+     * @ORM\Column(length=30)
+     */
+    private $privateParentMaxLength;
+
+    public function getPrivateParentMaxLength()
+    {
+        return $this->privateParentMaxLength;
+    }
+
+    public function setPrivateParentMaxLength($privateParentMaxLength): void
+    {
+        $this->privateParentMaxLength = $privateParentMaxLength;
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php
@@ -16,6 +16,7 @@
 use Symfony\Bridge\Doctrine\Tests\Fixtures\BaseUser;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\DoctrineLoaderEmbed;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\DoctrineLoaderEntity;
+use Symfony\Bridge\Doctrine\Tests\Fixtures\DoctrineLoaderParentEntity;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Bridge\Doctrine\Validator\DoctrineLoader;
 use Symfony\Component\Validator\Constraints\Length;
@@ -75,11 +76,30 @@ public function testLoadClassMetadata()
         $this->assertSame(10, $alreadyMappedMaxLengthConstraints[0]->max);
         $this->assertSame(1, $alreadyMappedMaxLengthConstraints[0]->min);
 
+        $publicParentMaxLengthMetadata = $classMetadata->getPropertyMetadata('publicParentMaxLength');
+        $this->assertCount(1, $publicParentMaxLengthMetadata);
+        $publicParentMaxLengthConstraints = $publicParentMaxLengthMetadata[0]->getConstraints();
+        $this->assertCount(1, $publicParentMaxLengthConstraints);
+        $this->assertInstanceOf(Length::class, $publicParentMaxLengthConstraints[0]);
+        $this->assertSame(35, $publicParentMaxLengthConstraints[0]->max);
+
         $embeddedMetadata = $classMetadata->getPropertyMetadata('embedded');
         $this->assertCount(1, $embeddedMetadata);
         $this->assertSame(CascadingStrategy::CASCADE, $embeddedMetadata[0]->getCascadingStrategy());
         $this->assertSame(TraversalStrategy::IMPLICIT, $embeddedMetadata[0]->getTraversalStrategy());
 
+        $parentClassMetadata = $validator->getMetadataFor(new DoctrineLoaderParentEntity());
+
+        $publicParentMaxLengthMetadata = $parentClassMetadata->getPropertyMetadata('publicParentMaxLength');
+        $this->assertCount(0, $publicParentMaxLengthMetadata);
+
+        $privateParentMaxLengthMetadata = $parentClassMetadata->getPropertyMetadata('privateParentMaxLength');
+        $this->assertCount(1, $privateParentMaxLengthMetadata);
+        $privateParentMaxLengthConstraints = $privateParentMaxLengthMetadata[0]->getConstraints();
+        $this->assertCount(1, $privateParentMaxLengthConstraints);
+        $this->assertInstanceOf(Length::class, $privateParentMaxLengthConstraints[0]);
+        $this->assertSame(30, $privateParentMaxLengthConstraints[0]->max);
+
         $embeddedClassMetadata = $validator->getMetadataFor(new DoctrineLoaderEmbed());
 
         $embeddedMaxLengthMetadata = $embeddedClassMetadata->getPropertyMetadata('embeddedMaxLength');
diff --git a/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php b/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php
@@ -81,7 +81,7 @@ public function loadClassMetadata(ClassMetadata $metadata): bool
             if (null === $constraint) {
                 if (isset($mapping['originalClass'])) {
                     $metadata->addPropertyConstraint($mapping['declaredField'], new Valid());
-                } else {
+                } elseif (property_exists($className, $mapping['fieldName'])) {
                     $metadata->addPropertyConstraint($mapping['fieldName'], new Length(['max' => $mapping['length']]));
                 }
             } elseif (null === $constraint->max) {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*`
`22`	`22`	`* @author Kévin Dunglas <dunglas@gmail.com>`
`23`	`23`	`*/`
`24`		`-class DoctrineLoaderEntity`
	`24`	`+class DoctrineLoaderEntity extends DoctrineLoaderParentEntity`
`25`	`25`	`{`
`26`	`26`	`/**`
`27`	`27`	`* @ORM\Id`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function loadClassMetadata(ClassMetadata $metadata): bool`
`81`	`81`	`if (null === $constraint) {`
`82`	`82`	`if (isset($mapping['originalClass'])) {`
`83`	`83`	`$metadata->addPropertyConstraint($mapping['declaredField'], new Valid());`
`84`		`- } else {`
	`84`	`+ } elseif (property_exists($className, $mapping['fieldName'])) {`
`85`	`85`	`$metadata->addPropertyConstraint($mapping['fieldName'], new Length(['max' => $mapping['length']]));`
`86`	`86`	`}`
`87`	`87`	`} elseif (null === $constraint->max) {`