From 22a2a223cc6a7b1915054ee9fedf2f46b1a801c1 Mon Sep 17 00:00:00 2001 From: Floran Brutel Date: Sun, 17 Aug 2014 12:16:15 +0200 Subject: [PATCH 1/4] Update version in setup.md Use "~3.0" instead of "~3.0.2" to get version 3.0.3 and future minor versions --- Resources/doc/setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/doc/setup.md b/Resources/doc/setup.md index 912c5d2..6a1c2ae 100644 --- a/Resources/doc/setup.md +++ b/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 From 69c2214bc5c9b910fb0021bd69fda8e6ae9e3503 Mon Sep 17 00:00:00 2001 From: Floran Brutel Date: Mon, 18 Aug 2014 13:30:45 +0200 Subject: [PATCH 2/4] Use the new Search annotation Use "FOS\ElasticaBundle\Annotation\Search" instead of "FOS\ElasticaBundle\Configuration\Search" in the repository manager. Update the cookbook --- Manager/RepositoryManager.php | 2 +- Resources/doc/cookbook/custom-repositories.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Manager/RepositoryManager.php b/Manager/RepositoryManager.php index 3cf8e96..be07b42 100644 --- a/Manager/RepositoryManager.php +++ b/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; diff --git a/Resources/doc/cookbook/custom-repositories.md b/Resources/doc/cookbook/custom-repositories.md index 47dc3fe..9eff5f7 100644 --- a/Resources/doc/cookbook/custom-repositories.md +++ b/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") From 0425379420ff69e9633d8579dea7a2200e7e547b Mon Sep 17 00:00:00 2001 From: Patrick McAndrew Date: Mon, 11 Aug 2014 17:17:38 +0100 Subject: [PATCH 3/4] add back fos_elastica.client tag that was removed in e78950ddb7b3e6c3ae402a042276dc81c4ee0dac --- DependencyInjection/FOSElasticaExtension.php | 1 + 1 file changed, 1 insertion(+) diff --git a/DependencyInjection/FOSElasticaExtension.php b/DependencyInjection/FOSElasticaExtension.php index aefa7fe..cdf109b 100644 --- a/DependencyInjection/FOSElasticaExtension.php +++ b/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); From 598a59927ef9ed318a4ab9cfbc9672dea4947894 Mon Sep 17 00:00:00 2001 From: Tim Nagel Date: Thu, 21 Aug 2014 21:48:19 +1000 Subject: [PATCH 4/4] Update travis testing --- .scrutinizer.yml | 5 +++++ .travis.yml | 19 ++++++++++++++++--- composer.json | 1 - 3 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 .scrutinizer.yml diff --git a/.scrutinizer.yml b/.scrutinizer.yml new file mode 100644 index 0000000..e2cb043 --- /dev/null +++ b/.scrutinizer.yml @@ -0,0 +1,5 @@ +imports: + - php + +tools: + external_code_coverage: true diff --git a/.travis.yml b/.travis.yml index 8ccaa8d..02f3ab8 100644 --- a/.travis.yml +++ b/.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 diff --git a/composer.json b/composer.json index 2fd9d3c..bb30928 100644 --- a/composer.json +++ b/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.*",