Merge branch '3.0.x'

.scrutinizer.yml

@@ -0,0 +1,5 @@
+imports:
+  - php
+
+tools:
+  external_code_coverage: true

.travis.yml

@@ -2,18 +2,31 @@ language: php
 
 php:
   - 5.3
-  - 5.4
   - 5.5
   - 5.6
 
+matrix:
+  include:
+    - php: 5.5
+      env: SYMFONY_VERSION='2.3.*'
+    - php: 5.5
+      env: SYMFONY_VERSION='2.5.*'
+    - php: 5.5
+      env: SYMFONY_VERSION='dev-master'
+
 before_script:
   - /usr/share/elasticsearch/bin/elasticsearch -v
   - sudo /usr/share/elasticsearch/bin/plugin -install elasticsearch/elasticsearch-mapper-attachments/2.0.0
   - sudo service elasticsearch restart
-  - echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
+  - sh -c 'if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi;'
   - composer install --dev --prefer-source
 
-script: vendor/bin/phpunit
+script: vendor/bin/phpunit --coverage-clover=coverage.clover
 
 services:
   - elasticsearch
+
+after_script:
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover

DependencyInjection/FOSElasticaExtension.php

@@ -108,6 +108,7 @@ class FOSElasticaExtension extends Extension
             if (false !== $logger) {
                 $clientDef->addMethodCall('setLogger', array(new Reference($logger)));
             }
+            $clientDef->addTag('fos_elastica.client');
 
             $container->setDefinition($clientId, $clientDef);
 

Manager/RepositoryManager.php

@@ -59,7 +59,7 @@ class RepositoryManager implements RepositoryManagerInterface
         }
 
         $refClass   = new \ReflectionClass($entityName);
-        $annotation = $this->reader->getClassAnnotation($refClass, 'FOS\\ElasticaBundle\\Configuration\\Search');
+        $annotation = $this->reader->getClassAnnotation($refClass, 'FOS\\ElasticaBundle\\Annotation\\Search');
         if ($annotation) {
             $this->entities[$entityName]['repositoryName']
                 = $annotation->repositoryClass;

Resources/doc/cookbook/custom-repositories.md

@@ -58,7 +58,7 @@ Alternatively you can specify the custom repository using an annotation in the e
 
 namespace Application\UserBundle\Entity;
 
-use FOS\ElasticaBundle\Configuration\Search;
+use FOS\ElasticaBundle\Annotation\Search;
 
 /**
  * @Search(repositoryClass="Acme\ElasticaBundle\SearchRepository\UserRepository")

Resources/doc/setup.md

@@ -7,7 +7,7 @@ A) Install FOSElasticaBundle
 FOSElasticaBundle is installed using [Composer](https://getcomposer.org).
 
 ```bash
-$ php composer.phar require friendsofsymfony/elastica-bundle "~3.0.2"
+$ php composer.phar require friendsofsymfony/elastica-bundle "~3.0"
 ```
 
 ### Elasticsearch

composer.json

@@ -23,7 +23,6 @@
     "require-dev":{
         "doctrine/orm": "~2.2",
         "doctrine/doctrine-bundle": "~1.2@beta",
-        "doctrine/mongodb-odm": "1.0.*@beta",
         "jms/serializer-bundle": "@stable",
         "phpunit/phpunit": "~4.1",
         "propel/propel1": "1.6.*",