diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b3b978d..82be8eee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: - image: circleci/mysql:5.7 environment: MYSQL_ALLOW_EMPTY_PASSWORD: true - - image: elasticsearch:7.5.2 + - image: docker.elastic.co/elasticsearch/elasticsearch:7.5.2 environment: - cluster.name: es-test-cluster - xpack.security.enabled: false @@ -18,6 +18,7 @@ jobs: - network.host: 127.0.0.1 - http.port: 9200 - discovery.type: single-node + steps: - checkout - run: @@ -32,6 +33,7 @@ jobs: keys: - composer-v2-{{ checksum "composer.json" }} - composer-v2- + - run: php -d memory_limit=-1 /usr/local/bin/composer require "elasticsearch/elasticsearch:~7.5.2" --no-update - run: php -d memory_limit=-1 /usr/local/bin/composer install -n --prefer-dist - save_cache: key: composer-v2-{{ checksum "composer.json" }} diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 2290cb30..49139b67 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -82,6 +82,19 @@ jobs: SYMFONY_DEPRECATIONS_HELPER: weak ELASTICSEARCH_HOST: '127.0.0.1:9200' + - php-version: '8.1' + elasticsearch-version: '8.11.1' + elasticsearch-package-constraint: '~7.11.0' + phpcr-transport: jackrabbit + dependency-versions: 'highest' + php-extensions: 'ctype, iconv, mysql, imagick' + tools: 'composer:v2' + phpstan: false + lint: true + env: + SYMFONY_DEPRECATIONS_HELPER: weak + ELASTICSEARCH_HOST: '127.0.0.1:9200' + services: mysql: image: mysql:5.7 diff --git a/Resources/doc/installation.md b/Resources/doc/installation.md index 6452cf36..4e6c3785 100644 --- a/Resources/doc/installation.md +++ b/Resources/doc/installation.md @@ -2,15 +2,18 @@ ### ElasticSearch -The SuluArticleBundle requires a running elasticsearch `^5.0`, `^6.0` or `^7.0`. +The SuluArticleBundle requires a running Elasticsearch `^5.0`, `^6.0`, `^7.0`, `^8.0`. ## Install dependencies ```bash -composer require "elasticsearch/elasticsearch:7.9.*" # should match version of your elasticsearch installation +composer require "elasticsearch/elasticsearch:^7.17" # should match version of your elasticsearch installation composer require sulu/article-bundle ``` +For **Elasticsearch 8** the `^7.17` client is currently required, the Elasticsearch 8 +Server supports queries from the Elasticsearch 7 client via the [handcraftedinthealps/elasticsearch-bundle](https://github.com/handcraftedinthealps/ElasticsearchBundle). + ### Configure SuluArticleBundle and sulu core ```yml