Merge remote branch 'origin/3.0.x' into 3.1.x

Conflicts:
	composer.json

Author: XWB

.travis.yml

@@ -9,13 +9,19 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
+  - hhvm
 
 matrix:
   include:
-    - php: 5.5
+    - php: 5.6
       env: SYMFONY_VERSION='2.3.*'
-    - php: 5.5
-      env: SYMFONY_VERSION='2.5.*'
+    - php: 5.6
+      env: SYMFONY_VERSION='2.7.*'
+  allow_failures:
+    - php: hhvm
+  fast_finish: true
+
 
 before_script:
   - /usr/share/elasticsearch/bin/elasticsearch -v

CHANGELOG-3.0.md

@@ -12,6 +12,14 @@ 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.13 (2015-xx-xx)
+
+ * Add PHP 7 compatibility
+
+* 3.0.12 (2015-08-31)
+
+ * Bump allowed Elastica version to 2.2
+
 * 3.0.11 (2015-08-05)
 
  * Bump allowed Elastica version to 2.1

Resources/doc/usage.md

@@ -185,7 +185,7 @@ The following code will execute a search against the Elasticsearch server:
 
 ```php
 $finder = $this->container->get('fos_elastica.finder.site.article');
-$boolQuery = new \Elastica\Query\Bool();
+$boolQuery = new \Elastica\Query\BoolQuery();
 
 $fieldQuery = new \Elastica\Query\Match();
 $fieldQuery->setFieldQuery('title', 'I am a title string');

Tests/Elastica/ClientTest.php

@@ -3,7 +3,7 @@
 namespace FOS\ElasticaBundle\Tests\Client;
 
 use Elastica\Request;
-use Elastica\Transport\Null as NullTransport;
+use Elastica\Transport\NullTransport;
 
 class ClientTest extends \PHPUnit_Framework_TestCase
 {

composer.json

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