From 6595d7129abebb8e810d525bf5db27f1152fd4f5 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Mon, 7 Aug 2017 18:04:07 +0200
Subject: [PATCH 1/2] TASK: Move additionalWhereClause to constants

To keep things the same, move additionalWhereClause of tt_content also
to constants.
---
 Configuration/TypoScript/constants.txt | 4 ++++
 Configuration/TypoScript/setup.txt     | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Configuration/TypoScript/constants.txt b/Configuration/TypoScript/constants.txt
index bcf191e..1a39851 100644
--- a/Configuration/TypoScript/constants.txt
+++ b/Configuration/TypoScript/constants.txt
@@ -9,6 +9,10 @@ plugin {
             }
 
             indexing {
+                tt_content {
+                    additionalWhereClause = tt_content.CType NOT IN ('gridelements_pi1', 'list', 'div', 'menu', 'shortcut', 'search', 'login') AND tt_content.bodytext != ''
+                }
+
                 pages {
                     additionalWhereClause = pages.doktype NOT IN (3, 199, 6, 254, 255)
                     abstractFields = abstract, description, bodytext
diff --git a/Configuration/TypoScript/setup.txt b/Configuration/TypoScript/setup.txt
index d77c42e..67612e1 100644
--- a/Configuration/TypoScript/setup.txt
+++ b/Configuration/TypoScript/setup.txt
@@ -12,10 +12,7 @@ plugin {
                 # Not for direct indexing therefore no indexer.
                 # Used to configure tt_content fetching while indexing pages
                 tt_content {
-                    additionalWhereClause (
-                        tt_content.CType NOT IN ('gridelements_pi1', 'list', 'div', 'menu', 'shortcut', 'search', 'login')
-                        AND tt_content.bodytext != ''
-                    )
+                    additionalWhereClause = {$plugin.tx_searchcore.settings.indexing.tt_content.additionalWhereClause}
                 }
 
                 pages {

From baca4824d5f6b38ef572840072cc00265d7d1fb5 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Tue, 8 Aug 2017 09:47:12 +0200
Subject: [PATCH 2/2] BUGFIX: Do not test php 5.6

As TYPO3 7.6.x introduced breaking change to not support PHP 5.6 any
longer.
---
 .travis.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3253c3c..28c45aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ before_install:
 language: php
 
 php:
-  - 5.6
   - 7.0
   - 7.1
 
@@ -31,12 +30,6 @@ env:
 
 matrix:
   fast_finish: true
-  exclude:
-    # TYPO3 no longer supports 5.6
-    - env: TYPO3_VERSION="~8"
-      php: 5.6
-    - env: TYPO3_VERSION="dev-master"
-      php: 5.6
   allow_failures:
     - env: TYPO3_VERSION="~8"
       php: 7.0