Merge branch '4.x'

Author: Tobion

doc/cookbook/manual-provider.md

@@ -1,7 +1,7 @@
 Manual pager provider
 ====================
 
-Create a service with the tag "fos_elastica.provider" and attributes for the
+Create a service with the tag "fos_elastica.pager_provider" and attributes for the
 index and type for which the service will provide.
 
 ```yaml

src/Doctrine/Listener.php

@@ -223,7 +223,7 @@ private function persistScheduled()
     private function scheduleForDeletion($object)
     {
         if ($identifierValue = $this->propertyAccessor->getValue($object, $this->config['identifier'])) {
-            $this->scheduledForDeletion[] = $identifierValue;
+            $this->scheduledForDeletion[] = !is_scalar($identifierValue) ? (string) $identifierValue : $identifierValue;
         }
     }
 

src/Transformer/ModelToElasticaAutoTransformer.php

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

tests/Functional/app/ORM/bundles.php

@@ -18,5 +18,4 @@
     new FrameworkBundle(),
     new FOSElasticaBundle(),
     new DoctrineBundle(),
-    new JMSSerializerBundle(),
 ];

tests/Unit/Transformer/ModelToElasticaAutoTransformerTest.php

@@ -546,6 +546,20 @@ public function testUnmappedFieldValuesAreNormalisedToStrings()
         $this->assertSame('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('00000000-0000-0000-0000-000000000000', $document->getId());
+    }
+
     /**
      * @param null|\Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
      *