Merge pull request #3627 from craig0990/feature/add-search-api-endpoint

Add a basic Search REST endpoint

diff --git a/.travis.yml b/.travis.yml
index ac64839d0c9dca6bdbf9bfc2411dc0fd700a648e..0ca1e192c49b0d333623b5e78006d6320fb61964 100644 (file)
--- 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

diff --git a/app/config/config.yml b/app/config/config.yml
index ee0f0a38a8caf73f359ded5b914ce566818614ad..4b34af3023c5e4ef2c7e07571c637c4c790fb248 100644 (file)
--- 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%"