From 2a1d4f34e4259b57420c5c34da650e499cd72cda Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Thu, 11 May 2017 09:38:42 +0200 Subject: [PATCH 1/2] TASK: Let travis test TYPO3 6.2 with PHP 7.x --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e6f68a..e583e51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,12 +31,6 @@ matrix: php: 5.6 - env: TYPO3_VERSION="dev-master" php: 5.6 - # There is some error with 6.2 and 7 not finding the "UnitTestsBootstrap.php" - # See: https://github.com/DanielSiepmann/search_core/issues/4 - - env: TYPO3_VERSION="~6.2" - php: 7.0 - - env: TYPO3_VERSION="~6.2" - php: 7.1 allow_failures: # 7 and 8 are not working due to current relation resolving. # See: https://github.com/DanielSiepmann/search_core/projects/1 From 0ff8ffed84d80dc7c8da8c3efb58ccb344ef0fcc Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Thu, 11 May 2017 09:51:14 +0200 Subject: [PATCH 2/2] TASK: Allow PHP7 tests to run * Ignore platform-reqs of composer to allow installation of TYPO3 CMS 6.x with newer PHP Versions. * Don't make 6.2 version fix. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e32cdaa..2520ab0 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ current_dir := $(dir $(mkfile_path)) TYPO3_WEB_DIR := $(current_dir).Build/Web # Allow different versions on travis -TYPO3_VERSION ?= ~6.2.19 +TYPO3_VERSION ?= ~6.2 typo3DatabaseName ?= "searchcore_test" typo3DatabaseUsername ?= "dev" typo3DatabasePassword ?= "dev" @@ -11,7 +11,7 @@ typo3DatabaseHost ?= "127.0.0.1" .PHONY: install install: clean - COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev --prefer-source typo3/cms="$(TYPO3_VERSION)" + COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev --prefer-source --ignore-platform-reqs typo3/cms="$(TYPO3_VERSION)" git checkout composer.json functionalTests: