Support ElasticSearch 5.0 added #151
Conversation
|
we should also include that into the test suite:
|
Tests/app/AppKernel.php
Outdated
| @@ -38,6 +38,11 @@ public function registerContainerConfiguration(LoaderInterface $loader) | |||
| $loader->load(__DIR__ . '/config/versioning.yml'); | |||
| } | |||
|
|
|||
| $loader->load(__DIR__ . '/config/config.yml'); | |||
| // If version is lower then 5.6 it is an testcase for elasticsearch 2.*, so different ONGR config is needed | |||
| if (phpversion() < 5.6) { | |||
There was a problem hiding this comment.
this should be handled via a envorinment variable in travis.
There was a problem hiding this comment.
@wachterjohannes you're right i will fix this
|
in travis the default elasticsearch version is |
|
@wachterjohannes hi Johannes, i changed the code for travis, but still get some unknown problems, can you have a look into it? My knowledge of Travis is still a little bit low. |
Tests/scripts/install-travis-es.sh
Outdated
|
|
||
| echo $ES_VERSION; | ||
|
|
||
| if [[ "${ES_VERSION}" = "2.4.4" ]]; then |
There was a problem hiding this comment.
i would always use the same installation method (download) this makes the installation script easier to read.
.travis.yml
Outdated
| apt: | ||
| packages: | ||
| - oracle-java8-set-default | ||
|
|
||
| matrix: | ||
| include: | ||
| - php: 5.5 | ||
| env: | ||
| - SULU_VERSION="~1.5.1" |
There was a problem hiding this comment.
I think if you change this to ~1.5.3 it may work.
kleinkoerkamp
changed the title
.travis.yml
Outdated
| @@ -59,5 +70,6 @@ script: | |||
| - ./vendor/bin/phpunit $CODE_COVERAGE | |||
|
|
|||
| after_script: | |||
| - cat elasticsearch.log | |||
There was a problem hiding this comment.
where have you specified that this file will be written?
There was a problem hiding this comment.
Was not used anymore
Resources/doc/installation_es5.md
Outdated
| @@ -0,0 +1,58 @@ | |||
| # Installation | |||
|
|
|||
| If you w | |||
There was a problem hiding this comment.
there is missing the half sentence (:
There was a problem hiding this comment.
Was not needed anymore.
Tests/app/AppKernel.php
Outdated
| @@ -38,6 +38,10 @@ public function registerContainerConfiguration(LoaderInterface $loader) | |||
| $loader->load(__DIR__ . '/config/versioning.yml'); | |||
| } | |||
|
|
|||
| $loader->load(__DIR__ . '/config/config.yml'); | |||
| if (getenv('ES_VERSION') == '2.4.4') { | |||
There was a problem hiding this comment.
can you change that by using http://php.net/manual/de/function.version-compare.php ? it should match >=2.2 and <5.0
UPGRADE.md
Outdated
|
|
||
| ## 0.5.0 | ||
|
|
||
| Now also support for ElasticSearch 5. To still be compatible with ^2.2, make sure you run: |
There was a problem hiding this comment.
move that to dev-develop. i will change that when i release the bundle
|
@kleinkoerkamp thanks for contribution (: |
What's in this PR?
ArticleBundle now also ElasticSearch 5.0 compatible
BC Breaks
To Do