[Doctrine Bridge] Check field type before adding Length constraint

Franco Traversaro · xabbuh · commit 35e6df6bac3b · 2019-06-06T09:45:42.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/DoctrineLoaderEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/DoctrineLoaderEntity.php
@@ -60,4 +60,13 @@ class DoctrineLoaderEntity extends DoctrineLoaderParentEntity
      * @ORM\Embedded(class=DoctrineLoaderEmbed::class)
      */
     public $embedded;
+
+    /** @ORM\Column(type="text", nullable=true, length=1000) */
+    public $textField;
+
+    /** @ORM\Id @ORM\Column(type="guid", length=50) */
+    protected $guidField;
+
+    /** @ORM\Column(type="simple_array", length=100) */
+    public $simpleArrayField = [];
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php
@@ -108,6 +108,16 @@ public function testLoadClassMetadata()
         $this->assertCount(1, $embeddedMaxLengthConstraints);
         $this->assertInstanceOf(Length::class, $embeddedMaxLengthConstraints[0]);
         $this->assertSame(25, $embeddedMaxLengthConstraints[0]->max);
+
+        $this->assertCount(0, $classMetadata->getPropertyMetadata('guidField'));
+        $this->assertCount(0, $classMetadata->getPropertyMetadata('simpleArrayField'));
+
+        $textFieldMetadata = $classMetadata->getPropertyMetadata('textField');
+        $this->assertCount(1, $textFieldMetadata);
+        $textFieldConstraints = $textFieldMetadata[0]->getConstraints();
+        $this->assertCount(1, $textFieldConstraints);
+        $this->assertInstanceOf(Length::class, $textFieldConstraints[0]);
+        $this->assertSame(1000, $textFieldConstraints[0]->max);
     }
 
     public function testFieldMappingsConfiguration()
diff --git a/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php b/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php
@@ -73,7 +73,7 @@ public function loadClassMetadata(ClassMetadata $metadata): bool
                 $metadata->addConstraint(new UniqueEntity(['fields' => $mapping['fieldName']]));
             }
 
-            if (null === ($mapping['length'] ?? null)) {
+            if (null === ($mapping['length'] ?? null) || !\in_array($mapping['type'], ['string', 'text'], true)) {
                 continue;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function loadClassMetadata(ClassMetadata $metadata): bool`
`73`	`73`	`$metadata->addConstraint(new UniqueEntity(['fields' => $mapping['fieldName']]));`
`74`	`74`	`}`
`75`	`75`
`76`		`- if (null === ($mapping['length'] ?? null)) {`
	`76`	`+ if (null === ($mapping['length'] ?? null) \|\| !\in_array($mapping['type'], ['string', 'text'], true)) {`
`77`	`77`	`continue;`
`78`	`78`	`}`
`79`	`79`