Cast identifier value to string

Cast non-scalar identifiers to string

Improved earlier changes by checking for non-scalar identifiers

Author: vicdelfant

Doctrine/Listener.php

@@ -189,7 +189,12 @@ public function postFlush()
      */
     private function scheduleForDeletion($object)
     {
-        if ($identifierValue = $this->propertyAccessor->getValue($object, $this->config['identifier'])) {
+        $identifierValue = $this->propertyAccessor->getValue($object, $this->config['identifier']);
+        if ($identifierValue && !is_scalar($identifierValue)) {
+            $identifierValue = (string) $identifierValue;
+        }
+
+        if ($identifierValue) {
             $this->scheduledForDeletion[] = $identifierValue;
         }
     }

Tests/Transformer/ModelToElasticaAutoTransformerTest.php

@@ -531,6 +531,20 @@ public function testUnmappedFieldValuesAreNormalisedToStrings()
         $this->assertEquals('bar', $data['unmappedValue']);
     }
 
+    public function testIdentifierIsCastedToString()
+    {
+        $idObject = new CastableObject();;
+        $idObject->foo = '00000000-0000-0000-0000-000000000000';
+
+        $object = new \stdClass();
+        $object->id = $idObject;
+
+        $transformer = $this->getTransformer();
+        $document = $transformer->transform($object, []);
+
+        $this->assertSame('string', gettype($document->getId()));
+    }
+
     /**
      * @param null|\Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
      *

Transformer/ModelToElasticaAutoTransformer.php

@@ -67,7 +67,11 @@ public function setPropertyAccessor(PropertyAccessorInterface $propertyAccessor)
      **/
     public function transform($object, array $fields)
     {
-        $identifier = (string) $this->propertyAccessor->getValue($object, $this->options['identifier']);
+        $identifier = $this->propertyAccessor->getValue($object, $this->options['identifier']);
+        if ($identifier && !is_scalar($identifier)) {
+            $identifier = (string) $identifier;
+        }
+
         $document = $this->transformObjectToDocument($object, $fields, $identifier);
 
         return $document;