Support ElasticSearch 5.0 added

.travis.yml

@@ -1,14 +1,14 @@
-sudo: false
+sudo: true
 
 language: php
 
-services:
-  - elasticsearch
-
 env:
   global:
+    - JAVA_HOME="/usr/lib/jvm/java-8-oracle/jre"
     - JACKRABBIT_VERSION=2.12.0
     - SYMFONY__PHPCR__TRANSPORT=doctrinedbal
+    - ES_VERSION="5.3.0"
+    - ES_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.zip"
 
 cache:
   directories:
@@ -19,8 +19,10 @@ matrix:
   include:
     - php: 5.5
       env:
-        - SULU_VERSION="~1.5.1"
+        - SULU_VERSION="~1.5.3"
         - COMPOSER_FLAGS="--prefer-lowest --prefer-dist --no-interaction"
+        - ES_VERSION="2.4.4"
+        - ES_DOWNLOAD_URL="https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-${ES_VERSION}.zip"
     - php: 7.0
       env:
         - COMPOSER_FLAGS="--prefer-dist --no-interaction"
@@ -29,10 +31,16 @@ matrix:
     - php: 7.0
       env:
         - COMPOSER_FLAGS="--prefer-dist --no-interaction"
-        - SULU_VERSION="~1.5.1"
+        - SULU_VERSION="~1.5.3"
         - SYMFONY__PHPCR__TRANSPORT=jackrabbit
+addons:
+  apt:
+    packages:
+      - oracle-java8-installer
 
 before_install:
+  # Container based PHP image ues PHP 5.6.5, once it will be upgraded sudo will be not necessary
+  - sudo apt-get install -y oracle-java8-set-default
   - |
     if [[ $SYMFONY__PHPCR__TRANSPORT = jackrabbit ]]; then
         if [ ! -f downloads/jackrabbit-standalone-$JACKRABBIT_VERSION.jar ]; then
@@ -45,6 +53,9 @@ before_install:
   - if [[ -z $CODE_COVERAGE ]]; then phpenv config-rm xdebug.ini ; fi
   - phpenv config-add Tests/travis.php.ini
   - composer self-update
+  - curl -L -o elasticsearch.zip ${ES_DOWNLOAD_URL}
+  - unzip elasticsearch.zip
+  - ./elasticsearch-*/bin/elasticsearch -d
 
 install:
   - travis_retry composer require sulu/sulu:$SULU_VERSION $COMPOSER_FLAGS

Content/ArticleDataProvider.php

@@ -13,9 +13,9 @@
 
 use ONGR\ElasticsearchBundle\Result\DocumentIterator;
 use ONGR\ElasticsearchBundle\Service\Manager;
-use ONGR\ElasticsearchDSL\Query\BoolQuery;
+use ONGR\ElasticsearchDSL\Query\Compound\BoolQuery;
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
-use ONGR\ElasticsearchDSL\Query\TermQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\TermQuery;
 use ONGR\ElasticsearchDSL\Search;
 use ONGR\ElasticsearchDSL\Sort\FieldSort;
 use ProxyManager\Factory\LazyLoadingValueHolderFactory;
@@ -249,7 +249,7 @@ private function getSearchResult(array $filters, $limit, $page, $pageSize, $loca
             $this->appendSortBy($filters['sortBy'], $sortMethod, $search);
         }
 
-        return $repository->execute($search);
+        return $repository->findDocuments($search);
     }
 
     /**

Content/ArticleSelectionContentType.php

@@ -12,7 +12,7 @@
 namespace Sulu\Bundle\ArticleBundle\Content;
 
 use ONGR\ElasticsearchBundle\Service\Manager;
-use ONGR\ElasticsearchDSL\Query\IdsQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\IdsQuery;
 use Sulu\Bundle\ArticleBundle\Document\ArticleViewDocumentInterface;
 use Sulu\Bundle\ArticleBundle\Metadata\ArticleViewDocumentIdTrait;
 use Sulu\Component\Content\Compat\PropertyInterface;
@@ -72,7 +72,7 @@ public function getContentData(PropertyInterface $property)
 
         $result = [];
         /** @var ArticleViewDocumentInterface $articleDocument */
-        foreach ($repository->execute($search) as $articleDocument) {
+        foreach ($repository->findDocuments($search) as $articleDocument) {
             $result[array_search($articleDocument->getUuid(), $value, false)] = $articleDocument;
         }
 

Controller/ArticleController.php

@@ -15,12 +15,12 @@
 use FOS\RestBundle\Routing\ClassResourceInterface;
 use JMS\Serializer\SerializationContext;
 use ONGR\ElasticsearchBundle\Service\Manager;
-use ONGR\ElasticsearchDSL\Query\BoolQuery;
-use ONGR\ElasticsearchDSL\Query\IdsQuery;
+use ONGR\ElasticsearchDSL\Query\Compound\BoolQuery;
+use ONGR\ElasticsearchDSL\Query\FullText\MatchQuery;
+use ONGR\ElasticsearchDSL\Query\FullText\MultiMatchQuery;
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
-use ONGR\ElasticsearchDSL\Query\MatchQuery;
-use ONGR\ElasticsearchDSL\Query\MultiMatchQuery;
-use ONGR\ElasticsearchDSL\Query\TermQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\IdsQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\TermQuery;
 use ONGR\ElasticsearchDSL\Sort\FieldSort;
 use Sulu\Bundle\ArticleBundle\Admin\ArticleAdmin;
 use Sulu\Bundle\ArticleBundle\Document\ArticleDocument;
@@ -154,7 +154,7 @@ public function cgetAction(Request $request)
         $search->setFrom(($page - 1) * $limit);
 
         $result = [];
-        foreach ($repository->execute($search) as $document) {
+        foreach ($repository->findDocuments($search) as $document) {
             if (false !== ($index = array_search($document->getUuid(), $ids))) {
                 $result[$index] = $document;
             } else {
@@ -185,7 +185,7 @@ public function cgetAction(Request $request)
     /**
      * Returns single article.
      *
-     * @param string $uuid
+     * @param string  $uuid
      * @param Request $request
      *
      * @return Response
@@ -238,7 +238,7 @@ public function postAction(Request $request)
      * Update articles.
      *
      * @param Request $request
-     * @param string $uuid
+     * @param string  $uuid
      *
      * @return Response
      */
@@ -313,7 +313,7 @@ public function deleteAction($id)
      *
      * @Post("/articles/{uuid}")
      *
-     * @param string $uuid
+     * @param string  $uuid
      * @param Request $request
      *
      * @return Response
@@ -380,7 +380,7 @@ public function getSecurityContext()
     /**
      * Persists the document using the given information.
      *
-     * @param array $data
+     * @param array  $data
      * @param object $document
      * @param string $locale
      *

Document/Index/ArticleIndexer.php

@@ -13,7 +13,7 @@
 
 use ONGR\ElasticsearchBundle\Service\Manager;
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
-use ONGR\ElasticsearchDSL\Query\TermQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\TermQuery;
 use Sulu\Bundle\ArticleBundle\Document\ArticleDocument;
 use Sulu\Bundle\ArticleBundle\Document\ArticleViewDocument;
 use Sulu\Bundle\ArticleBundle\Document\ArticleViewDocumentInterface;
@@ -254,7 +254,7 @@ public function remove($document)
         $search = $repository->createSearch()
             ->addQuery(new TermQuery('uuid', $document->getUuid()))
             ->setSize(1000);
-        foreach ($repository->execute($search) as $viewDocument) {
+        foreach ($repository->findDocuments($search) as $viewDocument) {
             $this->manager->remove($viewDocument);
         }
     }
@@ -279,7 +279,7 @@ public function clear()
             ->setSize($pageSize);
 
         do {
-            $result = $repository->execute($search);
+            $result = $repository->findDocuments($search);
             foreach ($result as $document) {
                 $this->manager->remove($document);
             }

Markup/ArticleLinkProvider.php

@@ -12,8 +12,8 @@
 namespace Sulu\Bundle\ArticleBundle\Markup;
 
 use ONGR\ElasticsearchBundle\Service\Manager;
-use ONGR\ElasticsearchDSL\Query\IdsQuery;
-use ONGR\ElasticsearchDSL\Query\RangeQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\IdsQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\RangeQuery;
 use ONGR\ElasticsearchDSL\Search;
 use Sulu\Bundle\ArticleBundle\Document\ArticleViewDocumentInterface;
 use Sulu\Bundle\ArticleBundle\Document\Index\DocumentFactory;
@@ -42,9 +42,9 @@ class ArticleLinkProvider implements LinkProviderInterface
     private $types;
 
     /**
-     * @param Manager $manager
+     * @param Manager         $manager
      * @param DocumentFactory $documentFactory
-     * @param array $types
+     * @param array           $types
      */
     public function __construct(Manager $manager, DocumentFactory $documentFactory, array $types)
     {
@@ -87,7 +87,8 @@ public function preload(array $hrefs, $locale, $published = true)
             $search->addQuery(new RangeQuery('authored', ['lte' => 'now']));
         }
 
-        $documents = $this->manager->execute([$this->documentFactory->getClass('article')], $search);
+        $repository = $this->manager->getRepository($this->documentFactory->getClass('article'));
+        $documents = $repository->findDocuments($search);
 
         $result = [];
         /** @var ArticleViewDocumentInterface $document */

README.md

@@ -25,7 +25,7 @@ and code are not stable yet (pre 1.0).
 * Composer
 * PHP `^5.5 || ^7.0`
 * Sulu `^1.5`
-* Elasticsearch `^2.2`
+* Elasticsearch `^2.2 || ^5.0`
 
 For detailed requirements see [composer.json](https://github.com/sulu/SuluArticleBundle/blob/master/composer.json).
 

Resources/doc/installation.md

@@ -2,61 +2,13 @@
 
 ## Install ElasticSearch
 
-The sulu article bundle requires a running elasticsearch `^2.2`.
+The sulu article bundle requires a running elasticsearch `^2.2` or `^5.0`.
 
-## Install bundle over composer:
+There is an different installation and configuration depending on which version of ElasticSearch you are using.
 
-```bash
-composer require sulu/article-bundle
-```
+If you use version `^2.2` read: [Installation for ElasticSearch 2.2](installation_es2.md)
+else read: [Installation for ElasticSearch 5.0](installation_es5.md) 
 
-**Add bundle to AbstractKernel:**
-
-```php
-/* app/AbstractKernel.php */
-
-new Sulu\Bundle\ArticleBundle\SuluArticleBundle(),
-new ONGR\ElasticsearchBundle\ONGRElasticsearchBundle(),
-```
-
-## Configure the bundles:
-
-```yml
-# app/config/config.yml
-
-sulu_route:
-    mappings:
-        Sulu\Bundle\ArticleBundle\Document\ArticleDocument:
-            generator: schema
-            options:
-                route_schema: /articles/{object.getTitle()}
-
-sulu_core:
-    content:
-        structure:
-            default_type:
-                article: "article_default"
-            paths:
-                article:
-                    path: "%kernel.root_dir%/Resources/templates/articles"
-                    type: "article"
-
-ongr_elasticsearch:
-    connections:
-        default:
-            index_name: su_articles
-        live:
-            index_name: su_articles_live
-    managers:
-        default:
-            connection: default
-            mappings:
-                - SuluArticleBundle
-        live:
-            connection: live
-            mappings:
-                - SuluArticleBundle
-```
 
 ## Configure the routing
 
@@ -137,3 +89,5 @@ sulu_article:
     # Display tab 'all' in list view
     display_tab_all:      true
 ```
+
+

Resources/doc/installation_es2.md

@@ -0,0 +1,61 @@
+# Installation
+
+
+## Install ElasticSearch
+
+The sulu article bundle requires a running elasticsearch `^2.2`.
+
+## Install bundle over composer:
+
+```bash
+composer require ongr/elasticsearch-bundle:1.2.9
+composer require sulu/article-bundle
+```
+
+**Add bundle to AbstractKernel:**
+
+```php
+/* app/AbstractKernel.php */
+
+new Sulu\Bundle\ArticleBundle\SuluArticleBundle(),
+new ONGR\ElasticsearchBundle\ONGRElasticsearchBundle(),
+```
+
+## Configure the bundles:
+
+```yml
+# app/config/config.yml
+
+sulu_route:
+    mappings:
+        Sulu\Bundle\ArticleBundle\Document\ArticleDocument:
+            generator: schema
+            options:
+                route_schema: /articles/{object.getTitle()}
+
+sulu_core:
+    content:
+        structure:
+            default_type:
+                article: "article_default"
+            paths:
+                article:
+                    path: "%kernel.root_dir%/Resources/templates/articles"
+                    type: "article"
+
+ongr_elasticsearch:
+    connections:
+        default:
+            index_name: su_articles_test
+        live:
+            index_name: su_articles_test_live
+    managers:
+        default:
+            connection: default
+            mappings:
+                - SuluArticleBundle
+        live:
+            connection: live
+            mappings:
+                - SuluArticleBundle
+```