hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 10:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-1884 Bump php to 7.0.24 on circle CI and elastic to 2.3.3.

Browse Source
This commit is contained in:
Xavier Rousset
2018-02-21 18:35:45 +01:00
parent 5751213e3e
commit 2195988675
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
circle.yml
View File

@@ -7,7 +7,7 @@ general:
machine: machine:
php: php:
version: 5.5.31 version: 7.0.24 #5.6.22
node: node:
version: stable version: stable
services: services:
@@ -18,16 +18,16 @@ machine:
dependencies: dependencies:
cache_directories: cache_directories:
- elasticsearch-1.6.0 # relative to the build directory - elasticsearch-2.3.3 # relative to the build directory
- node_modules - node_modules
- ~/.composer - ~/.composer
pre: pre:
- git clone https://github.com/alanxz/rabbitmq-c - git clone https://github.com/alanxz/rabbitmq-c
- cd rabbitmq-c && git checkout 2ca1774489328cde71195f5fa95e17cf3a80cb8a - cd rabbitmq-c && git checkout 2ca1774489328cde71195f5fa95e17cf3a80cb8a
- cd rabbitmq-c && git submodule init && git submodule update && autoreconf -i && ./configure && make && sudo make install - cd rabbitmq-c && git submodule init && git submodule update && autoreconf -i && ./configure && make && sudo make install
- pecl install amqp-1.6.0 - pecl channel-update pear.php.net
- yes '' | pecl install amqp-1.9.3
- yes '' | pecl install imagick - yes '' | pecl install imagick
- pecl install json
- sudo apt-get install libzmq-dev - sudo apt-get install libzmq-dev
- yes '' | pecl install zmq-beta - yes '' | pecl install zmq-beta
- echo "extension = amqp.so" > /opt/circleci/php/$(phpenv global)/etc/conf.d/amqp.ini - echo "extension = amqp.so" > /opt/circleci/php/$(phpenv global)/etc/conf.d/amqp.ini
@@ -39,8 +39,8 @@ dependencies:
- composer install --no-progress --no-interaction --optimize-autoloader - composer install --no-progress --no-interaction --optimize-autoloader
post: post:
- npm install - npm install
- if [[ ! -e elasticsearch-1.6.0 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.6.0.tar.gz && tar -xvf elasticsearch-1.6.0.tar.gz && elasticsearch-1.6.0/bin/plugin install elasticsearch/elasticsearch-analysis-icu/2.6.0; fi - if [[ ! -e elasticsearch-2.3.3 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.3.3.tar.gz && tar -xvf elasticsearch-2.3.3.tar.gz && elasticsearch-2.3.3/bin/plugin install analysis-icu; fi
- elasticsearch-1.6.0/bin/elasticsearch: {background: true} - elasticsearch-2.3.3/bin/elasticsearch: {background: true}
database: database:
override: override:
@@ -53,6 +53,11 @@ database:
- "./bin/developer phraseanet:regenerate-sqlite -v" - "./bin/developer phraseanet:regenerate-sqlite -v"
- "./bin/developer phraseanet:generate-js-fixtures -v" - "./bin/developer phraseanet:generate-js-fixtures -v"
#test:
# override:
# - case $CIRCLE_NODE_INDEX in 0) EXIT=0; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-unit.xml --exclude-group legacy || EXIT=$?; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-no-web.xml --group legacy --exclude-group web || EXIT=$?; exit $EXIT;; 1) php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-web.xml --group web ;; esac:
# #- php -d memory_limit=-1 bin/phpunit -c phpunit.xml.dist;
test: test:
override: override:
- case $CIRCLE_NODE_INDEX in 0) EXIT=0; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-unit.xml --exclude-group legacy || EXIT=$?; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-no-web.xml --group legacy --exclude-group web || EXIT=$?; exit $EXIT;; 1) php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-web.xml --group web ;; esac: - case $CIRCLE_NODE_INDEX in 0) EXIT=0; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-unit.xml --exclude-group legacy || EXIT=$?; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-no-web.xml --group legacy --exclude-group web || EXIT=$?; exit $EXIT;; 1) php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-web.xml --group web ;; esac:

4
lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
View File

@@ -261,10 +261,10 @@ class SearchEngineOptions
/** /**
* Set the bases where to search for * Set the bases where to search for
* *
* @param int[] $basesIds An array of ids * @param null|int[] $basesIds An array of ids
* @return $this * @return $this
*/ */
public function onBasesIds(array $basesIds) public function onBasesIds($basesIds)
{ {
$this->basesIds = $basesIds; $this->basesIds = $basesIds;