diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not process private properties from parent class

This commit is contained in:
Christian Flothmann 2019-06-04 10:43:25 +02:00
parent f6a6fb6834
commit adfa1ef3ce
4 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/Doctrine/Tests/Fixtures/DoctrineLoaderEntity.php
View File

@ -21,7 +21,7 @@ use Symfony\Component\Validator\Constraints as Assert;
*
* @author Kévin Dunglas <dunglas@gmail.com>
*/
class DoctrineLoaderEntity
class DoctrineLoaderEntity extends DoctrineLoaderParentEntity
{
/**
* @ORM\Id

40
src/Symfony/Bridge/Doctrine/Tests/Fixtures/DoctrineLoaderParentEntity.php Normal file
View File

@ -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;
}
}

20
src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php
View File

@ -16,6 +16,7 @@ use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper;
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 @@ class DoctrineLoaderTest extends TestCase
$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');

2
src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php
View File

@ -81,7 +81,7 @@ final class DoctrineLoader implements LoaderInterface
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) {