Merge pull request #1020 from schmittjoh/missing-type-doctrine

Doctrine driver normalizeFieldType method does not handle nulls
schmittjoh · Dec 9, 2018 · 0898544 · 0898544
2 parents ecc7307 + 8ec6bea
commit 0898544
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 2 deletions.
diff --git a/src/Metadata/Driver/DoctrinePHPCRTypeDriver.php b/src/Metadata/Driver/DoctrinePHPCRTypeDriver.php
@@ -23,7 +23,9 @@ protected function hideProperty(DoctrineClassMetadata $doctrineMetadata, Propert
     protected function setPropertyType(DoctrineClassMetadata $doctrineMetadata, PropertyMetadata $propertyMetadata): void
     {
         $propertyName = $propertyMetadata->name;
-        if ($doctrineMetadata->hasField($propertyName) && $fieldType = $this->normalizeFieldType($doctrineMetadata->getTypeOfField($propertyName))) {
+        if ($doctrineMetadata->hasField($propertyName)
+            && ($typeOfFiled = $doctrineMetadata->getTypeOfField($propertyName))
+            && ($fieldType = $this->normalizeFieldType($typeOfFiled))) {
             $field = $doctrineMetadata->getFieldMapping($propertyName);
             if (!empty($field['multivalue'])) {
                 $fieldType = 'array';

diff --git a/src/Metadata/Driver/DoctrineTypeDriver.php b/src/Metadata/Driver/DoctrineTypeDriver.php
@@ -29,7 +29,9 @@ protected function setDiscriminator(DoctrineClassMetadata $doctrineMetadata, Cla
     protected function setPropertyType(DoctrineClassMetadata $doctrineMetadata, PropertyMetadata $propertyMetadata): void
     {
         $propertyName = $propertyMetadata->name;
-        if ($doctrineMetadata->hasField($propertyName) && $fieldType = $this->normalizeFieldType($doctrineMetadata->getTypeOfField($propertyName))) {
+        if ($doctrineMetadata->hasField($propertyName)
+            && ($typeOfFiled = $doctrineMetadata->getTypeOfField($propertyName))
+            && ($fieldType = $this->normalizeFieldType($typeOfFiled))) {
             $propertyMetadata->setType($this->typeParser->parse($fieldType));
         } elseif ($doctrineMetadata->hasAssociation($propertyName)) {
             $targetEntity = $doctrineMetadata->getAssociationTargetClass($propertyName);

diff --git a/tests/Fixtures/Doctrine/BlogPostSeo.php b/tests/Fixtures/Doctrine/BlogPostSeo.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace JMS\Serializer\Tests\Fixtures\Doctrine;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Embeddable()
+ */
+class BlogPostSeo
+{
+    /**
+     * @ORM\Column(type="string", name="meta_title")
+     *
+     * @var string
+     */
+    private $metaTitle;
+}
diff --git a/tests/Fixtures/Doctrine/BlogPostWithEmbedded.php b/tests/Fixtures/Doctrine/BlogPostWithEmbedded.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace JMS\Serializer\Tests\Fixtures\Doctrine;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ */
+class BlogPostWithEmbedded
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="guid")
+     * @ORM\GeneratedValue(strategy="UUID")
+     */
+    protected $id;
+
+    /**
+     * @ORM\Embedded(class="BlogPostSeo", columnPrefix="seo_")
+     */
+    private $seo;
+}
diff --git a/tests/Metadata/Driver/DoctrineDriverTest.php b/tests/Metadata/Driver/DoctrineDriverTest.php
@@ -11,6 +11,7 @@
 use JMS\Serializer\Metadata\Driver\AnnotationDriver;
 use JMS\Serializer\Metadata\Driver\DoctrineTypeDriver;
 use JMS\Serializer\Naming\IdenticalPropertyNamingStrategy;
+use JMS\Serializer\Tests\Fixtures\Doctrine\BlogPostWithEmbedded;
 use PHPUnit\Framework\TestCase;
 
 class DoctrineDriverTest extends TestCase
@@ -21,6 +22,13 @@ public function getMetadata()
         return $this->getDoctrineDriver()->loadMetadataForClass($refClass);
     }
 
+    public function testMetadataForEmbedded()
+    {
+        $refClass = new \ReflectionClass(BlogPostWithEmbedded::class);
+        $meta = $this->getDoctrineDriver()->loadMetadataForClass($refClass);
+        self::assertNotNull($meta);
+    }
+
     public function testTypelessPropertyIsGivenTypeFromDoctrineMetadata()
     {
         $metadata = $this->getMetadata();