Merge pull request #928 from FriendsOfSymfony/php7

XWB · XWB · commit f39f45a9b9dd · 2015-09-11T12:30:23.000+02:00
Add PHP 7 compatibility
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ php:
   - 5.4
   - 5.5
   - 5.6
-  - nightly
+  - 7.0
   - hhvm
 
 matrix:
@@ -19,7 +19,6 @@ matrix:
     - php: 5.6
       env: SYMFONY_VERSION='2.7.*'
   allow_failures:
-    - php: nightly
     - php: hhvm
   fast_finish: true
 
diff --git a/Resources/doc/usage.md b/Resources/doc/usage.md
@@ -183,7 +183,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');
diff --git a/Tests/Elastica/ClientTest.php b/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
 {
diff --git a/composer.json b/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.3-dev",
+        "ruflin/elastica": "~2.1,<2.3",
         "psr/log": "~1.0"
     },
     "require-dev":{

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace FOS\ElasticaBundle\Tests\Client;`
`4`	`4`
`5`	`5`	`use Elastica\Request;`
`6`		`-use Elastica\Transport\Null as NullTransport;`
	`6`	`+use Elastica\Transport\NullTransport;`
`7`	`7`
`8`	`8`	`class ClientTest extends \PHPUnit_Framework_TestCase`
`9`	`9`	`{`