From e177e9ceeb6ba2ef67a5c594d4bc91e5dbf4596b Mon Sep 17 00:00:00 2001 From: Richard Uren Date: Thu, 21 Sep 2017 13:29:06 +0800 Subject: [PATCH 1/9] Force hhvm version. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 955b2d9..df5b3e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ php: - 5.6 - 7.0 - 7.1 - - hhvm + - hhvm-3.18 services: - memcached From 628874cf7b94d30ab607d4f0501e41738f8888e3 Mon Sep 17 00:00:00 2001 From: Richard Uren Date: Thu, 21 Sep 2017 13:46:16 +0800 Subject: [PATCH 2/9] Have HHVM look like php7. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index df5b3e6..edb0248 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ php: - 5.6 - 7.0 - 7.1 - - hhvm-3.18 + - hhvm services: - memcached @@ -20,6 +20,8 @@ before_install: - if [[ $TRAVIS_PHP_VERSION =~ 5.* ]] ; then printf "\nextension=memcache.so\n" >> ./tests/travis_php.ini; fi; - if [[ $TRAVIS_PHP_VERSION = 7.* ]] ; then printf "\nextension=apcu.so\n" >> ./tests/travis_php.ini; fi; - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-add ./tests/travis_php.ini; fi; + - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then printf "\nhhvm.php7.all=1\n" > ./tests/travis_php.ini; fi; + - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then phpenv config-add ./tests/travis_php.ini; fi; - travis_retry composer self-update - travis_retry composer install --no-interaction --prefer-source - travis_retry composer require predis/predis:^1.1 From fb3ef0c6a6ace80b5b32422ab0039e9487954bb4 Mon Sep 17 00:00:00 2001 From: Richard Uren Date: Thu, 21 Sep 2017 14:00:24 +0800 Subject: [PATCH 3/9] Install older version of phpunit for HHVM --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index edb0248..eb71502 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,10 +21,11 @@ before_install: - if [[ $TRAVIS_PHP_VERSION = 7.* ]] ; then printf "\nextension=apcu.so\n" >> ./tests/travis_php.ini; fi; - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-add ./tests/travis_php.ini; fi; - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then printf "\nhhvm.php7.all=1\n" > ./tests/travis_php.ini; fi; - - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then phpenv config-add ./tests/travis_php.ini; fi; + - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then phpenv config-add ./tests/travis_php.ini; fi; - travis_retry composer self-update - travis_retry composer install --no-interaction --prefer-source - travis_retry composer require predis/predis:^1.1 + - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then travis_retry composer require --dev --no-update phpunit/phpunit 5.7; fi # Setup test run config files before_script: From 602b468a7b5a01b1da0487abb4ed694fc6837f35 Mon Sep 17 00:00:00 2001 From: Richard Uren Date: Thu, 21 Sep 2017 14:04:29 +0800 Subject: [PATCH 4/9] Put composer require in right place. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eb71502..05edb0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,10 +22,10 @@ before_install: - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-add ./tests/travis_php.ini; fi; - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then printf "\nhhvm.php7.all=1\n" > ./tests/travis_php.ini; fi; - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then phpenv config-add ./tests/travis_php.ini; fi; + - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then travis_retry composer require --dev --no-update phpunit/phpunit 5.7; fi - travis_retry composer self-update - travis_retry composer install --no-interaction --prefer-source - travis_retry composer require predis/predis:^1.1 - - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then travis_retry composer require --dev --no-update phpunit/phpunit 5.7; fi # Setup test run config files before_script: From f454fc6d60e8bce9c7d96321e03445a6ce4b5f4a Mon Sep 17 00:00:00 2001 From: Richard Uren Date: Thu, 21 Sep 2017 15:09:37 +0800 Subject: [PATCH 5/9] Searching for phpunit version. --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 05edb0b..2497ce0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ before_install: - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-add ./tests/travis_php.ini; fi; - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then printf "\nhhvm.php7.all=1\n" > ./tests/travis_php.ini; fi; - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then phpenv config-add ./tests/travis_php.ini; fi; - - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then travis_retry composer require --dev --no-update phpunit/phpunit 5.7; fi + - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then travis_retry composer require --dev --no-update phpunit/phpunit 5.7.21; fi - travis_retry composer self-update - travis_retry composer install --no-interaction --prefer-source - travis_retry composer require predis/predis:^1.1 @@ -32,5 +32,9 @@ before_script: - cat hdconfig.php | sed -e s/your_api_username/$API_USERNAME/ -e s/your_api_secret/$API_SECRET/ -e s/your_api_siteId/$API_SITE_ID/ > hd4CloudConfig.php - cat hd4CloudConfig.php > hd4UltimateConfig.php - echo "\$hdconfig['use_local'] = true;" >> hd4UltimateConfig.php - + - which phpunit + - phpunit --version + - $COMPOSER_BIN_DIR/phpunit --version + - vendor/bin/phpunit --version + script: phpunit --debug From 803dc0edd6e3c31bdb7abb9c6d408ea90c6c3b4a Mon Sep 17 00:00:00 2001 From: Richard Uren Date: Thu, 21 Sep 2017 15:25:40 +0800 Subject: [PATCH 6/9] Looking for composer phpunit --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2497ce0..358332d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,9 +32,9 @@ before_script: - cat hdconfig.php | sed -e s/your_api_username/$API_USERNAME/ -e s/your_api_secret/$API_SECRET/ -e s/your_api_siteId/$API_SITE_ID/ > hd4CloudConfig.php - cat hd4CloudConfig.php > hd4UltimateConfig.php - echo "\$hdconfig['use_local'] = true;" >> hd4UltimateConfig.php + - echo $PATH - which phpunit - phpunit --version - - $COMPOSER_BIN_DIR/phpunit --version - vendor/bin/phpunit --version script: phpunit --debug From 55f42cf126e7a08e4807c805ec56512ea6892741 Mon Sep 17 00:00:00 2001 From: Richard Uren Date: Thu, 21 Sep 2017 15:33:29 +0800 Subject: [PATCH 7/9] Swith phpunit for HHVM --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 358332d..a0e3586 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,9 +32,6 @@ before_script: - cat hdconfig.php | sed -e s/your_api_username/$API_USERNAME/ -e s/your_api_secret/$API_SECRET/ -e s/your_api_siteId/$API_SITE_ID/ > hd4CloudConfig.php - cat hd4CloudConfig.php > hd4UltimateConfig.php - echo "\$hdconfig['use_local'] = true;" >> hd4UltimateConfig.php - - echo $PATH - - which phpunit - - phpunit --version - - vendor/bin/phpunit --version + - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then export PHPUNIT=vendor/bin/phpunit -script: phpunit --debug +script: ${PHPUNIT}phpunit --debug From 8e05456b0a243797f612d3615b28703bd14e58b7 Mon Sep 17 00:00:00 2001 From: Richard Uren Date: Thu, 21 Sep 2017 15:36:41 +0800 Subject: [PATCH 8/9] Fix broken conditional. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a0e3586..6ce6148 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,6 @@ before_script: - cat hdconfig.php | sed -e s/your_api_username/$API_USERNAME/ -e s/your_api_secret/$API_SECRET/ -e s/your_api_siteId/$API_SITE_ID/ > hd4CloudConfig.php - cat hd4CloudConfig.php > hd4UltimateConfig.php - echo "\$hdconfig['use_local'] = true;" >> hd4UltimateConfig.php - - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then export PHPUNIT=vendor/bin/phpunit + - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then export PHPUNIT=vendor/bin/phpunit; fi; script: ${PHPUNIT}phpunit --debug From e25b78f9d87f54f194467f8c6654e1d656fd4f1c Mon Sep 17 00:00:00 2001 From: Richard Uren Date: Thu, 21 Sep 2017 15:41:12 +0800 Subject: [PATCH 9/9] fix path for phpunit with HHVM --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6ce6148..431a817 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,6 @@ before_script: - cat hdconfig.php | sed -e s/your_api_username/$API_USERNAME/ -e s/your_api_secret/$API_SECRET/ -e s/your_api_siteId/$API_SITE_ID/ > hd4CloudConfig.php - cat hd4CloudConfig.php > hd4UltimateConfig.php - echo "\$hdconfig['use_local'] = true;" >> hd4UltimateConfig.php - - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then export PHPUNIT=vendor/bin/phpunit; fi; + - if [[ $TRAVIS_PHP_VERSION = 'hhvm' ]]; then export PHPUNIT=vendor/bin/; fi; script: ${PHPUNIT}phpunit --debug