Merge pull request #149 from fedotov-as/feature/apcu_bc

Add support for apcu_bc
pull/154/head
Michele Locati 2020-06-15 17:41:46 +02:00 committed by GitHub
commit 1d163ae6ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 0 deletions

View File

@ -1,5 +1,6 @@
amqp 5.5 5.6 7.0 7.1 7.2 7.3 7.4 amqp 5.5 5.6 7.0 7.1 7.2 7.3 7.4
apcu 5.5 5.6 7.0 7.1 7.2 7.3 7.4 apcu 5.5 5.6 7.0 7.1 7.2 7.3 7.4
apcu_bc 7.0 7.1 7.2 7.3 7.4
bcmath 5.5 5.6 7.0 7.1 7.2 7.3 7.4 bcmath 5.5 5.6 7.0 7.1 7.2 7.3 7.4
bz2 5.5 5.6 7.0 7.1 7.2 7.3 7.4 bz2 5.5 5.6 7.0 7.1 7.2 7.3 7.4
calendar 5.5 5.6 7.0 7.1 7.2 7.3 7.4 calendar 5.5 5.6 7.0 7.1 7.2 7.3 7.4

View File

@ -138,6 +138,14 @@ processCommandArguments() {
# Output: # Output:
# Nothing # Nothing
sortModulesToInstall() { sortModulesToInstall() {
if stringInList 'apcu_bc' "$PHP_MODULES_TO_INSTALL"; then
PHP_MODULES_TO_INSTALL="$(removeStringFromList 'apcu_bc' "$PHP_MODULES_TO_INSTALL")"
sortModulesToInstall_alreadyInstalled="$(getPHPInstalledModules)"
if ! stringInList 'apcu' "$PHP_MODULES_TO_INSTALL" && ! stringInList 'apcu' "$sortModulesToInstall_alreadyInstalled"; then
PHP_MODULES_TO_INSTALL="$PHP_MODULES_TO_INSTALL apcu"
fi
PHP_MODULES_TO_INSTALL="$PHP_MODULES_TO_INSTALL apcu_bc"
fi
if stringInList 'igbinary' "$PHP_MODULES_TO_INSTALL"; then if stringInList 'igbinary' "$PHP_MODULES_TO_INSTALL"; then
PHP_MODULES_TO_INSTALL="$(removeStringFromList 'igbinary' "$PHP_MODULES_TO_INSTALL")" PHP_MODULES_TO_INSTALL="$(removeStringFromList 'igbinary' "$PHP_MODULES_TO_INSTALL")"
if test -z "$PHP_MODULES_TO_INSTALL"; then if test -z "$PHP_MODULES_TO_INSTALL"; then
@ -1307,6 +1315,10 @@ installPECLModule() {
printf "$installPECLModule_stdin" | pecl install "$installPECLModule_actual" printf "$installPECLModule_stdin" | pecl install "$installPECLModule_actual"
fi fi
case "$2" in case "$2" in
apcu_bc)
# apcu_bc must be loaded after apcu
docker-php-ext-enable --ini-name "xx-php-ext-$2.ini" apc
;;
http) http)
# http must be loaded after raphf and propro # http must be loaded after raphf and propro
docker-php-ext-enable --ini-name "xx-php-ext-$2.ini" "$2" docker-php-ext-enable --ini-name "xx-php-ext-$2.ini" "$2"

View File

@ -4,6 +4,7 @@ $rc = 0;
$numTestedExtensions = 0; $numTestedExtensions = 0;
$nameMap = [ $nameMap = [
'opcache' => 'Zend OPcache', 'opcache' => 'Zend OPcache',
'apcu_bc' => 'apc',
]; ];
$testsDir = __DIR__ . '/tests'; $testsDir = __DIR__ . '/tests';
function runTest($testFile) function runTest($testFile)