Merge pull request #802 from develth/master

Added mapping for guid type
schmittjoh · Aug 25, 2017 · ef6000e · ef6000e
2 parents fe455ee + 633803a
commit ef6000e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/JMS/Serializer/Metadata/Driver/AbstractDoctrineTypeDriver.php b/src/JMS/Serializer/Metadata/Driver/AbstractDoctrineTypeDriver.php
@@ -41,6 +41,7 @@ abstract class AbstractDoctrineTypeDriver implements DriverInterface
         'string' => 'string',
         'text' => 'string',
         'blob' => 'string',
+        'guid' => 'string',
 
         'integer' => 'integer',
         'smallint' => 'integer',

diff --git a/tests/Fixtures/Doctrine/BlogPost.php b/tests/Fixtures/Doctrine/BlogPost.php
@@ -35,7 +35,7 @@
 class BlogPost
 {
     /**
-     * @ORM\Id @ORM\Column(type="integer")
+     * @ORM\Id @ORM\Column(type="guid") @ORM\GeneratedValue(strategy="UUID")
      */
     protected $id;
 

diff --git a/tests/Metadata/Driver/DoctrineDriverTest.php b/tests/Metadata/Driver/DoctrineDriverTest.php
@@ -106,6 +106,16 @@ public function testVirtualPropertiesAreNotModified()
         $this->assertNull($doctrineMetadata->propertyMetadata['ref']->type);
     }
 
+    public function testGuidPropertyIsGivenStringType()
+    {
+        $metadata = $this->getMetadata();
+
+        $this->assertEquals(
+            array('name' => 'string', 'params' => array()),
+            $metadata->propertyMetadata['id']->type
+        );
+    }
+
     protected function getEntityManager()
     {
         $config = new Configuration();