From cdaf7105e03d6437e534f4d9a402f1674bab7cfc Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Sat, 5 Jul 2014 15:14:29 +1000
Subject: [PATCH 1/3] Bump dev version to 3.1

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 372320f..a1734dd 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0.x-dev"
+            "dev-master": "3.1.x-dev"
         }
     }
 }

From d797af5b80ae98936c78eea4a6db7a9d80b2eaab Mon Sep 17 00:00:00 2001
From: Floran Brutel <notFloran@users.noreply.github.com>
Date: Mon, 7 Jul 2014 18:35:23 +0200
Subject: [PATCH 2/3] Fix "Faceted Searching" doc

---
 Resources/doc/usage.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/doc/usage.md b/Resources/doc/usage.md
index 55d90ab..37514b3 100644
--- a/Resources/doc/usage.md
+++ b/Resources/doc/usage.md
@@ -45,7 +45,7 @@ $companies = $finder->findPaginated($query);
 $companies->setMaxPerPage($params['limit']);
 $companies->setCurrentPage($params['page']);
 
-$facets = $companies->getAdapter()->getFacets());
+$facets = $companies->getAdapter()->getFacets();
 ```
 
 Searching the entire index

From 9a5b80e723f306e89f8d658d900b21276e010edf Mon Sep 17 00:00:00 2001
From: Lukasz Cybula <lukasz@fsi.pl>
Date: Thu, 31 Jul 2014 14:06:34 +0200
Subject: [PATCH 3/3] Ignore missing Doctrine results during hybridTransform()

---
 .../AbstractElasticaToModelTransformer.php    | 10 ++-
 ...AbstractElasticaToModelTransformerTest.php | 66 +++++++++++++++++++
 2 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 Tests/Doctrine/AbstractElasticaToModelTransformerTest.php

diff --git a/Doctrine/AbstractElasticaToModelTransformer.php b/Doctrine/AbstractElasticaToModelTransformer.php
index 147067d..96f73bd 100755
--- a/Doctrine/AbstractElasticaToModelTransformer.php
+++ b/Doctrine/AbstractElasticaToModelTransformer.php
@@ -120,11 +120,17 @@ abstract class AbstractElasticaToModelTransformer implements ElasticaToModelTran
 
     public function hybridTransform(array $elasticaObjects)
     {
+        $indexedElasticaResults = array();
+        foreach ($elasticaObjects as $elasticaObject) {
+            $indexedElasticaResults[$elasticaObject->getId()] = $elasticaObject;
+        }
+
         $objects = $this->transform($elasticaObjects);
 
         $result = array();
-        for ($i = 0; $i < count($elasticaObjects); $i++) {
-            $result[] = new HybridResult($elasticaObjects[$i], $objects[$i]);
+        foreach ($objects as $object) {
+            $id = $this->propertyAccessor->getValue($object, $this->options['identifier']);
+            $result[] = new HybridResult($indexedElasticaResults[$id], $object);
         }
 
         return $result;
diff --git a/Tests/Doctrine/AbstractElasticaToModelTransformerTest.php b/Tests/Doctrine/AbstractElasticaToModelTransformerTest.php
new file mode 100644
index 0000000..325171b
--- /dev/null
+++ b/Tests/Doctrine/AbstractElasticaToModelTransformerTest.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace FOS\ElasticaBundle\Tests\Doctrine;
+
+use Elastica\Result;
+use FOS\ElasticaBundle\Doctrine\ORM\ElasticaToModelTransformer;
+use Symfony\Component\PropertyAccess\PropertyAccess;
+
+class AbstractElasticaToModelTransformerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Doctrine\Common\Persistence\ManagerRegistry|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $registry;
+
+    /**
+     * @var string
+     */
+    protected $objectClass = 'stdClass';
+
+    /**
+     * Tests if ignore_missing option is properly handled in transformHybrid() method
+     */
+    public function testIgnoreMissingOptionDuringTransformHybrid()
+    {
+        $transformer = $this->getMock(
+            'FOS\ElasticaBundle\Doctrine\ORM\ElasticaToModelTransformer',
+            array('findByIdentifiers'),
+            array($this->registry, $this->objectClass, array('ignore_missing' => true))
+        );
+
+        $transformer->setPropertyAccessor(PropertyAccess::createPropertyAccessor());
+
+        $firstOrmResult = new \stdClass();
+        $firstOrmResult->id = 1;
+        $secondOrmResult = new \stdClass();
+        $secondOrmResult->id = 3;
+        $transformer->expects($this->once())
+            ->method('findByIdentifiers')
+            ->with(array(1, 2, 3))
+            ->willReturn(array($firstOrmResult, $secondOrmResult));
+
+        $firstElasticaResult = new Result(array('_id' => 1));
+        $secondElasticaResult = new Result(array('_id' => 2));
+        $thirdElasticaResult = new Result(array('_id' => 3));
+
+        $hybridResults = $transformer->hybridTransform(array($firstElasticaResult, $secondElasticaResult, $thirdElasticaResult));
+
+        $this->assertCount(2, $hybridResults);
+        $this->assertEquals($firstOrmResult, $hybridResults[0]->getTransformed());
+        $this->assertEquals($firstElasticaResult, $hybridResults[0]->getResult());
+        $this->assertEquals($secondOrmResult, $hybridResults[1]->getTransformed());
+        $this->assertEquals($thirdElasticaResult, $hybridResults[1]->getResult());
+    }
+
+    protected function setUp()
+    {
+        if (!interface_exists('Doctrine\Common\Persistence\ManagerRegistry')) {
+            $this->markTestSkipped('Doctrine Common is not present');
+        }
+
+        $this->registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+}