Merge tag 'v3.1.4' into 3.1.x

Author: merk

CHANGELOG-3.1.md

@@ -9,6 +9,10 @@ https://github.com/FriendsOfSymfony/FOSElasticaBundle/commit/XXX where XXX is
 the commit hash. To get the diff between two versions, go to
 https://github.com/FriendsOfSymfony/FOSElasticaBundle/compare/v3.0.4...v3.1.0
 
+* 3.1.4 (2015-05-28)
+
+ * Bump Elastica constraint to 2.0
+
 * 3.1.3 (2015-04-02)
 
  * Fix Symfony 2.3 compatibility

Doctrine/ORM/Provider.php

@@ -80,7 +80,7 @@ protected function fetchSlice($queryBuilder, $limit, $offset)
         }
 
         /*
-         * An orderBy DQL  part is required to avoid feching the same row twice.
+         * An orderBy DQL  part is required to avoid fetching the same row twice.
          * @see http://stackoverflow.com/questions/6314879/does-limit-offset-length-require-order-by-for-pagination
          * @see http://www.postgresql.org/docs/current/static/queries-limit.html
          * @see http://www.sqlite.org/lang_select.html#orderby

Paginator/RawPaginatorAdapter.php

@@ -121,7 +121,7 @@ public function getResults($offset, $itemCountPerPage)
     public function getTotalHits($genuineTotal = false)
     {
         if (! isset($this->totalHits)) {
-            $this->totalHits = $this->searchable->search($this->query)->getTotalHits();
+            $this->totalHits = $this->searchable->count($this->query);
         }
 
         return $this->query->hasParam('size') && !$genuineTotal

Resources/doc/setup.md

@@ -8,7 +8,7 @@ Open a command console, enter your project directory and execute the
 following command to download the latest stable version of this bundle:
 
 ```bash
-$ composer require friendsofsymfony/elastica-bundle "~3.0"
+$ composer require friendsofsymfony/elastica-bundle
 ```
 
 This command requires you to have Composer installed globally, as explained
@@ -17,7 +17,7 @@ of the Composer documentation.
 
 ### Elasticsearch
 
-Instructions for installing and deploying Elasticsearch may be found [here](http://www.elasticsearch.org/guide/reference/setup/installation/).
+Instructions for installing and deploying Elasticsearch may be found [here](https://www.elastic.co/downloads/elasticsearch).
 
 Step 2: Enable the Bundle
 -------------------------

composer.json

@@ -22,31 +22,23 @@
     },
     "require-dev":{
         "doctrine/orm": "~2.4",
-        "doctrine/doctrine-bundle": "~1.2@beta",
+        "doctrine/doctrine-bundle": "~1.2",
         "jms/serializer-bundle": "@stable",
         "phpunit/phpunit": "~4.1",
         "propel/propel1": "1.6.*",
-        "pagerfanta/pagerfanta": "1.0.*@dev",
+        "pagerfanta/pagerfanta": "~1.0",
         "knplabs/knp-components": "~1.2",
         "knplabs/knp-paginator-bundle": "~2.4",
         "symfony/browser-kit" : "~2.3",
         "symfony/expression-language" : "~2.4",
         "symfony/twig-bundle": "~2.3"
     },
-    "suggest": {
-        "doctrine/orm": "~2.4",
-        "doctrine/mongodb-odm": "1.0.*@dev",
-        "propel/propel1": "1.6.*",
-        "pagerfanta/pagerfanta": "1.0.*@dev",
-        "knplabs/knp-components": "~1.2",
-        "symfony/expression-language" : "~2.4"
-    },
     "autoload": {
         "psr-4": { "FOS\\ElasticaBundle\\": "" }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.1.x-dev"
+            "dev-master": "3.2.x-dev"
         }
     }
 }