From 6113dbbc2037551ac11bab2c7cd1bb6f78676e0f Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 22 Jan 2019 20:38:28 +0100 Subject: [PATCH 1/2] Removed hardcoded database version --- app/config/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/config/config.yml b/app/config/config.yml index ee0f0a38a..4b34af302 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -54,7 +54,6 @@ doctrine: charset: "%database_charset%" path: "%database_path%" unix_socket: "%database_socket%" - server_version: 5.6 orm: auto_generate_proxy_classes: "%kernel.debug%" From e19fc0266514efc13efe56f55ddbf3ecc940c2e8 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 22 Jan 2019 21:10:28 +0100 Subject: [PATCH 2/2] Avoid creating PG database on Travis And Travis build on PHP 7.3 should not fail. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac64839d0..0ca1e192c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,6 @@ matrix: env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite allow_failures: - php: nightly - - php: 7.3 # exclude v1 branches branches: @@ -56,7 +55,6 @@ before_script: # xdebug isn't enable for PHP 7.1 - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi - composer self-update --no-progress - - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; script: - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist