From c3763a0982e380bb68c87ca622f57e4220a92d14 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Sat, 10 Dec 2016 13:59:34 +0100
Subject: [PATCH] FEATURE: Use latest stable elastica version (#5)

* As we should use it anyway.
* It's compatible with PHP 7
* Also we added php 7.1 to travis
---
 .travis.yml   | 25 ++++++++++++++-----------
 composer.json |  4 ++--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9ad936a..2cb95f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,8 @@ language: php
 
 php:
   - 5.6
-  # Elastica is not compatible yet, see https://travis-ci.org/DanielSiepmann/search_core/jobs/182692743
-  # - 7.0
+  - 7.0
+  - 7.1
 
 env:
   global:
@@ -22,25 +22,28 @@ env:
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - env: TYPO3_VERSION="~6.2"
-      php: 7.0
-    - env: TYPO3_VERSION="dev-master"
-      php: 7.0
   exclude:
     # TYPO3 no longer supports 5.6
     - env: TYPO3_VERSION="dev-master"
       php: 5.6
+    # There is some error with 6.2 and 7 not finding the "UnitTestsBootstrap.php"
+    - env: TYPO3_VERSION="~6.2"
+      php: 7.0
+    - env: TYPO3_VERSION="~6.2"
+      php: 7.1
+  allow_failures:
+    - env: TYPO3_VERSION="dev-master"
+      php: 7.0
+    - env: TYPO3_VERSION="dev-master"
+      php: 7.1
 
 services:
   - mysql
   - elasticsearch
 
-install:
-  - make install
+install: make install
 
-script:
-  - make Tests
+script: make Tests
 
 cache:
   directories:
diff --git a/composer.json b/composer.json
index 8ac7521..be5051e 100644
--- a/composer.json
+++ b/composer.json
@@ -17,8 +17,8 @@
     },
     "require" : {
         "php": ">=5.6.0",
-        "typo3/cms": ">=6.2.0",
-        "ruflin/elastica": "~1.4"
+        "typo3/cms": "~6.2",
+        "ruflin/elastica": "~3.2"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.8.0"