Merge branch '3.0.x' into 3.1.x

Author: merk

CHANGELOG-3.0.md

@@ -12,6 +12,10 @@ https://github.com/FriendsOfSymfony/FOSElasticaBundle/compare/v3.0.0...v3.0.1
 To generate a changelog summary since the last version, run
 `git log --no-merges --oneline v3.0.0...3.0.x`
 
+* 3.0.10 (2015-05-28)
+
+ * Bump allowed Elastica version to 2.0
+
 * 3.0.9 (2015-03-12)
 
  * Fix a bug in the BC layer of the type configuration for empty configs

DependencyInjection/Configuration.php

@@ -541,8 +541,11 @@ protected function getPersistenceNode()
                 ->arrayNode('elastica_to_model_transformer')
                     ->addDefaultsIfNotSet()
                     ->children()
-                        ->scalarNode('hydrate')->defaultTrue()->end()
-                        ->scalarNode('ignore_missing')->defaultFalse()->end()
+                        ->booleanNode('hydrate')->defaultTrue()->end()
+                        ->booleanNode('ignore_missing')
+                            ->defaultFalse()
+                            ->info('Silently ignore results returned from Elasticsearch without corresponding persistent object.')
+                        ->end()
                         ->scalarNode('query_builder_method')->defaultValue('createQueryBuilder')->end()
                         ->scalarNode('service')->end()
                     ->end()

Resources/doc/setup.md

@@ -74,7 +74,7 @@ Symfony application, use the example below:
 fos_elastica:
     indexes:
         app:
-            index_name: app_%kernel.env%
+            index_name: app_%kernel.environment%
 ```
 
 In this case, the service `fos_elastica.index.app` will relate to an ElasticSearch index

Resources/doc/usage.md

@@ -11,6 +11,7 @@ configuration options for this kind of searching, please see the [types](types.m
 documentation.
 
 ```php
+/* @var $finder \FOS\ElasticaBundle\Finder\TransformedFinder */
 $finder = $this->container->get('fos_elastica.finder.search.user');
 
 // Option 1. Returns all users who have example.net in any of their mapped fields

composer.json

@@ -17,7 +17,7 @@
         "symfony/console": "~2.1",
         "symfony/form": "~2.1",
         "symfony/property-access": "~2.2",
-        "ruflin/elastica": ">=0.90.10.0, <1.5-dev",
+        "ruflin/elastica": ">=0.90.10.0, <2.1-dev",
         "psr/log": "~1.0"
     },
     "require-dev":{