diff --git a/composer.json b/composer.json index f71e519..02c66db 100644 --- a/composer.json +++ b/composer.json @@ -43,6 +43,6 @@ "require-dev": { "phpunit/phpunit": ">=5.7.28", "php-coveralls/php-coveralls": "^2.1 || ^1.1", - "phpunit/phpcov": "^3.0 || ^2.0" + "phpunit/phpcov": "^4.0 || ^3.0 || ^2.0" } } diff --git a/tests/composer.sh b/tests/composer.sh index 66dcf48..13ee8ee 100755 --- a/tests/composer.sh +++ b/tests/composer.sh @@ -35,6 +35,10 @@ if [ "$Composer" = "1" ]; then echo "supported. Would install on CI." fi px="$ph $pu.phar" + if [ "$PHVM" == "5" ] && [ "$PHVm" == "3" ]; then # Issue #155 + $px config --global disable-tls true + $px config --global secure-http false + fi elif [ "$Composer" = "2" ]; then echo "not necessary, using system." px=$pu diff --git a/tests/setupenv.sh b/tests/setupenv.sh index 2d3caa9..0c3b69d 100755 --- a/tests/setupenv.sh +++ b/tests/setupenv.sh @@ -186,13 +186,13 @@ ADODl=archive ADOFilePfx=v ADOFileSfx=.tar.gz if [ "$pvM" \> "7" ]; then # PHP 8x - ADODBVer=5.20.17 + ADODBVer=5.20.18 if [ "$1" == "" ] && [ "$TRAVIS" == "true" ]; then ADODBPATH="ADOdb-$ADODBVer" fi elif [ "$pvM" \> "5" ]; then # PHP 7x if [ "$pvm" \> "2" ]; then # PHP 7.3+ - ADODBVer=5.20.15 + ADODBVer=5.20.16 elif [ "$pvm" \> "1" ]; then # PHP 7.2+ ADODBVer=5.20.13 else @@ -203,7 +203,7 @@ elif [ "$pvM" \> "5" ]; then # PHP 7x fi elif [ "$pvM" \> "4" ]; then # PHP 5x if [ "$pvm" \> "2" ]; then # PHP 5.3+ - ADODBVer=5.14 + ADODBVer=5.15 else ADODBVer=5.01beta fi