diff --git a/tests/conf/apc.ini b/tests/conf/apc.ini deleted file mode 100644 index 008bcabf..00000000 --- a/tests/conf/apc.ini +++ /dev/null @@ -1 +0,0 @@ -apc.enable_cli=1 diff --git a/tests/conf/apcu.ini b/tests/conf/apcu.ini new file mode 100644 index 00000000..9c2abed2 --- /dev/null +++ b/tests/conf/apcu.ini @@ -0,0 +1,3 @@ +extension=apcu.so + +apc.enable_cli=1 diff --git a/tests/conf/apcu_bc.ini b/tests/conf/apcu_bc.ini index acb9c7e6..a7f6182d 100644 --- a/tests/conf/apcu_bc.ini +++ b/tests/conf/apcu_bc.ini @@ -1,2 +1,4 @@ extension=apcu.so extension=apc.so + +apc.enable_cli=1 diff --git a/tests/script/install.sh b/tests/script/install.sh index 8944bbb5..c84dbedb 100755 --- a/tests/script/install.sh +++ b/tests/script/install.sh @@ -3,17 +3,17 @@ if [ $(phpenv version-name) != "hhvm" ]; then pecl channel-update pecl.php.net + pear config-set php_ini '' + pecl config-set php_ini '' + if [ $(phpenv version-name) = "7.0" ]; then - pear config-set php_ini '' - pecl config-set php_ini '' echo "yes\nno\n" | pecl install apcu-5.1.2 pecl install apcu_bc-beta phpenv config-add thinkphp/tests/conf/apcu_bc.ini else echo "yes\nno\n" | pecl install apcu-4.0.10 + phpenv config-add thinkphp/tests/conf/apcu.ini fi - - phpenv config-add thinkphp/tests/conf/apc.ini fi composer install --no-interaction --ignore-platform-reqs