From 602aaec078defa1f0d51cf6e4f9a42c531f321a2 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Tue, 17 Dec 2019 13:50:49 +0100 Subject: [PATCH] Replace zendsearch with handcraftedinthealps fork (#204) * Replace zendsearch with handcraftedinthealps fork * Allow massive build 0.4 * Upgrade handcraftedinthealps/zendsearch to ^2.0 --- .travis.yml | 10 ++++++++++ composer.json | 5 ++--- tests/travis.php.ini | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index bf2f6cc8..0eaecdfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ sudo: false +dist: trusty language: php cache: @@ -11,6 +12,7 @@ matrix: - php: 5.5 env: - COMPOSER_FLAGS="--prefer-dist --no-interaction" + - ENABLE_SWAP=true - php: 7.1 env: - COMPOSER_FLAGS="--prefer-dist --no-interaction" @@ -20,6 +22,14 @@ before_install: - phpenv config-add tests/travis.php.ini install: + - | # enable swap + if [[ $ENABLE_SWAP == 'true' ]]; then + sudo fallocate -l 4G /swapfile + sudo chmod 600 /swapfile + sudo mkswap /swapfile + sudo swapon /swapfile + sudo sysctl vm.swappiness=10 + fi # Install dependencies - travis_retry composer update $COMPOSER_FLAGS - composer info -i diff --git a/composer.json b/composer.json index a1d2ffc7..58273e1f 100644 --- a/composer.json +++ b/composer.json @@ -27,9 +27,8 @@ "incenteev/composer-parameter-handler": "~2.1", "sulu/sulu": "~1.6.22", "dantleech/phpcr-migrations-bundle": "~1.0", - "zendframework/zend-stdlib": "^2.3", - "zendframework/zendsearch": "@dev", - "massive/build-bundle": "0.3.*", + "handcraftedinthealps/zendsearch": "^2.0", + "massive/build-bundle": "^0.3 || ^0.4", "jackalope/jackalope-doctrine-dbal": "^1.2.5", "jackalope/jackalope-jackrabbit": "^1.2", "doctrine/doctrine-fixtures-bundle": "~2.3", diff --git a/tests/travis.php.ini b/tests/travis.php.ini index 8a15b626..7999e961 100644 --- a/tests/travis.php.ini +++ b/tests/travis.php.ini @@ -1 +1 @@ -memory_limit = 4096M +memory_limit = -1