Merge pull request #45 from DanielSiepmann/feature/support-php7

Feature/support php7
This commit is contained in:
Daniel Siepmann 2017-05-11 09:57:52 +02:00 committed by GitHub
commit 7877c36a77
2 changed files with 2 additions and 8 deletions

View file

@ -31,12 +31,6 @@ matrix:
php: 5.6 php: 5.6
- env: TYPO3_VERSION="dev-master" - env: TYPO3_VERSION="dev-master"
php: 5.6 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: allow_failures:
# 7 and 8 are not working due to current relation resolving. # 7 and 8 are not working due to current relation resolving.
# See: https://github.com/DanielSiepmann/search_core/projects/1 # See: https://github.com/DanielSiepmann/search_core/projects/1

View file

@ -3,7 +3,7 @@ current_dir := $(dir $(mkfile_path))
TYPO3_WEB_DIR := $(current_dir).Build/Web TYPO3_WEB_DIR := $(current_dir).Build/Web
# Allow different versions on travis # Allow different versions on travis
TYPO3_VERSION ?= ~6.2.19 TYPO3_VERSION ?= ~6.2
typo3DatabaseName ?= "searchcore_test" typo3DatabaseName ?= "searchcore_test"
typo3DatabaseUsername ?= "dev" typo3DatabaseUsername ?= "dev"
typo3DatabasePassword ?= "dev" typo3DatabasePassword ?= "dev"
@ -11,7 +11,7 @@ typo3DatabaseHost ?= "127.0.0.1"
.PHONY: install .PHONY: install
install: clean 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 git checkout composer.json
functionalTests: functionalTests: