Bump version of PHP and Doctrine

This commit is contained in:
Bob den Otter
2019-11-12 17:46:19 +01:00
parent 1117e8b573
commit 951abc1e86
2 changed files with 3 additions and 11 deletions
-8
View File
@@ -12,10 +12,6 @@ cache:
matrix:
fast_finish: true
include:
# Pinned to 7.1.18, because Travis defaults to 7.1.6, which has broken SSL/TLS. See: https://github.com/travis-ci/travis-ci/issues/6339
- php: 7.1.18
- php: 7.1.18
env: COMPOSER_FLAGS="--prefer-lowest"
- php: 7.2
- php: 7.3
- php: 7.4snapshot
@@ -24,8 +20,6 @@ matrix:
allow_failures:
- php: 7.4snapshot
- php: nightly
- php: 7.1.18
env: COMPOSER_FLAGS="--prefer-lowest"
before_install:
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
@@ -77,5 +71,3 @@ script:
- make behat-api
# run JS e2e tests
- ./run_behat_tests.sh && make behat-js
+3 -3
View File
@@ -4,7 +4,7 @@
"description": "🧿 Bolt 4 Core",
"license": "MIT",
"require": {
"php": ">=7.1.3",
"php": ">=7.2.9",
"ext-json": "*",
"ext-mbstring": "*",
"ext-pdo": "*",
@@ -14,7 +14,7 @@
"cocur/slugify": "^3.2",
"composer/composer": "^1.9",
"doctrine/annotations": "^1.7",
"doctrine/dbal": "^2.9",
"doctrine/dbal": "^2.10.0",
"doctrine/doctrine-bundle": "^1.11",
"doctrine/doctrine-cache-bundle": "^1.3.1",
"doctrine/orm": "^2.6",
@@ -82,7 +82,7 @@
"bobdenotter/weatherwidget": "^1.0",
"bolt/newswidget": "^1.0",
"coduo/php-matcher": "^3.2",
"dama/doctrine-test-bundle": "^5.0",
"dama/doctrine-test-bundle": "^6.2.0",
"doctrine/doctrine-fixtures-bundle": "^3.2",
"lakion/mink-debug-extension": "^1.2",
"php-http/httplug-pack": "^1.2",