Skip to content

Commit 07afbf5

Browse files
committed
Merge tag 'v3.1.4' into 3.1.x
2 parents 4227fd5 + 129e425 commit 07afbf5

File tree

5 files changed

+11
-15
lines changed

5 files changed

+11
-15
lines changed

CHANGELOG-3.1.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ https://github.com/FriendsOfSymfony/FOSElasticaBundle/commit/XXX where XXX is
99
the commit hash. To get the diff between two versions, go to
1010
https://github.com/FriendsOfSymfony/FOSElasticaBundle/compare/v3.0.4...v3.1.0
1111

12+
* 3.1.4 (2015-05-28)
13+
14+
* Bump Elastica constraint to 2.0
15+
1216
* 3.1.3 (2015-04-02)
1317

1418
* Fix Symfony 2.3 compatibility

Doctrine/ORM/Provider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ protected function fetchSlice($queryBuilder, $limit, $offset)
8080
}
8181

8282
/*
83-
* An orderBy DQL part is required to avoid feching the same row twice.
83+
* An orderBy DQL part is required to avoid fetching the same row twice.
8484
* @see http://stackoverflow.com/questions/6314879/does-limit-offset-length-require-order-by-for-pagination
8585
* @see http://www.postgresql.org/docs/current/static/queries-limit.html
8686
* @see http://www.sqlite.org/lang_select.html#orderby

Paginator/RawPaginatorAdapter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public function getResults($offset, $itemCountPerPage)
121121
public function getTotalHits($genuineTotal = false)
122122
{
123123
if (! isset($this->totalHits)) {
124-
$this->totalHits = $this->searchable->search($this->query)->getTotalHits();
124+
$this->totalHits = $this->searchable->count($this->query);
125125
}
126126

127127
return $this->query->hasParam('size') && !$genuineTotal

Resources/doc/setup.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Open a command console, enter your project directory and execute the
88
following command to download the latest stable version of this bundle:
99

1010
```bash
11-
$ composer require friendsofsymfony/elastica-bundle "~3.0"
11+
$ composer require friendsofsymfony/elastica-bundle
1212
```
1313

1414
This command requires you to have Composer installed globally, as explained
@@ -17,7 +17,7 @@ of the Composer documentation.
1717

1818
### Elasticsearch
1919

20-
Instructions for installing and deploying Elasticsearch may be found [here](http://www.elasticsearch.org/guide/reference/setup/installation/).
20+
Instructions for installing and deploying Elasticsearch may be found [here](https://www.elastic.co/downloads/elasticsearch).
2121

2222
Step 2: Enable the Bundle
2323
-------------------------

composer.json

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,23 @@
2222
},
2323
"require-dev":{
2424
"doctrine/orm": "~2.4",
25-
"doctrine/doctrine-bundle": "~1.2@beta",
25+
"doctrine/doctrine-bundle": "~1.2",
2626
"jms/serializer-bundle": "@stable",
2727
"phpunit/phpunit": "~4.1",
2828
"propel/propel1": "1.6.*",
29-
"pagerfanta/pagerfanta": "1.0.*@dev",
29+
"pagerfanta/pagerfanta": "~1.0",
3030
"knplabs/knp-components": "~1.2",
3131
"knplabs/knp-paginator-bundle": "~2.4",
3232
"symfony/browser-kit" : "~2.3",
3333
"symfony/expression-language" : "~2.4",
3434
"symfony/twig-bundle": "~2.3"
3535
},
36-
"suggest": {
37-
"doctrine/orm": "~2.4",
38-
"doctrine/mongodb-odm": "1.0.*@dev",
39-
"propel/propel1": "1.6.*",
40-
"pagerfanta/pagerfanta": "1.0.*@dev",
41-
"knplabs/knp-components": "~1.2",
42-
"symfony/expression-language" : "~2.4"
43-
},
4436
"autoload": {
4537
"psr-4": { "FOS\\ElasticaBundle\\": "" }
4638
},
4739
"extra": {
4840
"branch-alias": {
49-
"dev-master": "3.1.x-dev"
41+
"dev-master": "3.2.x-dev"
5042
}
5143
}
5244
}

0 commit comments

Comments
 (0)